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

Timestamp:

07/25/08 09:24:45 (16 years ago)

Author:

ra33

Message:

Added calculate action

File:

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

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

@@ -237 +237 @@
         }
 
-        public List<Text> getVisibleTextItems() {
-                List<Text> textItems = new ArrayList<Text>();
-                for (Item i : getItems(true)) {
-                        // only add up normal body text items
-                        if (i instanceof Text) {
-                                textItems.add((Text) i);
-                        }
-                }
-                return textItems;
-        }
-
         public List<Item> getItems() {
                 return getItems(false);
@@ -264 +253 @@
 
         /**
-         * Gets a list of all the non annotation text items on the frame, excluding
-         * the title and frame name.
+         * Returns a list of all the non annotation text items on the frame which
+         * are not the title or frame name or special annotation items.
          * 
          * @param includeAnnotations
-         *            true if annotations should be included in the list
-         * @return list of text items
-         */
-        public List<Text> getBodyTextItems(boolean includeAnnotations) {
-                return getBodyTextItems(includeAnnotations, false);
-        }
-
-        /**
-         * Returns a list of all the non annotation text items on the frame which
-         * are not the title or frame name.
-         * 
+         *            true if annotation items without special meaning should be
+         *            included
          * @param includeLineEnds
          *            true if text on the end of lines should be included in the
@@ -284 +264 @@
          * @return the list of body text items.
          */
-        public List<Text> getBodyTextItems(boolean includeAnnotations,
-                        boolean includeLineEnds) {
+        public List<Text> getBodyTextItems(boolean includeAnnotations) {
                 List<Text> bodyTextItems = new ArrayList<Text>();
                 for (Item i : getItems(true)) {
                         // only add up normal body text items
                         if ((i instanceof Text)
-                                        && (includeAnnotations || !i.isAnnotation())
-                                        && (includeLineEnds || !i.isLineEnd())) {
+                                        && ((includeAnnotations && !((Text) i)
+                                                        .isSpecialAnnotation()) || !i.isAnnotation())
+                                        && !i.isLineEnd()) {
                                 bodyTextItems.add((Text) i);
                         }
@@ -617 +597 @@
         public void resetDateCreated() {
                 setDateCreated(Logger.EasyDateFormat("ddMMMyyyy:HHmm"));
+                setActiveTime(new Time(0));
+                setDarkTime(new Time(0));
+                setVersion(0);
         }
 
@@ -662 +645 @@
                 if (item == null || item.equals(_frameName) || _body.contains(item))
                         return;
+
+                // When an annotation item is anchored the annotation list must be
+                // refreshed
+                if (item.isAnnotation()) {
+                        clearAnnotations();
+                }
 
                 if (item instanceof Line)
@@ -706 +695 @@
                         if (anchorRight != null) {
                                 i.setX(width - anchorRight);
-                                if(i.hasVector()){
+                                if (i.hasVector()) {
                                         bReparse = true;
                                 }
@@ -712 +701 @@
                         if (anchorBottom != null) {
                                 i.setY(height - anchorBottom);
-                                if(i.hasVector()){
+                                if (i.hasVector()) {
                                         bReparse = true;
                                 }
                         }
                 }
-                if(bReparse){
+                if (bReparse) {
                         FrameUtils.Parse(this, false);
                 }
@@ -725 +714 @@
 
         public void addAllItems(Collection<Item> toAdd) {
-                for (Item i : toAdd)
+                for (Item i : toAdd) {
+                        // If an annotation is being deleted clear the annotation list
+                        if (i.isAnnotation())
+                                i.getParentOrCurrentFrame().clearAnnotations();
                         addItem(i);
+                }
         }
 
         public void removeAllItems(Collection<Item> toRemove) {
-                for (Item i : toRemove)
+                for (Item i : toRemove) {
+                        // If an annotation is being deleted clear the annotation list
+                        if (i.isAnnotation())
+                                i.getParentOrCurrentFrame().clearAnnotations();
                         removeItem(i);
+                }
         }
 
         public void removeItem(Item item) {
+                // If an annotation is being deleted clear the annotation list
+                if (item.isAnnotation())
+                        item.getParentOrCurrentFrame().clearAnnotations();
+
                 if (_body.remove(item)) {
                         change();
@@ -954 +955 @@
         }
 
-        public Item getItemAbove(Item current) {
+        public Text getTextAbove(Text current) {
+                Collection<Text> currentTextItems = FrameUtils.getCurrentTextItems();
+                List<Text> toCheck = new ArrayList<Text>();
+                if (currentTextItems.contains(current)) {
+                        toCheck.addAll(currentTextItems);
+                } else {
+                        toCheck.addAll(getTextItems());
+                }
                 // Make sure the items are sorted
-                Collections.sort(_body);
-                int ind = _body.indexOf(current);
+                Collections.sort(toCheck);
+
+                int ind = toCheck.indexOf(current);
                 if (ind == -1)
                         return null;
@@ -963 +972 @@
                 // loop through all items above this one, return the first match
                 for (int i = ind - 1; i >= 0; i--) {
-                        Item check = _body.get(i);
-                        if (check.isVisible() && FrameUtils.inSameColumn(check, current))
+                        Text check = toCheck.get(i);
+                        if (FrameUtils.inSameColumn(check, current))
                                 return check;
                 }
@@ -992 +1001 @@
          *            The Item to get the column for.
          */
-        public List<Item> getColumn(Item from) {
+        public List<Text> getColumn(Item from) {
                 // Check that this item is on the current frame
                 if (!_body.contains(from))
                         return null;
 
-                // Make sure the items are sorted
-                Collections.sort(_body);
-
                 if (from == null) {
                         from = getLastNonAnnotationTextItem();
@@ -1007 +1013 @@
                         return null;
 
-                List<Item> column = new ArrayList<Item>();
+                // Get the enclosedItems
+                Collection<Text> enclosed = FrameUtils.getCurrentTextItems();
+                List<Text> toCheck = null;
+                if (enclosed.contains(from)) {
+                        toCheck = new ArrayList<Text>();
+                        toCheck.addAll(enclosed);
+                } else {
+                        toCheck = getBodyTextItems(true);
+                }
+
+                // Make sure the items are sorted
+                Collections.sort(toCheck);
+
+                List<Text> column = new ArrayList<Text>();
 
                 // Create a list of items consisting of the item 'from' and all the
                 // items below it which are also in the same column as it
-                for (int i = _body.indexOf(from); i < _body.size(); i++) {
-                        Item item = _body.get(i);
-                        if (item.isVisible() && isNormalTextItem(item)) {
-                                if (FrameUtils.inSameColumn(from, item))
-                                        column.add(item);
-                        }
+                for (int i = toCheck.indexOf(from); i < toCheck.size(); i++) {
+                        Text item = toCheck.get(i);
+                        if (FrameUtils.inSameColumn(from, item))
+                                column.add(item);
                 }
 
@@ -1314 +1331 @@
                 _body = newBody;
                 change();
+
+                if (!keepAnnotations)
+                        _annotations.clear();
         }
 
@@ -1352 +1372 @@
                 // Make it the width of the page
                 // t.setMaxWidth(FrameGraphics.getMaxFrameSize().width);
-                //if (t.getWidth() <= 0) {
-                        t.setRightMargin(FrameGraphics.getMaxFrameSize().width);
-                //}
+                // if (t.getWidth() <= 0) {
+                t.setRightMargin(FrameGraphics.getMaxFrameSize().width);
+                // }
                 addItem(t);
                 return t;
@@ -1460 +1480 @@
                                 && (FreeItems.getInstance().get(0) instanceof Line || FreeItems
                                                 .getInstance().get(1) instanceof Line);
-        }
-
-        public static boolean itemAttachedToCursor() {
-                return FreeItems.getInstance().size() > 0;
-        }
-
-        public static boolean textItemAttachedToCursor() {
-                return itemAttachedToCursor()
-                                && FreeItems.getInstance().get(0) instanceof Text;
-        }
-
-        // TODO move this method to FreeItems
-        public static Item getItemAttachedToCursor() {
-                if (itemAttachedToCursor())
-                        return FreeItems.getInstance().get(0);
-
-                return null;
         }
 
@@ -1548 +1551 @@
                                         if (t.getText().equals(""))
                                                 DisplayIO.getCurrentFrame().removeItem(t);
-                                        if (!Frame.itemAttachedToCursor()) {
+                                        if (!FreeItems.itemAttachedToCursor()) {
                                                 DisplayIO.setCursorPosition(((Text) it)
                                                                 .getParagraphEndPosition());
@@ -1710 +1713 @@
 
         public void addAnnotation(Text item) {
+                if (_annotations == null) {
+                        _annotations = new HashMap<String, Text>();
+                }
                 // Check if this item has already been processed
                 String[] tokens = item.getProcessedText();
@@ -1755 +1761 @@
 
         public boolean hasAnnotation(String annotation) {
+                if (_annotations == null)
+                        refreshAnnotationList();
                 return _annotations.containsKey(annotation.toLowerCase());
         }
 
         public String getAnnotationValue(String annotation) {
+                if (_annotations == null)
+                        refreshAnnotationList();
+
                 Text text = _annotations.get(annotation.toLowerCase());
                 if (text == null)
@@ -1769 +1780 @@
         }
 
-        Map<String, Text> _annotations = new HashMap<String, Text>();
+        Map<String, Text> _annotations = null;
 
         public void clearAnnotations() {
-                _annotations.clear();
+                _annotations = null;
         }
 
@@ -1779 +1790 @@
         }
 
+        private void refreshAnnotationList() {
+                if (_annotations == null)
+                        _annotations = new HashMap<String, Text>();
+                else
+                        _annotations.clear();
+                for (Text text : getTextItems()) {
+                        if (text.isAnnotation()) {
+                                addAnnotation(text);
+                        }
+                }
+        }
+
         public Collection<Text> getAnnotationItems() {
+                if (_annotations == null) {
+                        refreshAnnotationList();
+                }
                 return _annotations.values();
         }
@@ -1851 +1877 @@
                 return vectorItems;
         }
+
+        /**
+         * Gets a list of all the text items on the frame.
+         * 
+         * @return
+         */
+        public Collection<Text> getTextItems() {
+                Collection<Text> textItems = new ArrayList<Text>();
+                for (Item i : getItems(true)) {
+                        // only add up normal body text items
+                        if ((i instanceof Text)) {
+                                textItems.add((Text) i);
+                        }
+                }
+                return textItems;
+        }
 }