Changeset 1190 for trunk/src/org/expeditee/items/ItemUtils.java

Timestamp:

10/31/18 10:24:23 (6 years ago)

Author:

bln4

Message:

 

File:

• trunk/src/org/expeditee/items/ItemUtils.java (modified) (26 diffs)

trunk/src/org/expeditee/items/ItemUtils.java

@@ -40 +40 @@
 import org.expeditee.gui.Vector;
 import org.expeditee.items.Item.HighlightMode;
-import org.expeditee.items.widgets.Widget;
 import org.expeditee.items.widgets.InteractiveWidgetInitialisationFailedException;
 import org.expeditee.items.widgets.InteractiveWidgetNotAvailableException;
+import org.expeditee.items.widgets.Widget;
 import org.expeditee.items.widgets.WidgetCorner;
 import org.expeditee.items.widgets.WidgetEdge;
@@ -160 +160 @@
         public static Text FindTag(Collection<Item> items, String toFind) {
                 for (Item i : items) {
-                        if (i instanceof Text && i.isAnnotation())
-                                if (((Text) i).startsWith(toFind))
+                        if (i instanceof Text && i.isAnnotation()) {
+                                if (((Text) i).startsWith(toFind)) {
                                         return (Text) i;
+                                }
+                        }
                 }
                 return null;
@@ -169 +171 @@
         public static Item FindExactTag(Collection<Item> items, String toFind) {
                 for (Item i : items) {
-                        if (i instanceof Text && i.isAnnotation())
-                                if (((Text) i).getText().trim().equalsIgnoreCase(toFind))
-                                        return (Item) i;
+                        if (i instanceof Text && i.isAnnotation()) {
+                                if (((Text) i).getText().trim().equalsIgnoreCase(toFind)) {
+                                        return i;
+                                }
+                        }
                 }
 
@@ -212 +216 @@
         public static boolean startsWithTag(Item toCheck, String tag,
                         boolean valueAllowed) {
-                if (!(toCheck instanceof Text))
+                if (!(toCheck instanceof Text)) {
                         return false;
+                }
 
                 Text txt = (Text) toCheck;
                 String value = ItemUtils.StripTag(txt.getText(), tag);
 
-                if (value == null)
+                if (value == null) {
                         return false;
+                }
                 return valueAllowed || value.equals("");
         }
@@ -246 +252 @@
          */
         public static String StripTag(String toStrip, String tag) {
-                if (toStrip == null)
+                if (toStrip == null) {
                         return null;
+                }
                 toStrip = toStrip.trim();
-                if (!toStrip.toLowerCase().startsWith(tag.toLowerCase()))
+                if (!toStrip.toLowerCase().startsWith(tag.toLowerCase())) {
                         return null;
-
-                if (toStrip.length() == tag.length())
+                }
+
+                if (toStrip.length() == tag.length()) {
                         return "";
+                }
                 // remove tag and ensure the char is the tag separator
                 char separator = toStrip.charAt(tag.length());
-                if (separator != ':')
+                if (separator != ':') {
                         return null;
-
-                if (toStrip.length() == tag.length() + 1)
+                }
+
+                if (toStrip.length() == tag.length() + 1) {
                         return "";
+                }
 
                 return toStrip.substring(tag.length() + 1).trim();
@@ -377 +388 @@
 
                         int fileSuffixChar = text.indexOf('.');
-                        if (fileSuffixChar < 0)
+                        if (fileSuffixChar < 0) {
                                 return null;
+                        }
                         int endOfFileName = text.indexOf(' ', fileSuffixChar);
                         if (endOfFileName < 0) {
@@ -394 +406 @@
                         for (String dir : FolderSettings.ImageDirs.get()) {
                                 file = new File(dir + path);
-                                if (file.exists() && !file.isDirectory())
+                                if (file.exists() && !file.isDirectory()) {
                                         break;
-                        }
-
-                        if (file == null || !file.exists() || file.isDirectory())
+                                }
+                        }
+
+                        if (file == null || !file.exists() || file.isDirectory()) {
                                 file = new File(path);
+                        }
 
                         // try relative path
@@ -415 +429 @@
                                 }
 
-                        } else
+                        } else {
                                 path = file.getPath();
+                        }
 
                         // if the image isn't found by now, try remote servers
