Changeset 1174 for trunk

Timestamp:

09/28/18 10:22:03 (6 years ago)

Author:

bln4

Message:

 

File:

• trunk/src/org/expeditee/gui/FreeItems.java (modified) (9 diffs)

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

@@ -59 +59 @@
         @Override
         public void clear()
-        {
+        {               
                 for (Item i : this) {
                         i.invalidateAll();
@@ -105 +105 @@
         public static boolean textOnlyAttachedToCursor()
         {
-                if (!hasItemsAttachedToCursor()) return false;
-                
-                for (Item i : getInstance()) {
-                        if (!(i instanceof Text)) return false;
+                if (!hasItemsAttachedToCursor()) {
+                        return false;
+                }
+                
+                for (Item i : getInstance()) {
+                        if (!(i instanceof Text)) {
+                                return false;
+                        }
                 }
                 
@@ -116 +120 @@
         public static Item getItemAttachedToCursor()
         {
-                if (hasItemsAttachedToCursor()) return getInstance().get(0);
+                if (hasItemsAttachedToCursor()) {
+                        return getInstance().get(0);
+                }
                 
                 return null;
@@ -123 +129 @@
         public static Text getTextAttachedToCursor()
         {
-                if (textOnlyAttachedToCursor()) return (Text) getInstance().get(0);
+                if (textOnlyAttachedToCursor()) {
+                        return (Text) getInstance().get(0);
+                }
                 
                 return null;
@@ -137 +145 @@
                 
                 for (Item i : getInstance()) {
-                        if (i instanceof Text) textItems.add((Text) i);
+                        if (i instanceof Text) {
+                                textItems.add((Text) i);
+                        }
                 }
 
@@ -150 +160 @@
                 Collection<Item> addedItems = new HashSet<Item>();
                 for (Item i : getInstance()) {
-                        if (!(i instanceof Text) || !i.isLineEnd()) continue;
+                        if (!(i instanceof Text) || !i.isLineEnd()) {
+                                continue;
+                        }
                         
                         // Check for text inside the box
@@ -218 +230 @@
                         if(i.isVisible()) {
                                 toCount.removeAll(i.getAllConnected()); // treat polygons as a single item
-                                if(c++ > 0) return true;
+                                if(c++ > 0) {
+                                        return true;
+                                }
                         }
                 }
@@ -239 +253 @@
         public static boolean rubberBanding()
         {
-                if (getInstance().size() != 2) return false;
+                if (getInstance().size() != 2) {
+                        return false;
+                }
 
                 // if rubber-banding, there will be 1 line end and the rest will be lines
@@ -245 +261 @@
                 for (Item i : getInstance()) {
                         if (i.isLineEnd()) {
-                                if (foundLineEnd) return false;
+                                if (foundLineEnd) {
+                                        return false;
+                                }
                                 foundLineEnd = true;
                         } else if (!(i instanceof Line) || !i.isVisible()) {