Changeset 314

Timestamp:

09/23/08 15:22:50 (16 years ago)

Author:

bjn8

Message:

 

Location:

trunk/src/org/expeditee

Files:

• gui/FrameKeyboardActions.java (modified) (1 diff)
• gui/FrameMouseActions.java (modified) (2 diffs)
• gui/FrameUtils.java (modified) (1 diff)
• items/Line.java (modified) (1 diff)
• items/widgets/HeavyDutyInteractiveWidget.java (modified) (1 diff)
• items/widgets/InteractiveWidget.java (modified) (2 diffs)

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

@@ -708 +708 @@
                                 }
                         }
-                        if (current.getLink() != null) {
+                        if (current != null && current.getLink() != null) {
                                 Navigation.Goto(current.getAbsoluteLink());
                                 return;

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

@@ -1975 +1975 @@
                 }
         }
-
+        
         /**
          * Moves the items to the current mouse position (plus the current offset)
@@ -2982 +2982 @@
                 return new Point(getX(), getY());
         }
+        
+        public static Point getFreeItemsOffset() {
+                return new Point(_offX, _offY);
+        }
 }

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

@@ -811 +811 @@
                                 } else if (i.hasOverlay()) {
                                         i.setVisible(true);
-                                        int x = i.getBoundsHeight();
+                                        //int x = i.getBoundsHeight();
                                 }
                         }

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

@@ -638 +638 @@
         @Override
         public final float getThickness() {
-                assert(_start.getThickness() == _end.getThickness());
+                //assert(_start.getThickness() == _end.getThickness()); // TODO: assertions on a getter? Brook: Breaks widgets - unsure how to atomically set thickness over whole widget
                 
                 return _start.getThickness();

trunk/src/org/expeditee/items/widgets/HeavyDutyInteractiveWidget.java

@@ -359 +359 @@
         }*/
 
+        /**
+         * Important: Must be called otherwise the widget states may become unstable.
+         */
         @Override
-        public final void onDelete() {
+        public void onDelete() {
                 super.onDelete();
                 // Evenetually - unload the data - with the intention of possible recovery, but not saving...

trunk/src/org/expeditee/items/widgets/InteractiveWidget.java

@@ -1666 +1666 @@
 
         protected Point getOrigin() {
-                return _d1.getPosition(); // BROOK: This flips around ... the origin can be any point 
+                return _d1.getPosition(); // NOTE FROM BROOK: This flips around ... the origin can be any point 
         }
 
@@ -1685 +1685 @@
                 getSource().setAnchorRight(anchor);
         }
+        
 }