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

Timestamp:

05/30/08 10:14:43 (16 years ago)

Author:

ra33

Message:

Added some more unit tests
Did a bunch of refactoring
AND added a few new features... @b @v were the most significant

File:

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

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

@@ -35 +35 @@
 public class Frame implements ImageObserver {
 
-        public static final Color[] COLOR_WHEEL = { Color.BLACK, Color.GRAY,
+        public static Color[] COLOR_WHEEL = { Color.BLACK, Color.WHITE, Color.GRAY,
                         new Color(235, 235, 235), new Color(225, 225, 255),
                         new Color(195, 255, 255), new Color(225, 255, 225),
@@ -60 +60 @@
         private String _frozenDate = null;
 
-        private Color _background;
-
-        private Color _foreground = Item.DEFAULT_FOREGROUND;
+        // Background color is clear
+        private Color _background = null;
+
+        // Foreground color is automatic by default
+        private Color _foreground = null;
 
         public String path;
@@ -236 +238 @@
                         }
                 }
-                bodyTextItems.remove(getTitle());
+                bodyTextItems.remove(getTitleItem());
 
                 return bodyTextItems;
@@ -285 +287 @@
          */
         public void setTitle(String title) {
-                if (title == null || title == "")
+                if (title == null || title.equals(""))
                         return;
 
@@ -292 +294 @@
                 // remove any numbering this title has
                 title = title.replaceAll("^\\d*[.] *", "");
-                Text frameTitle = getTitle();
+                Text frameTitle = getTitleItem();
 
                 if (frameTitle == null) {
@@ -305 +307 @@
                         addItem(frameTitle);
                 } else {
+                        // If it begins with a tag remove it
+
+                        // Remove the @ symbol if it is there
+                        title = ItemUtils.StripTagSymbol(title);
                         frameTitle.setText(title);
-                        title = ItemUtils.StripTagSymbol(title);
+                        // If the @ symbol is followed by numbering or a bullet remove that
+                        // too
                         String autoBulletText = FrameKeyboardActions.getAutoBullet(title);
                         if (autoBulletText.length() > 0)
@@ -314 +321 @@
                 // Brook: Cannot figure what is going on above... widget annot titles
                 // should be stripped always
-                if (ItemUtils
-                                .isTag(frameTitle, ItemUtils.GetTag(ItemUtils.TAG_IWIDGET))) {
+                if (ItemUtils.startsWithTag(frameTitle, ItemUtils
+                                .GetTag(ItemUtils.TAG_IWIDGET))) {
                         frameTitle.stripFirstWord();
                 }
@@ -325 +332 @@
         }
 
-        public Text getTitle() {
+        public Text getTitleItem() {
                 List<Item> items = getItems();
                 for (Item i : items) {
                         if (i instanceof Text && i.getX() < UserSettings.TitlePosition
-                                        && i.getY() < UserSettings.TitlePosition)
+                                        && i.getY() < UserSettings.TitlePosition && i.getY() > 0)
                                 return (Text) i;
                 }
@@ -336 +343 @@
         }
 
-        public Item getFrameNameItem() {
+        public String getTitle() {
+                Text title = getTitleItem();
+                if (title == null)
+                        return getName();
+
+                return title.getFirstLine();
+        }
+
+        public Item getNameItem() {
                 return _frameName;
         }
@@ -424 +439 @@
         }
 
-        public void setFrameName(String framename) {
+        public void setName(String framename) {
                 int num = Conversion.getFrameNumber(framename);
                 String frameset = Conversion.getFrameset(framename, false);
 
-                setFrameName(frameset, num);
+                setName(frameset, num);
         }
 
@@ -465 +480 @@
          * @return The Frame number of this Frame or -1 if it is not set.
          */
-        public int getFrameNumber() {
+        public int getNumber() {
                 return _number;
         }
@@ -575 +590 @@
                         _body.add(item);
                         item.setParent(this);
+
+                        // If the item is a line end and has constraints with items already
+                        // on the frame then make sure the constraints hold
+                        if (item.isLineEnd()) {
+                                item.setPosition(item.getPosition());
+                        }
 
                         _sorted = false;
@@ -636 +657 @@
          *            The List of Items to add to the undo stack.
          */
-        public void addAllToUndo(List<Item> items) {
+        public void addAllToUndo(Collection<Item> items) {
                 if (items.size() < 1)
                         return;
@@ -718 +739 @@
         }
 
-        public String getFrameName() {
+        public String getName() {
                 return getFramesetName() + _number;
         }
@@ -765 +786 @@
                 _background = back;
                 change();
-                FrameGraphics.Repaint();
+                // FrameGraphics.Repaint();
         }
 
@@ -784 +805 @@
                 _foreground = front;
                 change();
-                FrameGraphics.Repaint();
+                // FrameGraphics.Repaint();
         }
 
@@ -792 +813 @@
 
         public Color getPaintForegroundColor() {
-                final int GRAY = 127;
+                final int GRAY = Color.gray.getBlue();
                 final int THRESHOLD = 10;
 
@@ -802 +823 @@
                                 return Color.WHITE;
 
-                        Color fore = new Color(Math.abs(255 - back.getRed()), Math
-                                        .abs(255 - back.getGreen()), Math.abs(255 - back.getBlue()));
+                        Color fore = new Color(
+                                        Math.abs(Conversion.RGB_MAX - back.getRed()), Math
+                                                        .abs(Conversion.RGB_MAX - back.getGreen()), Math
+                                                        .abs(Conversion.RGB_MAX - back.getBlue()));
                         return fore;
-                        // return Item.DEFAULT_FOREGROUND;
                 }
 
@@ -1167 +1189 @@
         public boolean equals(Object o) {
                 if (o instanceof String) {
-                        return (String.CASE_INSENSITIVE_ORDER.compare((String) o,
-                                        getFrameName()) == 0);
+                        return (String.CASE_INSENSITIVE_ORDER
+                                        .compare((String) o, getName()) == 0);
                 }
 
                 if (o instanceof Frame) {
-                        return getFrameName().equals(((Frame) o).getFrameName());
+                        return getName().equals(((Frame) o).getName());
                 }
 
@@ -1188 +1210 @@
 
                 List<Item> copies = ItemUtils.CopyItems(toMergeWith.getItems());
-                copies.remove(toMergeWith.getFrameNameItem());
+                copies.remove(toMergeWith.getNameItem());
 
                 for (Item i : copies) {
@@ -1234 +1256 @@
                 List<Item> newBody = new ArrayList<Item>(0);
                 for (Item i : _body)
-                        if (i.isAnnotation() || i == getFrameNameItem() || i == getTitle())
+                        if (i.isAnnotation() || i == getNameItem() || i == getTitleItem())
                                 newBody.add(i);
 
@@ -1300 +1322 @@
                 // check for an updated template...
                 for (Item i : this.getItems()) {
-                        if (ItemUtils.isTag(i, templateTag)) {
+                        if (ItemUtils.startsWithTag(i, templateTag)) {
                                 t = (Text) i;
                                 break;
@@ -1401 +1423 @@
          */
         public boolean isNormalTextItem(Item it) {
-                if (it instanceof Text && it != getTitle() && it != _frameName
+                if (it instanceof Text && it != getTitleItem() && it != _frameName
                                 && !((Text) it).isSpecialAnnotation()) {
                         return true;
@@ -1455 +1477 @@
                         if (it instanceof Text) {
                                 Text t = (Text) it;
-                                if (t.getTextNoList().toLowerCase().startsWith("@start")
-                                                || t.getTextNoList().toLowerCase().equals("@start:")) {
+                                if (t.getText().toLowerCase().startsWith("@start")
+                                                || t.getText().toLowerCase().equals("@start:")) {
                                         t.stripFirstWord();
 
-                                        if (t.getTextNoList().equals(""))
+                                        if (t.getText().equals(""))
                                                 DisplayIO.getCurrentFrame().removeItem(t);
                                         if (!Frame.itemAttachedToCursor()) {
@@ -1491 +1513 @@
                 }
 
-                return _frameName.getTextNoList();
+                return _frameName.getText();
         }
 
@@ -1499 +1521 @@
         }
 
-        public void setFrameName(String frameset, int i) {
+        public void setName(String frameset, int i) {
                 setFrameset(frameset);
                 setFrameNumber(i);