Changeset 70 for trunk/src/org/expeditee/items/Item.java

Timestamp:

05/21/08 09:40:52 (16 years ago)

Author:

ra33

Message:

Made LOTS of changes...
Added DisplayComet
A whole bunch more stats for items and events
Changed lots of stuff for drawing better especially using text as line endpoints

File:

• trunk/src/org/expeditee/items/Item.java (modified) (5 diffs)

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

@@ -162 +162 @@
 
                 dest.setParent(source.getParent());
-                // Add the copied item to the frame
-                if (source.getParent() != null) {
-                        dest.setID(source.getParent().getNextItemID());
-                } else {
-                        dest.setID(source.getID());
-                }
+                dest.setID(source.getParentOrCurrentFrame().getNextItemID());
         }
 
@@ -906 +901 @@
          * @param merger
          *            The Item to merge with
-         * @param mouseX
-         *            The X coordinate of the mouse when performing this merge
-         *            operation
-         * @param mouseY
-         *            The Y coordinate of the mouse when performing this merge
-         *            operation
          * @return any Item that should remain on the cursor
          */
@@ -1285 +1274 @@
                         // frame
                         if (!other.isFloating()) {
-                                if (c.getType() == Constraint.HORIZONTAL
-                                                && other.getY() != getY())
-                                        other.setY(getY());
-
-                                if (c.getType() == Constraint.VERTICAL
-                                                && other.getX() != getX())
-                                        other.setX(getX());
+                                if (c.getType() == Constraint.HORIZONTAL) {
+                                        if (other.getY() != y)
+                                                other.setY(y);
+                                }
+                                if (c.getType() == Constraint.VERTICAL) {
+                                        if (other.getX() != x)
+                                                other.setX(x);
+                                }
                         }
                 }
@@ -1429 +1419 @@
                 return _visible;
         }
-        
-        /**
-         * Raised whenever the item is removed, added, no longer in view (That is, when it is
-         * not on any of the current frames, of overlays of the current frames) or 
-         * has become visible. That is, when it is either on a current frames, or an overlay of a current frame.
-         * @param e The event
-         */
-        public void onParentStateChanged(ItemParentStateChangedEvent e) {}
-        
+
+        /**
+         * Raised whenever the item is removed, added, no longer in view (That is,
+         * when it is not on any of the current frames, of overlays of the current
+         * frames) or has become visible. That is, when it is either on a current
+         * frames, or an overlay of a current frame.
+         * 
+         * @param e
+         *            The event
+         */
+        public void onParentStateChanged(ItemParentStateChangedEvent e) {
+        }
+
         public void setSelectedMode(SelectedMode mode, Color color) {
                 setSelectionColor(color);
@@ -1552 +1546 @@
                 }
         }
-        
+
         /**
          * Checks if this item is off the left or top of the screen
+         * 
          * @return
          */
         public boolean offScreen() {
                 Rectangle itemRect = getArea().getBounds();
-                //Check that the bottom right corner of this item is on the screen
-                if (itemRect.x + itemRect.width >= 0 && itemRect.y + itemRect.height >= 0)
+                // Check that the bottom right corner of this item is on the screen
+                if (itemRect.x + itemRect.width >= 0
+                                && itemRect.y + itemRect.height >= 0)
                         return false;
-                //Check if all the items it is connected to are offscreen
-                for(Item i: getAllConnected()){
+                // Check if all the items it is connected to are offscreen
+                for (Item i : getAllConnected()) {
                         Rectangle iRect = i.getArea().getBounds();
-                        //Check that the bottom right corner of this item is on the screen
+                        // Check that the bottom right corner of this item is on the screen
                         if (iRect.x + iRect.width >= 0 && iRect.y + iRect.height >= 0) {
                                 return false;