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

Timestamp:

09/28/18 10:21:23 (6 years ago)

Author:

bln4

Message:

 

File:

• trunk/src/org/expeditee/gui/FrameUtils.java (modified) (42 diffs)

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

@@ -62 +62 @@
 import org.expeditee.items.XRayable;
 import org.expeditee.items.widgets.ButtonWidget;
-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;
@@ -120 +120 @@
          */
         public static boolean inSameColumn(Item item1, Item item2) {
-                if (!(item1 instanceof Text) || !(item2 instanceof Text))
+                if (!(item1 instanceof Text) || !(item2 instanceof Text)) {
                         return false;
-
-                if (item1.getID() < 0 || item2.getID() < 0)
+                }
+
+                if (item1.getID() < 0 || item2.getID() < 0) {
                         return false;
+                }
 
                 int minX = item2.getX();
@@ -133 +135 @@
 
                 // Check that the two items left values are close
-                if (Math.abs(item1.getX() - item2.getX()) > COLUMN_WIDTH)
+                if (Math.abs(item1.getX() - item2.getX()) > COLUMN_WIDTH) {
                         return false;
+                }
 
                 // Ensure the two items
@@ -140 +143 @@
                                 || (maxX >= startX && maxX <= endX)
                                 || (startX >= minX && startX <= maxX)
-                                || (endX >= minX && endX <= maxX))
+                                || (endX >= minX && endX <= maxX)) {
                         return true;
+                }
 
                 return false;
@@ -148 +152 @@
         public static boolean sameBulletType(String bullet1, String bullet2)
         {
-                if (bullet1 == null || bullet2 == null)
+                if (bullet1 == null || bullet2 == null) {
                         return false;
-
-                if (bullet1.equals("") || bullet2.equals(""))
+                }
+
+                if (bullet1.equals("") || bullet2.equals("")) {
                         return false;
+                }
 
                 if (Character.isLetter(bullet1.charAt(0))
-                                && Character.isLetter(bullet2.charAt(0)))
+                                && Character.isLetter(bullet2.charAt(0))) {
                         return true;
+                }
 
                 if (Character.isDigit(bullet1.charAt(0))
-                                && Character.isDigit(bullet2.charAt(0)))
+                                && Character.isDigit(bullet2.charAt(0))) {
                         return true;
+                }
 
                 // TODO make this more sofisticated
@@ -168 +176 @@
 
         private static boolean needsRenumbering(String s) {
-                if (s == null || s.equals(""))
+                if (s == null || s.equals("")) {
                         return false;
-                if (!Character.isLetterOrDigit(s.charAt(0)))
+                }
+                if (!Character.isLetterOrDigit(s.charAt(0))) {
                         return false;
+                }
 
                 s = s.trim();
@@ -177 +187 @@
                 if (s.length() > 2) {
                         for (int i = 0; i < s.length() - 1; i++) {
-                                if (!Character.isLetter(s.charAt(i)))
+                                if (!Character.isLetter(s.charAt(i))) {
                                         return true;
-                        }
-                } else
+                                }
+                        }
+                } else {
                         return true;
+                }
 
                 return false;
@@ -201 +213 @@
                  * still want to format them... ie if they are too close together.
                  */
-                if (toAlign.size() < 1)
+                if (toAlign.size() < 1) {
                         return 0;
+                }
 
                 // get the first item
                 Text from = toAlign.get(0);
-                if (from.getParent() == null)
+                if (from.getParent() == null) {
                         from = toAlign.get(1);
+                }
                 int x = from.getX();
 
@@ -215 +229 @@
                 String lastBullet = "";
 
