Changeset 70 for trunk/src/org/expeditee/gui/Frame.java

Timestamp:

05/21/08 09:40:52 (16 years ago)

Author:

ra33

Message:

Made LOTS of changes...
Added DisplayComet
A whole bunch more stats for items and events
Changed lots of stuff for drawing better especially using text as line endpoints

File:

• trunk/src/org/expeditee/gui/Frame.java (modified) (6 diffs)

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

@@ -34 +34 @@
 public class Frame implements ImageObserver {
 
-        private static final int TITLE_MAX_START_POS = 200;
+        private static final int TITLE_MAX_START_POS = 100;
 
         public static final Color[] COLOR_WHEEL = { Color.BLACK, Color.GRAY,
@@ -341 +341 @@
 
         public Text getItemTemplate() {
-                Text t = UserSettings.ItemTemplate;
-
-                // check for an updated template...
-                for (Item i : this.getItems()) {
-                        if (ItemUtils.isTag(i, ItemUtils.TAG_ITEM_TEMPLATE)) {
-                                t = (Text) i;
-                                break;
-                        }
-                }
-
-                // If the item is linked apply any attribute pairs on the child frame
-                String link = t.getAbsoluteLink();
-                // need to get link first because copy doesnt copy the link
-                t = t.copy();
-                if (link != null) {
-                        t.setLink(null);
-                        Frame childFrame = FrameIO.LoadFrame(link);
-                        if (childFrame != null) {
-                                // read in attribute value pairs
-                                for (Text attribute : childFrame.getBodyTextItems(false)) {
-                                        AttributeUtils.SetAttribute(t, attribute);
-                                }
-                        }
+                return getTemplate(UserSettings.ItemTemplate,
+                                ItemUtils.TAG_ITEM_TEMPLATE);
+        }
+
+        public Text getAnnotationTemplate() {
+                Text t = getTemplate(UserSettings.AnnotationTemplate,
+                                ItemUtils.TAG_ANNOTATION_TEMPLATE);
+
+                if (t == null) {
+                        t = getItemTemplate();
                 }
 
@@ -369 +356 @@
         }
 
-        public Text getAnnotationTemplate() {
-                Text t = null;
-                // check for an updated template...
-                for (Item i : this.getItems()) {
-                        if (ItemUtils.isTag(i, ItemUtils.TAG_ANNOTATION_TEMPLATE)) {
-                                t = (Text) i;
-                                break;
-                        }
-                }
+        public Text getCodeCommentTemplate() {
+                Text t = getTemplate(UserSettings.CodeCommentTemplate,
+                                ItemUtils.TAG_CODE_COMMENT_TEMPLATE);
 
                 if (t == null) {
-                        if (UserSettings.AnnotationTemplate != null)
-                                t = UserSettings.AnnotationTemplate;
-                        else
-                                t = getItemTemplate();
-                }
-
-                return t.copy();
-        }
-
-        public Text getCodeCommentTemplate() {
-                Text t = null;
-
-                // check for an updated template...
-                for (Item i : this.getItems()) {
-                        if (ItemUtils.isTag(i, ItemUtils.TAG_CODE_COMMENT_TEMPLATE)) {
-                                t = (Text) i;
-                                break;
-                        }
-                }
-
-                if (t == null) {
-                        if (UserSettings.CodeCommentTemplate != null)
-                                t = UserSettings.CodeCommentTemplate;
-                        else
-                                t = getItemTemplate();
-                }
-
-                return t.copy();
+                        t = getItemTemplate();
+                }
+
+                return t;
         }
 
@@ -420 +377 @@
          */
         public List<Item> getItemsWithin(Polygon poly) {
-                ArrayList<Item> results = new ArrayList<Item>();
+                List<Item> results = new ArrayList<Item>();
 
                 for (Item i : _body)
@@ -1114 +1071 @@
 
         /**
-         * TODO document what this method is actually doing and why Merge text?!?!
+         * This method is for merging frames or setting frame attributes via
+         * injecting a text item into the frameName item.
          * 
          * @param toMerge
-         * @return the items that cant be merged?!?!
+         * @return the items that cant be merged
          */
         public List<Item> merge(List<Item> toMerge) {
@@ -1191 +1149 @@
         }
 
+        public Dot createDot() {
+                Dot dot = new Dot(DisplayIO.getRealMouseX(), DisplayIO.getMouseY(),
+                                getNextItemID());
+
+                Text template = getTemplate(UserSettings.LineTemplate,
+                                ItemUtils.TAG_LINE_TEMPLATE);
+                float thickness = template.getThickness();
+                if(thickness > 0)
+                        dot.setThickness(template.getThickness());
+                dot.setColor(template.getColor());
+                // reset attributes
+                dot.setParent(this);
+                return dot;
+        }
+
+        private Text getTemplate(Text defaultTemplate, int templateTag) {
+                Text t = defaultTemplate;
+
+                // check for an updated template...
+                for (Item i : this.getItems()) {
+                        if (ItemUtils.isTag(i, templateTag)) {
+                                t = (Text) i;
+                                break;
+                        }
+                }
+
+                // If the item is linked apply any attribute pairs on the child frame
+                String link = t.getAbsoluteLink();
+                // need to get link first because copy doesnt copy the link
+                t = t.copy();
+                if (link != null) {
+                        t.setLink(null);
+                        Frame childFrame = FrameIO.LoadFrame(link);
+                        if (childFrame != null) {
+                                // read in attribute value pairs
+                                for (Text attribute : childFrame.getBodyTextItems(false)) {
+                                        AttributeUtils.SetAttribute(t, attribute);
+                                }
+                        }
+                }
+                return t;
+        }
+
         private Text getItemTemplate(char firstChar) {
                 switch (firstChar) {