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

Timestamp:

01/07/09 13:25:13 (15 years ago)

Author:

ra33

Message:

 

File:

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

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

@@ -27 +27 @@
 import org.expeditee.items.widgets.WidgetEdge;
 
-
 //Static methods that provide functions for the objects\
 //mostly to transform values (string -> color etc).
@@ -76 +75 @@
 
         public static final int TAG_VECTOR = 19;
-        
+
         public static final int TAG_ACTIVE_VECTOR = 21;
 
@@ -457 +456 @@
 
                 for (Item i : toCopy) {
-                        //Dont copy parts of a vector
-                        if(!i.hasPermission(Permission.copy))
+                        // Dont copy parts of a vector
+                        if (!i.hasPermission(Permission.copy))
                                 continue;
-                        
+
                         // BROOK
                         if (i instanceof WidgetCorner) { // dont add these
@@ -587 +586 @@
 
                 }
-                
-                //Make sure filled rectangles are shown filled on vector overlays
-                if(v != null)
+
+                // Make sure filled rectangles are shown filled on vector overlays
+                if (v != null)
                         EnclosedCheck(copies);
 
@@ -654 +653 @@
                 copy.removeAllConstraints();
 
-                for(Line l: origEnd.getLines()){
+                for (Line l : origEnd.getLines()) {
                         l.invalidateAll();
                 }
-                
+
                 // create a new line
                 Frame currentFrame = DisplayIO.getCurrentFrame();
@@ -867 +866 @@
 
         /**
-         * Determines if an item is visible from a the current frame(s).
-         * If the item is free then it is considered visible.
-         * @param i The item to check
+         * Determines if an item is visible from a the current frame(s). If the item
+         * is free then it is considered visible.
+         * 
+         * @param i
+         *            The item to check
          * @return True if visible/free from given frame.
          */
@@ -879 +880 @@
                                 return true;
                         }
-                } else  {
+                } else {
                         return isVisible(DisplayIO.getCurrentFrame(), i);
                 }
@@ -885 +886 @@
 
         /**
-         * Determines if an item is visible from a given frame.
-         * If the item is free then it is considered visible.
-         * 
-         * @param fromFrame The frame to check from.
-         * @param i The item to check
+         * Determines if an item is visible from a given frame. If the item is free
+         * then it is considered visible.
+         * 
+         * @param fromFrame
+         *            The frame to check from.
+         * @param i
+         *            The item to check
          * @return True if visible/free from given frame.
          */
         public static boolean isVisible(Frame fromFrame, Item i) {
-                if (fromFrame == null) return false;
+                if (fromFrame == null)
+                        return false;
+
+                Frame parent = i.getParent();
+
+                if (parent == fromFrame)
+                        return true;
                 
-                Frame parent = i.getParent();
-                
-                if (parent == fromFrame) return true;
-                
-                else if (parent == null) return FreeItems.getInstance().contains(i);
-                
+                else if (parent == null)
+                        return FreeItems.getInstance().contains(i)
+                                        || FreeItems.getCursor().contains(i);
+
                 return fromFrame.getAllItems().contains(i) && i.isVisible();
         }
-        
+
         public static Rectangle expandRectangle(Rectangle r, int n) {
-                return new Rectangle(r.x - (n >> 1), r.y - (n >> 1), 
-                                r.width + n, r.height + n);
-        }
-        
+                return new Rectangle(r.x - (n >> 1), r.y - (n >> 1), r.width + n,
+                                r.height + n);
+        }
+
         /*
          * FrameMouseActions while (!copies.isEmpty()) { Iterator<Item> iterator =
@@ -943 +950 @@
                 item.setPermission(permission);
 
-                //TODO encapsulate this somewhere inside of circle class!
-//              if(item instanceof Circle){
-//                      scaleItem(v, ((Circle)item).getCenter());
-//              }
-                
-                if (!(item instanceof Line)) {          
+                // TODO encapsulate this somewhere inside of circle class!
+                // if(item instanceof Circle){
+                // scaleItem(v, ((Circle)item).getCenter());
+                // }
+
+                if (!(item instanceof Line)) {
                         if (item.getColor() == null) {
                                 item.setColor(defaultForeground);
@@ -963 +970 @@
                                 item.setActionMark(false);
                         }
-                        
+
                         item.scale(scale, originX, originY);
                 }
 
         }
-        
+
         /**
          * Extracts widgets from an item list.
          * 
          * @param items
-         *              Items to extract from. Must not be null.
-         * 
-         * @return
-         *              List of (unique)widgets in items. Never null.
+         *            Items to extract from. Must not be null.
+         * 
+         * @return List of (unique)widgets in items. Never null.
          */
         public static List<InteractiveWidget> extractWidgets(List<Item> items) {
-                assert(items != null);
-                
+                assert (items != null);
+
                 List<InteractiveWidget> iWidgets = new LinkedList<InteractiveWidget>();
-                
+
                 for (Item i : items) {
                         if (i instanceof WidgetEdge) {
-                                WidgetEdge we = (WidgetEdge)i;
+                                WidgetEdge we = (WidgetEdge) i;
                                 if (!iWidgets.contains(we.getWidgetSource()))
                                         iWidgets.add(we.getWidgetSource());
                         } else if (i instanceof WidgetCorner) {
-                                WidgetCorner wc = (WidgetCorner)i;
+                                WidgetCorner wc = (WidgetCorner) i;
                                 if (!iWidgets.contains(wc.getWidgetSource()))
                                         iWidgets.add(wc.getWidgetSource());
                         }
                 }
-                
+
                 return iWidgets;
         }
-        
+
 }