Changeset 677

Timestamp:

01/10/14 14:49:26 (10 years ago)

Author:

jts21

Message:

Let settings parser parse settings pages that take up multiple frames, by treating frames linked in annotations on settings pages as continuations of the settings page. As a side effect, settings themselves may no longer be annotations.

Location:

trunk/src/org/expeditee/settings

Files:

• Settings.java (modified) (4 diffs)
• UserSettings.java (modified) (6 diffs)

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

@@ -101 +101 @@
                 }
                 String settingsPage = prefix + text.getText().trim().toLowerCase().replaceAll("^@", "");
+                System.out.println(settingsPage);
                 PageDescriptor pd = _pages.get(settingsPage);
                 if(pd == null) {
@@ -106 +107 @@
                 }
                 try {
-                        if (text.getChild() == null) {
-                                return;
-                        }
                         List<VariableSetting> toDefault = new LinkedList<VariableSetting>(pd.settingsList);
                         // set the fields
-                        for (Text t : text.getChild().getBodyTextItems(true)) {
+                        List<Text> items = child.getBodyTextItems(false);
+                        List<Text> annotations = new LinkedList<Text>(child.getAnnotationItems());
+                        List<Frame> seen = new LinkedList<Frame>();
+                        seen.add(child);
+                        while(!annotations.isEmpty()) {
+                                Text annotation = annotations.remove(0);
+                                Frame next = annotation.getChild();
+                                if(next != null && !seen.contains(next)) {
+                                        System.out.println(annotation);
+                                        items.addAll(next.getBodyTextItems(false));
+                                        annotations.addAll(next.getAnnotationItems());
+                                        seen.add(next);
+                                }
+                        }
+                        for(Text t : items) {                           
                                 AttributeValuePair avp = new AttributeValuePair(t.getText(), false);
                                 try {
                                         // System.out.println(avp.getAttributeOrValue().trim().toLowerCase().replaceAll("^@", ""));
-                                        Setting s = pd.settings.get(avp.getAttributeOrValue().trim().toLowerCase().replaceAll("^@", ""));
+                                        Setting s = pd.settings.get(avp.getAttributeOrValue().trim().toLowerCase());//.replaceAll("^@", ""));
                                         if(s == null) {
                                                 continue;
@@ -160 +172 @@
          */
         private static void generateSettingsTree(String page, Text text) {
+                // bedrock:  bedrock.resnet.scms.waikato.ac.nz 3000
                 FrameCreator frames = new FrameCreator(text.getParentOrCurrentFrame().getFramesetName(), text.getParentOrCurrentFrame().getPath(), page, false, false);
                 // Frame frame = FrameIO.CreateFrame(text.getParentOrCurrentFrame().getFramesetName(), page, null);
@@ -216 +229 @@
                                         t = frames.addText(name + value, null, null, null, false);
                                 }
-                                Text tt = frames.getCurrentFrame().addText(600, t.getY(), s.getTooltip(), null);
-                                tt.setWidth(400);
+                                Text tt = frames.getCurrentFrame().addText(450, t.getY(), "// " + s.getTooltip(), null);
+                                tt.setWidth(550);
                                 // rebuild to get the correct height since setWidth() doesn't immediately rebuild
                                 tt.rebuild(true);

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

@@ -200 +200 @@
                 @Override
                 public Text generateText() {
-                        return new Text("@ItemTemplate");
+                        return new Text("ItemTemplate");
                 }
         };
@@ -213 +213 @@
                 @Override
                 public Text generateText() {
-                        return new Text("@DotTemplate");
+                        return new Text("DotTemplate");
                 }
         };
@@ -225 +225 @@
                 @Override
                 public Text generateText() {
-                        Text t = new Text("@AnnotationTemplate");
+                        Text t = new Text("AnnotationTemplate");
                 t.setColor(Color.gray);
                 return t;
@@ -239 +239 @@
                 @Override
                 public Text generateText() {
-                        Text t = new Text("@CommentTemplate");
+                        Text t = new Text("CommentTemplate");
                 t.setColor(Color.green.darker());
                 return t;
@@ -253 +253 @@
                 @Override
                 public Text generateText() {
-                        Text t = new Text("@StatsTemplate");
+                        Text t = new Text("StatsTemplate");
                 t.setColor(Color.BLACK);
                 t.setBackgroundColor(new Color(0.9F, 0.9F, 0.9F));
@@ -270 +270 @@
                 @Override
                 public Text generateText() {
-                        Text t = new Text("@StatsTemplate");
+                        Text t = new Text("TooltipTemplate");
                 t.setColor(Color.BLACK);
                 t.setBackgroundColor(new Color(0.7F, 0.7F, 0.9F));