Changeset 1181 for trunk/src/org/expeditee/gui

Timestamp:

10/02/18 10:24:16 (6 years ago)

Author:

bln4

Message:

 

File:

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

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

@@ -36 +36 @@
 import org.expeditee.core.bounds.PolygonBounds;
 import org.expeditee.gio.gesture.StandardGestureActions;
+import org.expeditee.gio.input.KBMInputEvent.Key;
 import org.expeditee.gio.input.StandardInputEventListeners;
-import org.expeditee.gio.input.KBMInputEvent.Key;
 import org.expeditee.io.Conversion;
 import org.expeditee.items.Constraint;
@@ -192 +192 @@
                 _dotTemplate.setFillColor(ColorUtils.getNextColor(_dotTemplate.getFillColor(), TemplateSettings.FillColorWheel.get(), null));
                 _dotTemplate.setColor(ColorUtils.getNextColor(_dotTemplate.getColor(), TemplateSettings.ColorWheel.get(), null));
-                if (_dotTemplate.getColor() == null || _dotTemplate.getColor().equals(Colour.WHITE)) resetDot();
+                if (_dotTemplate.getColor() == null || _dotTemplate.getColor().equals(Colour.WHITE)) {
+                        resetDot();
+                }
         }
 
@@ -207 +209 @@
         public boolean isBufferValid()
         {
-                if (_buffer == null) return false;
+                if (_buffer == null) {
+                        return false;
+                }
 
                 return _validBuffer;
@@ -253 +257 @@
         {
                 // virtual frames are never saved
-                if (_number == VIRTUAL_FRAME_NUMBER) return false;
+                if (_number == VIRTUAL_FRAME_NUMBER) {
+                        return false;
+                }
 
                 return _change;
@@ -266 +272 @@
         public void setChanged(boolean value)
         {
-                if (_change == value) return;
+                if (_change == value) {
+                        return;
+                }
 
                 _change = value;
@@ -285 +293 @@
         public void notifyObservers(boolean bRecalculate)
         {
-                if (bRecalculate) recalculate();
+                if (bRecalculate) {
+                        recalculate();
+                }
                 // Notify the frame listeners that the frame has changed
                 /*
@@ -297 +307 @@
 
                 for (FrameObserver fl : observersCopy) {
-                        if (fl.isVisible()) fl.update();
+                        if (fl.isVisible()) {
+                                fl.update();
+                        }
                 }
         }
@@ -331 +343 @@
 
                 for (Item i : _body) {
-                        if (i == null) continue;
+                        if (i == null) {
+                                continue;
+                        }
                         
                         if (i.isVisible() || (!visible && !i.isDeleted())) {
@@ -354 +368 @@
         public boolean containsItem(Item i)
         {
-                if (i == null) throw new NullPointerException("i");
+                if (i == null) {
+                        throw new NullPointerException("i");
+                }
                 
                 return _body.contains(i);
@@ -392 +408 @@
                 for (Item i : getItems(true)) {
                         // only add up normal body text items
-                        if (!i.isAnnotation()) items.add(i);
+                        if (!i.isAnnotation()) {
+                                items.add(i);
+                        }
                 }
                 
@@ -417 +435 @@
 
                         if (it instanceof Text && !it.isAnnotation()) {
-                                return (Item) it;
+                                return it;
                         }
                 }
@@ -450 +468 @@
         public void setTitle(String title)
         {
-                if (title == null || title.equals("")) return;
+                if (title == null || title.equals("")) {
+                        return;
+                }
 
                 boolean oldchange = _change;
@@ -481 +501 @@
                         // If the @ symbol is followed by numbering or a bullet remove that too
                         String autoBulletText = StandardGestureActions.getAutoBullet(title);
-                        if (autoBulletText.length() > 0)
+                        if (autoBulletText.length() > 0) {
                                 frameTitle.stripFirstWord();
+                        }
                 }
                 // TODO Widgets... check this out
@@ -513 +534 @@
         {
                 Text title = getTitleItem();
-                if (title == null) return getName();
+                if (title == null) {
+                        return getName();
+                }
 
                 return title.getFirstLine();
@@ -659 +682 @@
                 assert (number >= 0);
 
-                if (_number == number) return;
+                if (_number == number) {
+                        return;
+                }
 
                 _number = number;
@@ -714 +739 @@
                 _permissionPair = new PermissionPair(permission);
 
-                if (_body.size() > 0) refreshItemPermissions(permission.getPermission(_owner));
+                if (_body.size() > 0) {
+                        refreshItemPermissions(permission.getPermission(_owner));
+                }
         }
 
@@ -811 +838 @@
         public void addItem(Item item, boolean recalculate)
         {
-                if (item == null || item.equals(_frameName) || _body.contains(item)) return;
+                if (item == null || item.equals(_frameName) || _body.contains(item)) {
+                        return;
+                }
 
                 // When an annotation item is anchored the annotation list must be
@@ -819 +848 @@
                 }
 
-                if (item instanceof Line) _lineCount++;
+                if (item instanceof Line) {
+                        _lineCount++;
+                }
 
                 _itemCount = Math.max(_itemCount, item.getID());
@@ -914 +945 @@
                 for (Item i : toAdd) {
                         // If an annotation is being deleted clear the annotation list
-                        if (i.isAnnotation()) i.getParentOrCurrentFrame().clearAnnotations();
+                        if (i.isAnnotation()) {
+                                i.getParentOrCurrentFrame().clearAnnotations();
+                        }
                         // TODO Improve efficiency when addAll is called
                         addItem(i);
@@ -924 +957 @@
                 for (Item i : toRemove) {
                         // If an annotation is being deleted clear the annotation list
-                        if (i.isAnnotation()) i.getParentOrCurrentFrame().clearAnnotations();
+                        if (i.isAnnotation()) {
+                                i.getParentOrCurrentFrame().clearAnnotations();
+                        }
                         removeItem(i);
                 }
@@ -937 +972 @@
         {
                 // If an annotation is being deleted clear the annotation list
-                if (item.isAnnotation()) item.getParentOrCurrentFrame().clearAnnotations();
+                if (item.isAnnotation()) {
+                        item.getParentOrCurrentFrame().clearAnnotations();
+                }
 
                 if (_body.remove(item)) {
@@ -966 +1003 @@
         private void addToUndo(Collection<Item> items, History.Type type)
         {
-                if (items.size() < 1) return;
+                if (items.size() < 1) {
+                        return;
+                }
 
                 _undo.push(new History(items, type));
@@ -986 +1025 @@
                 boolean bRecalculate = false;
 
-                if (_undo.size() <= 0) return;
+                if (_undo.size() <= 0) {
+                        return;
+                }
 
                 History undo = _undo.pop();
@@ -1044 +1085 @@
                 boolean bRecalculate = false;
 
-                if (_redo.size() <= 0) return;
+                if (_redo.size() <= 0) {
+                        return;
+                }
 
                 History redo = _redo.pop();
@@ -1134 +1177 @@
         public UserAppliedPermission getUserAppliedPermission(UserAppliedPermission defaultPermission)
         {
-                if (_permissionPair == null) return defaultPermission;
+                if (_permissionPair == null) {
+                        return defaultPermission;
+                }
 
                 return _permissionPair.getPermission(_owner);
@@ -1224 +1269 @@
         }
 
+        @Override
         public String toString()
         {
@@ -1253 +1299 @@
 
                 int ind = toCheck.indexOf(current);
-                if (ind == -1) return null;
+                if (ind == -1) {
+                        return null;
+                }
 
                 // loop through all items above this one, return the first match
                 for (int i = ind - 1; i >= 0; i--) {
                         Text check = toCheck.get(i);
-                        if (FrameUtils.inSameColumn(check, current)) return check;
+                        if (FrameUtils.inSameColumn(check, current)) {
+                                return check;
+                        }
                 }
 
@@ -1274 +1324 @@
         {
                 // Check that this item is on the current frame
-                if (!_body.contains(from)) return null;
+                if (!_body.contains(from)) {
+                        return null;
+                }
 
                 if (from == null) {
@@ -1280 +1332 @@
                 }
 
-                if (from == null) return null;
+                if (from == null) {
+                        return null;
+                }
 
                 // Get the enclosedItems
@@ -1304 +1358 @@
 
                         // If its the title index will be 0
-                        if (index < 0) index = 0;
+                        if (index < 0) {
+                                index = 0;
+                        }
 
                         for (int i = index; i < toCheck.size(); i++) {
                                 Text item = toCheck.get(i);
-                                if (FrameUtils.inSameColumn(from, item)) column.add(item);
+                                if (FrameUtils.inSameColumn(from, item)) {
+                                        column.add(item);
+                                }
                         }
                 }
@@ -1328 +1386 @@
         {
                 // make sure we dont add this frame as an overlay of itself
-                if (toAdd.Frame == this) return false;
+                if (toAdd.Frame == this) {
+                        return false;
+                }
                 
                 _vectors.add(toAdd);
@@ -1338 +1398 @@
                 
                 HighlightMode mode = toAdd.Source.getHighlightMode();
-                if (mode != HighlightMode.None) mode = HighlightMode.Connected;
+                if (mode != HighlightMode.None) {
+                        mode = HighlightMode.Connected;
+                }
                 
                 Colour highlightColor = toAdd.Source.getHighlightColor();
@@ -1352 +1414 @@
                         // Get the right most x and bottom most y pos
                         int itemRight = i.getX() + i.getBoundsWidth();
-                        if (itemRight > maxX) maxX = itemRight;
+                        if (itemRight > maxX) {
+                                maxX = itemRight;
+                        }
                         
                         int itemBottom = i.getY() + i.getBoundsHeight();
-                        if (itemBottom > maxY) maxY = itemBottom;
+                        if (itemBottom > maxY) {
+                                maxY = itemBottom;
+                        }
                 }
                 
@@ -1387 +1453 @@
         private boolean getVectorsDeep(List<Vector> vectors, Frame vector, List<Frame> seenVectors)
         {
-                if (seenVectors.contains(vector)) return false;
+                if (seenVectors.contains(vector)) {
+                        return false;
+                }
 
                 seenVectors.add(vector);
@@ -1411 +1479 @@
         private boolean getOverlaysDeep(List<Overlay> overlays, List<Frame> seenOverlays)
         {
-                if (seenOverlays.contains(this)) return false;
+                if (seenOverlays.contains(this)) {
+                        return false;
+                }
                 
                 seenOverlays.add(this);
@@ -1438 +1508 @@
                 List<Widget> widgets = new LinkedList<Widget>();
                 
-                for (Overlay o : getOverlaysDeep()) widgets.addAll(o.Frame.getInteractiveWidgets());
+                for (Overlay o : getOverlaysDeep()) {
+                        widgets.addAll(o.Frame.getInteractiveWidgets());
+                }
                 
                 return widgets;
@@ -1453 +1525 @@
         public Overlay getOverlayOwner(Item item)
         {
-                if (item == null) throw new NullPointerException("item");
+                if (item == null) {
+                        throw new NullPointerException("item");
+                }
 
                 for (Overlay l : getOverlays()) {
-                        if (item.getParent() == l.Frame) return l;
+                        if (item.getParent() == l.Frame) {
+                                return l;
+                        }
                 }
 
@@ -1462 +1538 @@
                 // the vector frame
                 for (Vector v : getVectors()) {
-                        if (item.getParent() == v.Frame) return v;
+                        if (item.getParent() == v.Frame) {
+                                return v;
+                        }
                 }
 
@@ -1482 +1560 @@
         protected boolean removeVector(Vector toRemove)
         {
-                if (!_vectors.remove(toRemove)) return false;
+                if (!_vectors.remove(toRemove)) {
+                        return false;
+                }
                 
                 for (Item i : toRemove.Frame.getVectorItems()) {
@@ -1550 +1630 @@
         {
                 // make sure we dont add this frame as an overlay of itself
-                if (toAdd.Frame == this) return false;
+                if (toAdd.Frame == this) {
+                        return false;
+                }
                 
                 // Dont add the overlay if there is already one for this frame
-                if (_overlays.values().contains(toAdd.Frame)) return false;
+                if (_overlays.values().contains(toAdd.Frame)) {
+                        return false;
+                }
                 
                 // Add the overlay to the map of overlays on this frame
@@ -1560 +1644 @@
                 // Add all the overlays from the overlay frame to this frame
                 // TODO: Can this cause a recursion loop? If A and B are overlays of each other? cts16
-                for (Overlay o : toAdd.Frame.getOverlays()) addOverlay(o);
+                for (Overlay o : toAdd.Frame.getOverlays()) {
+                        addOverlay(o);
+                }
 
                 // Add all the vectors from the overlay frame to this frame
-                for (Vector v : toAdd.Frame.getVectors()) addVector(v);
+                for (Vector v : toAdd.Frame.getVectors()) {
+                        addVector(v);
+                }
 
                 // Now add the items for this overlay
@@ -1599 +1687 @@
         private void merge(Frame toMergeWith)
         {
-                if (toMergeWith == null) return;
+                if (toMergeWith == null) {
+                        return;
+                }
 
                 List<Item> copies = ItemUtils.CopyItems(toMergeWith.getItems());
@@ -1658 +1748 @@
                 if (keepAnnotations) {
                         for (Item i : _body) {
-                                if (i.isAnnotation()) newBody.add(i);
+                                if (i.isAnnotation()) {
+                                        newBody.add(i);
+                                }
                         }
                 }
@@ -1667 +1759 @@
                 change();
 
-                if (!keepAnnotations && _annotations != null) _annotations.clear();
+                if (!keepAnnotations && _annotations != null) {
+                        _annotations.clear();
+                }
         }
 
@@ -1732 +1826 @@
                 Item template = getTemplate(_dotTemplate, ItemUtils.TAG_DOT_TEMPLATE);
                 float thickness = template.getThickness();
-                if (thickness > 0) dot.setThickness(template.getThickness());
-                if (template.getLinePattern() != null) dot.setLinePattern(template.getLinePattern());
+                if (thickness > 0) {
+                        dot.setThickness(template.getThickness());
+                }
+                if (template.getLinePattern() != null) {
+                        dot.setLinePattern(template.getLinePattern());
+                }
                 dot.setColor(template.getColor());
                 dot.setFillColor(template.getFillColor());
@@ -1754 +1852 @@
 
                 if (t == null) {
-                        if (defaultTemplate == null) return null;
+                        if (defaultTemplate == null) {
+                                return null;
+                        }
                         
                         t = defaultTemplate;
@@ -1932 +2032 @@
                 for (int i = 0; i < items.size(); i++) {
                         Item it = items.get(i);
-                        if (isNormalTextItem(it)) itemsFound++;
+                        if (isNormalTextItem(it)) {
+                                itemsFound++;
+                        }
                         if (itemsFound > index) {
                                 DisplayController.setCursorPosition(((Text) it).getParagraphEndPosition().getX(), it.getY());
@@ -1964 +2066 @@
                                         t.setText("");
 
-                                        if (t.getText().equals("")) DisplayController.getCurrentFrame().removeItem(t);
+                                        if (t.getText().equals("")) {
+                                                DisplayController.getCurrentFrame().removeItem(t);
+                                        }
                                         
                                         if (!FreeItems.hasItemsAttachedToCursor()) {
@@ -2021 +2125 @@
         public void refreshItemPermissions(UserAppliedPermission maxPermission)
         {
-                if(_frameName == null) return;
+                if(_frameName == null) {
+                        return;
+                }
                 
                 UserAppliedPermission permission = UserAppliedPermission.min(maxPermission, getUserAppliedPermission());
@@ -2057 +2163 @@
         {
                 Text title = getTitleItem();
-                if (title == null) return false;
+                if (title == null) {
+                        return false;
+                }
                 String action = title.getFirstAction();
-                if (action == null) return false;
+                if (action == null) {
+                        return false;
+                }
                 action = action.toLowerCase();
                 return action.startsWith(Simple.RUN_FRAME_ACTION) || action.startsWith(Simple.DEBUG_FRAME_ACTION);
@@ -2100 +2210 @@
         {
                 Text backupTag = _annotations.get("old");
-                if (backupTag == null) return null;
+                if (backupTag == null) {
+                        return null;
+                }
                 
                 // TODO want another way to deal with updating of annotations items
@@ -2114 +2226 @@
                 // Now return the name of the backed up frame
                 String link = backupTag.getAbsoluteLink();
-                if (link == null || link.equalsIgnoreCase(getName())) return null;
+                if (link == null || link.equalsIgnoreCase(getName())) {
+                        return null;
+                }
 
                 Frame backup = FrameIO.LoadFrame(link);
@@ -2197 +2311 @@
         public boolean hasAnnotation(String annotation)
         {
-                if (_annotations == null) refreshAnnotationList();
+                if (_annotations == null) {
+                        refreshAnnotationList();
+                }
                 
                 return _annotations.containsKey(annotation.toLowerCase());
@@ -2212 +2328 @@
         public String getAnnotationValue(String annotation)
         {
-                if (_annotations == null) refreshAnnotationList();
+                if (_annotations == null) {
+                        refreshAnnotationList();
+                }
 
                 Text text = _annotations.get(annotation.toLowerCase());
-                if (text == null) return null;
+                if (text == null) {
+                        return null;
+                }
 
                 String[] tokens = text.getProcessedText();
                 
-                if (tokens != null && tokens.length > 1) return tokens[1];
+                if (tokens != null && tokens.length > 1) {
+                        return tokens[1];
+                }
                 
                 return null;
@@ -2276 +2398 @@
 
                 for (Item i : _body) {
-                        if (i == null || i.dontSave()) continue;
+                        if (i == null || i.dontSave()) {
+                                continue;
+                        }
 
                         // Ensure only one of the WidgetCorners represent a single widget
                         if (i instanceof WidgetCorner) {
                                 Widget iw = ((WidgetCorner) i).getWidgetSource();
-                                if (seenWidgets.contains(iw)) continue;
+                                if (seenWidgets.contains(iw)) {
+                                        continue;
+                                }
                                 seenWidgets.add(iw);
                                 toSave.add(iw.getSource());
@@ -2354 +2480 @@
         public Text getAnnotation(String annotation)
         {
-                if (_annotations == null) refreshAnnotationList();
+                if (_annotations == null) {
+                        refreshAnnotationList();
+                }
 
                 return _annotations.get(annotation.toLowerCase());
@@ -2486 +2614 @@
                  * every time this method is called
                  */
-                if (_interactableItems.size() > 0) return _interactableItems;
+                if (_interactableItems.size() > 0) {
+                        return _interactableItems;
+                }
 
                 for (Item i : _body) {
-                        if (i == null) continue;
+                        if (i == null) {
+                                continue;
+                        }
                         if (i.isVisible()) {
                                 _interactableItems.add(i);
@@ -2527 +2659 @@
                 }
                 
+                @Override
                 public String toString()
                 {