@@ -487 +502 @@
                 for (Item i : toCopy) {
                         // Dont copy parts of a vector
-                        if (i == null || !i.hasPermission(UserAppliedPermission.copy))
+                        if (i == null || !i.hasPermission(UserAppliedPermission.copy)) {
                                 continue;
+                        }
 
                         // BROOK
                         if (i instanceof WidgetCorner) { // dont add these
                                 if (!widgets.contains(((WidgetCorner) i).getWidgetSource()))
+                                 {
                                         widgets.add(((WidgetCorner) i).getWidgetSource());
                                 // BROOK
+                                }
                         } else if (i instanceof WidgetEdge) { // dont add these
                                 // lines are recreated later
@@ -577 +595 @@
                         Item originalLineEnd = line.getEndItem();
                         Item actualLineEnd = lineEndMap.get(originalLineEnd);
-                        if (actualLineEnd == null)
+                        if (actualLineEnd == null) {
                                 lineCopy.setEndItem(originalLineEnd);
-                        else
+                        } else {
                                 lineCopy.setEndItem(actualLineEnd);
+                        }
 
                         Item originalLineStart = line.getStartItem();
                         Item actualLineStart = lineEndMap.get(originalLineStart);
-                        if (actualLineStart == null)
+                        if (actualLineStart == null) {
                                 lineCopy.setStartItem(originalLineStart);
-                        else
+                        } else {
                                 lineCopy.setStartItem(actualLineStart);
+                        }
 
                         copies.add(lineCopy);
@@ -618 +638 @@
 
                 // Make sure filled rectangles are shown filled on vector overlays
-                if (v != null)
+                if (v != null) {
                         EnclosedCheck(copies);
+                }
 
                 return copies;
@@ -637 +658 @@
         public static List<Item> UnreelLine(Item toUnreelFrom, boolean constrain) {
                 // the Item must already have one line to be unreeled from
-                if (toUnreelFrom == null || toUnreelFrom.getLines().size() < 1)
+                if (toUnreelFrom == null || toUnreelFrom.getLines().size() < 1) {
                         return null;
+                }
 
                 List<Item> unreel = new ArrayList<Item>(2);
@@ -670 +692 @@
                         if (item.isLineEnd()) {
                                 // if there are multiple ends in the list, return
-                                if (origEnd != null)
+                                if (origEnd != null) {
                                         return null;
+                                }
 
                                 origEnd = item;
@@ -747 +770 @@
                 // if there are no line endpoints on the Frame, then there can't be an
                 // enclosure
-                if (lineEnds.size() == 0)
+                if (lineEnds.size() == 0) {
                         return;
+                }
 
                 // Now find go through line ends and see if any are annotation items
@@ -757 +781 @@
                         if (item.isAnnotation()) {
                                 Collection<Item> connected = item.getAllConnected();
-                                for (Item i : connected)
+                                for (Item i : connected) {
                                         i.setConnectedToAnnotation(true);
+                                }
                                 lineEnds.removeAll(connected);
                         }
@@ -780 +805 @@
                                 i.setEnclosedList(null);
                                 // Add line ends joined to 2 other lines
-                                if (i.getLines().size() == 2)
+                                if (i.getLines().size() == 2) {
                                         lineEnds.add(i);
+                                }
                         }
                 }
@@ -787 +813 @@
                 // if there are no line endpoints on the Frame, then there can't be an
                 // enclosure
-                if (lineEnds.size() == 0)
+                if (lineEnds.size() == 0) {
                         return;
+                }
 
                 // New approach
@@ -797 +824 @@
                         Collection<Item> connectedLineEnds = new LinkedHashSet<Item>();
                         for (Item itemToCheck : connected) {
-                                if (itemToCheck.isLineEnd())
+                                if (itemToCheck.isLineEnd()) {
                                         connectedLineEnds.add(itemToCheck);
+                                }
                         }
                         // Check that all the line ends are in our lineEnds list
@@ -833 +861 @@
                                 i.setEnclosedList(null);
 
-                                if (i.getLines().size() == 2)
+                                if (i.getLines().size() == 2) {
                                         lineEnds.add(i);
+                                }
                         }
                 }
@@ -840 +869 @@
                 // if there are no line endpoints on the Frame, then there can't be an
                 // enclosure
-                if (lineEnds.size() == 0)
+                if (lineEnds.size() == 0) {
                         return;
+                }
 
                 // TODO optimise this code!!
@@ -853 +883 @@
                                         _path.add(l.getOppositeEnd(searchFor));
 
-                                        for (Item i : _path)
+                                        for (Item i : _path) {
                                                 i.setEnclosedList(_path);
+                                        }
 
                                         _path = new ArrayList<Item>(0);
@@ -869 +900 @@
 
         private static boolean traverse(Item toFind, Item searchFrom) {
-                if (toFind == null || searchFrom == null || !searchFrom.isLineEnd())
+                if (toFind == null || searchFrom == null || !searchFrom.isLineEnd()) {
                         return false;
-
-                if (searchFrom.getLines().size() != 2)
+                }
+
+                if (searchFrom.getLines().size() != 2) {
                         return false;
-
-                if (toFind == searchFrom)
+                }
+
+                if (toFind == searchFrom) {
                         return true;
+                }
 
                 for (Line l : searchFrom.getLines()) {
@@ -924 +958 @@
         public static boolean isVisible(Frame fromFrame, Item i)
         {
-                if (fromFrame == null) return false;
+                if (fromFrame == null) {
+                        return false;
+                }
 
                 Frame parent = i.getParent();
@@ -939 +975 @@
         public static AxisAlignedBoxBounds expandRectangle(AxisAlignedBoxBounds r, int n)
         {
-                if (r == null) return null;
+                if (r == null) {
+                        return null;
+                }
                 
                 return new AxisAlignedBoxBounds(r.getMinX() - (n >> 1), r.getMinY() - (n >> 1), r.getWidth() + n, r.getHeight() + n);
@@ -1022 +1060 @@
                         if (i instanceof WidgetEdge) {
                                 WidgetEdge we = (WidgetEdge) i;
-                                if (!iWidgets.contains(we.getWidgetSource()))
+                                if (!iWidgets.contains(we.getWidgetSource())) {
                                         iWidgets.add(we.getWidgetSource());
+                                }
                         } else if (i instanceof WidgetCorner) {
                                 WidgetCorner wc = (WidgetCorner) i;
-                                if (!iWidgets.contains(wc.getWidgetSource()))
+                                if (!iWidgets.contains(wc.getWidgetSource())) {
                                         iWidgets.add(wc.getWidgetSource());
+                                }
                         }
                 }
@@ -1055 +1095 @@
         public static void Justify(Frame frame)
         {
-                if (frame == null) return;
+                if (frame == null) {
+                        return;
+                }
                 EnclosedCheck(frame.getItems());
                 Justify(frame.getItems());