-                if (above != null && curr.isNormalTextItem(above))
+                if (above != null && curr.isNormalTextItem(above)) {
                         lastBullet = StandardGestureActions.getAutoBullet(above.getText());
-                else {
+                } else {
                         lastBullet = StandardGestureActions.getBullet(toAlign.get(0)
                                         .getText());
@@ -272 +286 @@
                         // Make the gap between all items the same as the gap between
                         // the first two
-                        space = (int) (from.getBounds().getMinY() - above.getBounds().getMaxY());
-
-                        if (space < MINIMUM_INTERITEM_SPACING)
+                        space = from.getBounds().getMinY() - above.getBounds().getMaxY();
+
+                        if (space < MINIMUM_INTERITEM_SPACING) {
                                 space = MINIMUM_INTERITEM_SPACING;
+                        }
 
                         if (UserSettings.FormatSpacingMax.get() != null) {
@@ -297 +312 @@
                                         && above != curr.getTitleItem()) {
                                 x = above.getX();
-                                int y = (int) above.getBounds().getMaxY()
+                                int y = above.getBounds().getMaxY()
                                                 + space
-                                                + ((int) (from.getY() - from.getBounds().getMinY()));
+                                                + (from.getY() - from.getBounds().getMinY());
 
                                 if (changedItems != null
@@ -320 +335 @@
 
                         // The bottom of the previous item
-                        int bottom = (int) top.getBounds().getMaxY();
+                        int bottom = top.getBounds().getMaxY();
 
                         // the difference between the current item's Y coordinate and
                         // the top of the highlight box
-                        int diff = (int) (current.getY() - current.getBounds().getMinY());
+                        int diff = current.getY() - current.getBounds().getMinY();
 
                         int newPos = bottom + space + diff;
@@ -360 +375 @@
                 // active overlay frames may also require saving if they have been
                 // changed
-                for (Overlay o : current.getOverlays())
-                        if (!SaveCheck(o.Frame))
+                for (Overlay o : current.getOverlays()) {
+                        if (!SaveCheck(o.Frame)) {
                                 return false;
+                        }
+                }
 
                 // if the check fails there is no point continuing
-                if (!SaveCheck(current))
+                if (!SaveCheck(current)) {
                         return false;
+                }
 
                 for (Item i : current.getItems()) {
@@ -377 +395 @@
         private static boolean SaveCheck(Frame toSave) {
                 // don't bother saving frames that haven't changed
-                if (!toSave.hasChanged())
+                if (!toSave.hasChanged()) {
                         return true;
+                }
 
                 // if the frame has been changed, then save it
@@ -385 +404 @@
 
                         String side = "left";
-                        if (DisplayController.getCurrentSide() == DisplayController.TwinFramesSide.RIGHT)
+                        if (DisplayController.getCurrentSide() == DisplayController.TwinFramesSide.RIGHT) {
                                 side = "right";
+                        }
 
                         // if the two frames both have changes, prompt the user for the
@@ -395 +415 @@
                                         DisplayController.Reload(DisplayController.getSideFrameIsOn(opposite));
                                         return true;
-                                } else
+                                } else {
                                         return false;
+                                }
                         } else if (opposite.hasOverlay(toSave)) {
-                                if (toSave.hasChanged())
+                                if (toSave.hasChanged()) {
                                         if (EcosystemManager.getGraphicsManager().showDialog("Changes", "Leaving this frame will discard changes made in the " + side + " Frame. Continue?")) {
                                                 FrameIO.SaveFrame(toSave);
                                                 DisplayController.Reload(DisplayController.getSideFrameIsOn(opposite));
                                                 return true;
-                                        } else
+                                        } else {
                                                 return false;
+                                        }
+                                }
                         }
 
@@ -467 +490 @@
         public static void DisplayFrame(Frame toDisplay, boolean addToBack, boolean incrementStats)
         {
-                if (toDisplay == null)
+                if (toDisplay == null) {
                         return;
+                }
 
                 Frame current = DisplayController.getCurrentFrame();
@@ -474 +498 @@
                 // Dont need to do anything if the frame to display is already being
                 // displayed
-                if (current.equals(toDisplay))
+                if (current.equals(toDisplay)) {
                         return;
+                }
 
                 // move any anchored connected items
@@ -568 +593 @@
                 Frame newFrame = getFrame(frameName);
 
-                if (newFrame != null)
+                if (newFrame != null) {
                         // display the frame
                         DisplayFrame(newFrame, addToBack, incrementStats);
+                }
         }
 
@@ -641 +667 @@
         private static boolean createWidget(Frame frame, Text txt) {
 
-                if (frame == null)
+                if (frame == null) {
                         throw new NullPointerException("frame");
-                if (txt == null)
+                }
+                if (txt == null) {
                         throw new NullPointerException("txt");
+                }
 
                 // Safety
-                if (txt.getParent() == null)
+                if (txt.getParent() == null) {
                         txt.setParent(frame);
+                }
 
                 Widget iw = null;
@@ -667 +696 @@
                 }
 
-                if (iw == null)
+                if (iw == null) {
                         return false;
+                }
 
                 frame.removeItem(txt);
@@ -681 +711 @@
                 List<String> errors = new LinkedList<String>();
                 
-                if (profile == null) return errors;
+                if (profile == null) {
+                        return errors;
+                }
 
                 /*
@@ -698 +730 @@
                                 String attributeFullCase = avp.getAttributeOrValue();
 
-                                if (attributeFullCase == null) continue;
+                                if (attributeFullCase == null) {
+                                        continue;
+                                }
                                 
                                 String attribute = attributeFullCase.trim().toLowerCase().replaceAll("^@", "");
 
-                                if (attribute.equals("settings")) Settings.parseSettings(item);
+                                if (attribute.equals("settings")) {
+                                        Settings.parseSettings(item);
+                                }
 
                         } catch (Exception e) {
@@ -724 +760 @@
         public static void loadFirstFrame(Frame profile)
         {
-                if (UserSettings.HomeFrame.get() == null) UserSettings.HomeFrame.set(profile.getName());
+                if (UserSettings.HomeFrame.get() == null) {
+                        UserSettings.HomeFrame.set(profile.getName());
+                }
 
                 Frame firstFrame = FrameIO.LoadFrame(UserSettings.HomeFrame.get());
@@ -755 +793 @@
         public static String getLink(Item item, String alt)
         {
-                if (item == null || !(item instanceof Text)) return alt;
+                if (item == null || !(item instanceof Text)) {
+                        return alt;
+                }
 
                 AttributeValuePair avp = new AttributeValuePair(item.getText());
@@ -798 +838 @@
                                         File tester = new File(dirName);
                                         if (tester.exists() && tester.isDirectory()) {
-                                                if (dirName.endsWith(File.separator))
+                                                if (dirName.endsWith(File.separator)) {
                                                         dirsToAdd.add(dirName);
-                                                else
+                                                } else {
                                                         dirsToAdd.add(dirName + File.separator);
+                                                }
                                         }
                                 }
@@ -838 +879 @@
                 // TODO check why we are getting toParse == null... when profile frame
                 // is being created and change the lines below
-                if (toParse == null) return;
-
-                if (firstParse) ItemUtils.EnclosedCheck(toParse.getItems());
+                if (toParse == null) {
+                        return;
+                }
+
+                if (firstParse) {
+                        ItemUtils.EnclosedCheck(toParse.getItems());
+                }
                 
                 List<Item> items = toParse.getItems();
@@ -882 +927 @@
 
                 // disable reading of cached overlays if in twinframes mode
-                if (DisplayController.isTwinFramesOn()) FrameIO.SuspendCache();
+                if (DisplayController.isTwinFramesOn()) {
+                        FrameIO.SuspendCache();
+                }
 
                 DotType pointtype = DotType.square;
@@ -913 +960 @@
                                                                         String fill = line.substring(line
                                                                                         .indexOf(" ") + 1);
-                                                                        if (fill.startsWith("nofill"))
+                                                                        if (fill.startsWith("nofill")) {
                                                                                 filledPoints = false;
-                                                                        else
+                                                                        } else {
                                                                                 filledPoints = true;
+                                                                        }
                                                                 }
 
-                                                                if (line.startsWith("circle"))
+                                                                if (line.startsWith("circle")) {
                                                                         pointtype = DotType.circle;
-                                                                else
+                                                                } else {
                                                                         pointtype = DotType.square;
+                                                                }
                                                         }
                                                 }// check for new VECTOR items
@@ -929 +978 @@
                                                                                 ItemUtils.TAG_VECTOR)
                                                                 && i.getLink() != null) {
-                                                        if (!i.getAbsoluteLink().equals(toParse.getName()))
+                                                        if (!i.getAbsoluteLink().equals(toParse.getName())) {
                                                                 addVector(vectors, UserAppliedPermission.none,
                                                                                 permission, i);
+                                                        }
                                                 } else if (!DisplayController.isXRayMode()
                                                                 && ItemUtils.startsWithTag(i,
                                                                                 ItemUtils.TAG_ACTIVE_VECTOR)
                                                                 && i.getLink() != null) {
-                                                        if (!i.getAbsoluteLink().equals(toParse.getName()))
+                                                        if (!i.getAbsoluteLink().equals(toParse.getName())) {
                                                                 addVector(vectors,
                                                                                 UserAppliedPermission.followLinks,
                                                                                 permission, i);
+                                                        }
                                                 }
                                                 // check for new OVERLAY items
@@ -976 +1027 @@
                                                                 for (Overlay o : current.getOverlays()) {
                                                                         if (o.Frame.getName()
-                                                                                        .equalsIgnoreCase(link))
+                                                                                        .equalsIgnoreCase(link)) {
                                                                                 overlayFrame = o.Frame;
+                                                                        }
                                                                 }
                                                         }
-                                                        if (overlayFrame == null)
+                                                        if (overlayFrame == null) {
                                                                 overlayFrame = FrameIO.LoadFrame(link);
+                                                        }
 
                                                         // get level if specified
@@ -1156 +1209 @@
                 int x = Math.round(floatX);
                 int y = Math.round(floatY);
-                if (toCheck == null)
+                if (toCheck == null) {
                         return null;
+                }
 
                 List<Item> possibles = new ArrayList<Item>(0);
@@ -1241 +1295 @@
 
                 // if there are no possible items, return null
-                if (possibles.size() == 0)
+                if (possibles.size() == 0) {
                         return null;
+                }
 
                 // if there is only one possibility, return it
-                if (possibles.size() == 1)
+                if (possibles.size() == 1) {
                         return possibles.get(0);
+                }
 
                 // return closest x,y pair to mouse
@@ -1264 +1320 @@
                                 // dots take precedence over lines
                                 if ((!(closest instanceof Dot && i instanceof Line))
-                                                && (!(closest instanceof Text && i instanceof Line)))
+                                                && (!(closest instanceof Text && i instanceof Line))) {
                                         closest = i;
+                                }
 
                         }
@@ -1294 +1351 @@
                 Collection<Item> enclosure = getEnclosingLineEnds();
                 
-                if (enclosure == null || enclosure.size() == 0) return null;
+                if (enclosure == null || enclosure.size() == 0) {
+                        return null;
+                }
 
                 return enclosure.iterator().next().getEnclosedShape();
@@ -1313 +1372 @@
                 Collection<Item> enclosure = getEnclosingLineEnds();
                 
-                if (enclosure == null || enclosure.size() == 0) return null;
+                if (enclosure == null || enclosure.size() == 0) {
+                        return null;
+                }
 
                 Item firstItem = enclosure.iterator().next();
@@ -1378 +1439 @@
                 // update enclosed shapes
                 Frame current = DisplayController.getCurrentFrame();
-                if (current == null) return null;
+                if (current == null) {
+                        return null;
+                }
                 List<Item> items = current.getItems();
 
@@ -1404 +1467 @@
                 }
 
-                if (used.size() == 0) return null;
+                if (used.size() == 0) {
+                        return null;
+                }
 
                 // if there is only one possibility, return it
@@ -1412 +1477 @@
                 } else {
                         Collections.sort(used, new Comparator<Item>() {
+                                @Override
                                 public int compare(Item d1, Item d2) {
                                         PolygonBounds p1 = d1.getEnclosedShape();
@@ -1426 +1492 @@
                                                 int diff2 = Integer.MAX_VALUE;
 
-                                                if (i < p2.getPointCount())
+                                                if (i < p2.getPointCount()) {
                                                         diff2 = Math.abs(p2.getPoint(i).getX() - mouseX)  + Math.abs(p2.getPoint(i).getY() - mouseY);
+                                                }
 
                                                 if (diff < Math.abs(closest)) {
                                                         close2 = closest;
                                                         closest = diff;
-                                                } else if (diff < Math.abs(close2))
+                                                } else if (diff < Math.abs(close2)) {
                                                         close2 = diff;
+                                                }
 
                                                 if (diff2 < Math.abs(closest)) {
                                                         close2 = closest;
                                                         closest = -diff2;
-                                                } else if (diff2 < Math.abs(close2))
+                                                } else if (diff2 < Math.abs(close2)) {
                                                         close2 = diff2;
-                                        }
-
-                                        if (closest > 0 && close2 > 0)
+                                                }
+                                        }
+
+                                        if (closest > 0 && close2 > 0) {
                                                 return -10;
-
-                                        if (closest < 0 && close2 < 0)
+                                        }
+
+                                        if (closest < 0 && close2 < 0) {
                                                 return 10;
-
-                                        if (closest > 0)
+                                        }
+
+                                        if (closest > 0) {
                                                 return -10;
+                                        }
 
                                         return 10;
@@ -1821 +1893 @@
                 File check = new File(FrameIO.PARENT_FOLDER + ".res");
                 
-                if(!force && check.exists()) return;
+                if(!force && check.exists()) {
+                        return;
+                }
                 
                 System.out.println("Extracting/Installing resources:");
@@ -1935 +2009 @@
         public static void copyFile(File src, File dst, boolean overWrite) throws IOException
         {
-                if(!overWrite && dst.exists()) return;
+                if(!overWrite && dst.exists()) {
+                        return;
+                }
                 
                 dst.getParentFile().mkdirs();