Changeset 677 for trunk/src/org/expeditee/settings/UserSettings.java

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.

File:

• trunk/src/org/expeditee/settings/UserSettings.java (modified) (6 diffs)

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));