Changeset 605

Timestamp:

12/11/13 15:53:36 (11 years ago)

Author:

jts21

Message:

Make settings accept annotation tags

Location:

trunk/src/org/expeditee

Files:

• gui/FrameUtils.java (modified) (2 diffs)
• settings/Settings.java (modified) (2 diffs)

trunk/src/org/expeditee/gui/FrameUtils.java

@@ -598 +598 @@
 
                 // check for settings tags
-                for (Text item : profile.getBodyTextItems(false)) {
+                for (Text item : profile.getBodyTextItems(true)) {
                         try {
 
@@ -607 +607 @@
                                         continue;
                                 }
-                                String attribute = attributeFullCase.toLowerCase();
+                                String attribute = attributeFullCase.trim().toLowerCase().replaceAll("^@", "");
 
                                 if(attribute.equals("settings")) {

trunk/src/org/expeditee/settings/Settings.java

@@ -109 +109 @@
                         return;
                 }
-                String settingsPage = prefix + text.getText().trim().toLowerCase();
+                String settingsPage = prefix + text.getText().trim().toLowerCase().replaceAll("^@", "");
                 PageDescriptor pd = _pages.get(settingsPage);
                 if(pd == null) {
@@ -127 +127 @@
                         }
                         // set the fields
-                        for (Text t : text.getChild().getBodyTextItems(false)) {
+                        for (Text t : text.getChild().getBodyTextItems(true)) {
                                 AttributeValuePair avp = new AttributeValuePair(t.getText(), false);
                                 try {
-                                        PageDescriptor.FieldSet fs = pd.settings.get(avp.getAttributeOrValue().trim().toLowerCase());
+                                        System.out.println(avp.getAttributeOrValue().trim().toLowerCase().replaceAll("^@", ""));
+                                        PageDescriptor.FieldSet fs = pd.settings.get(avp.getAttributeOrValue().trim().toLowerCase().replaceAll("^@", ""));
                                         if(fs == null) {
                                                 continue;