Changeset 55

Timestamp:

05/16/08 10:49:10 (16 years ago)

Author:

davidb

Message:

Fixed bug with widgets movement and scaling

Location:

trunk/src/org/expeditee

Files:

• gui/DisplayIO.java (modified) (5 diffs)
• items/InteractiveWidget.java (modified) (8 diffs)
• items/Item.java (modified) (1 diff)
• items/ItemParentStateChangedEvent.java (added)
• items/WidgetCorner.java (modified) (1 diff)

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

@@ -16 +16 @@
 
 import org.expeditee.items.Item;
+import org.expeditee.items.ItemParentStateChangedEvent;
 import org.expeditee.items.Picture;
 import org.expeditee.stats.SessionStats;
@@ -338 +339 @@
                                         && _CurrentFrames[0] != _CurrentFrames[1]) {
                                 for (Item i : _CurrentFrames[getCurrentSide()].getItems()) {
-                                        i.onParentFameHidden();
+                                        i.onParentStateChanged(new ItemParentStateChangedEvent(
+                                                        _CurrentFrames[getCurrentSide()], 
+                                                        ItemParentStateChangedEvent.EVENT_TYPE_HIDDEN));
                                 }
                         }
@@ -345 +348 @@
                         // BROOK : TODO...
                         for (Item i : _CurrentFrames[getCurrentSide()].getItems()) {
-                                i.onParentFameShown(false, 0);
+                                i.onParentStateChanged(new ItemParentStateChangedEvent(
+                                                _CurrentFrames[getCurrentSide()], 
+                                                ItemParentStateChangedEvent.EVENT_TYPE_SHOWN));
                         }
                 } else {
@@ -397 +402 @@
                                 // Notify items that they are hidden
                                 for (Item i : items) {
-                                        i.onParentFameHidden();
+                                        i.onParentStateChanged(new ItemParentStateChangedEvent(
+                                                        _CurrentFrames[getCurrentSide()], 
+                                                        ItemParentStateChangedEvent.EVENT_TYPE_HIDDEN));
                                 }
                         }
@@ -426 +433 @@
                                 // else ...
                                 assert (owner != null);
-                                i.onParentFameShown(true, owner.Level);
+                                i.onParentStateChanged(new ItemParentStateChangedEvent(
+                                                _CurrentFrames[getCurrentSide()], 
+                                                ItemParentStateChangedEvent.EVENT_TYPE_SHOWN_VIA_OVERLAY,
+                                                owner.Level));
                         }
 
                         // Notify non-overlay items that they are shown
                         for (Item i : nonOverlayItems) {
-                                i.onParentFameShown(false, 0);
+                                i.onParentStateChanged(new ItemParentStateChangedEvent(
+                                                _CurrentFrames[getCurrentSide()], 
+                                                ItemParentStateChangedEvent.EVENT_TYPE_SHOWN));
                         }
                 }

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

@@ -35 +35 @@
         private WidgetEdge _l1, _l2, _l3, _l4;
 
-        /* GUIDE:
-         *                       l1
-         *              d1-------d2
-         *              |         |
-         *   l4 |    X    | 12
-         *              |         |
-         *              d4-------d3
-     *           13
+        /*
+         * GUIDE: l1 d1-------d2 | | l4 | X | 12 | | d4-------d3 13
          */
         private List<Item> _items; // used for quickly returning item list
@@ -112 +106 @@
 
                 int index = text.indexOf(':'); // used for signifying start of
-                                                                                // arguments
+                // arguments
                 if (index == 0)
                         throw new IllegalArgumentException("Source text must begin with \""
@@ -400 +394 @@
 
         /**
+         * This is for consistancy and to make the code clearer.
+         * 
+         * @return the corner chosen to listen for events from.
+         */
+        private WidgetCorner getEventCorner() {
+                return _d4;
+        }
+
+        /**
          * @return A copy of this widget
          */
@@ -504 +507 @@
                 _d3.setFloating(vfloating[2]);
                 _d4.setFloating(vfloating[3]);
-
+                
         }
 
@@ -540 +543 @@
          * @param x
          * @param y
-         * @return True if need to call super.setPosition
+         * @return False if need to call super.setPosition
          */
         boolean setPositions(WidgetCorner src, int x, int y) {
@@ -707 +710 @@
         }
 
-        public final void onParentFameHidden(WidgetCorner notifier) {
-                onRemovedFromFrame(notifier);
-        }
-
-        public final void onParentFameShown(WidgetCorner notifier,
-                        boolean isOverlayed, int overlayLevel) {
-                addJComponantToFrame(notifier, isOverlayed, overlayLevel, true);
-        }
-
-        public void onRemovedFromFrame(WidgetCorner notifier) {
-                if (notifier == _d4) {
+        public void onParentStateChanged(ItemParentStateChangedEvent e) {
+                switch (e.getEventType()) {
+
+                case ItemParentStateChangedEvent.EVENT_TYPE_REMOVED:
+                case ItemParentStateChangedEvent.EVENT_TYPE_REMOVED_VIA_OVERLAY:
+                case ItemParentStateChangedEvent.EVENT_TYPE_HIDDEN:
                         if (_component.getParent() != null) {
                                 _component.getParent().remove(_component);
                         }
-                }
-        }
-
-        public void onAddedToFrame(WidgetCorner notifier, boolean isOverlayed,
-                        int overlayLevel) {
-                addJComponantToFrame(notifier, isOverlayed, overlayLevel, false);
-        }
-
-        private void addJComponantToFrame(WidgetCorner notifier,
-                        boolean isOverlayed, int overlayLevel, boolean isShown) {
-                if (notifier == _d4) {
-                        if (isOverlayed && overlayLevel == Item.PERMISSION_NONE)
-                                return; // non-active overlays
-
+                        break;
+
+                case ItemParentStateChangedEvent.EVENT_TYPE_ADDED:
+                case ItemParentStateChangedEvent.EVENT_TYPE_ADDED_VIA_OVERLAY:
+                case ItemParentStateChangedEvent.EVENT_TYPE_SHOWN:
+                case ItemParentStateChangedEvent.EVENT_TYPE_SHOWN_VIA_OVERLAY:
                         if (_component.getParent() == null) {
-                                if (Browser._theBrowser != null) {
-                                        // Due to precaching - before adding physical swing
-                                        // componant must check
-                                        // to see that this widget belongs to a frame that is
-                                        // considered current.
-                                        // If the widget is shown however this does not apply -
-                                        // since it has been explicitly
-                                        // made clear the the widget is shown.
-                                        if (isShown
-                                                        || _d1.getParent() == DisplayIO.getCurrentFrame()) {
-                                                Browser._theBrowser.getContentPane().add(_component);
-                                                layout(_component);
-                                        }
-
-                                } else { // if widgets exist on startup frame this will occur
-
-                                        synchronized (_widgetsToAddLater) {
-                                                _widgetsToAddLater.add(new WidgetInfo(notifier,
-                                                                isOverlayed, overlayLevel, this));
-                                        }
-                                        SwingUtilities.invokeLater(new AddToFrameLater());
-                                }
-                        }
-                }
+                                addJComponantToFrame(e);
+                        }
+                        break;
+
+                }
+        }
+
+        protected void addJComponantToFrame(ItemParentStateChangedEvent e) {
+
+                if ((e.getEventType() == ItemParentStateChangedEvent.EVENT_TYPE_ADDED_VIA_OVERLAY || e
+                                .getEventType() == ItemParentStateChangedEvent.EVENT_TYPE_SHOWN_VIA_OVERLAY)
+                                && e.getOverlayLevel() == Item.PERMISSION_NONE) {
+                        return; // item belongs to a non-active overlay
+                }
+
+                if (_component.getParent() == null) {
+
+                        if (Browser._theBrowser != null) {
+                                // Due to precaching - before adding physical swing
+                                // componant must check to see that this widget belongs to a
+                                // frame that is
+                                // considered current. If the widget is shown however this does
+                                // not apply -
+                                // since it has been explicitly made clear the the widget is
+                                // shown.
+                                if (e.getEventType() == ItemParentStateChangedEvent.EVENT_TYPE_SHOWN
+                                                || e.getEventType() == ItemParentStateChangedEvent.EVENT_TYPE_SHOWN_VIA_OVERLAY
+                                                || e.getSource() == DisplayIO.getCurrentFrame()) {
+                                        Browser._theBrowser.getContentPane().add(_component);
+                                        layout(_component);
+                                }
+
+                        } else { // if widgets exist on startup frame this will occur
+
+                                synchronized (_widgetsToAddLater) {
+                                        _widgetsToAddLater.add(new WidgetInfo(this, e));
+                                }
+                                SwingUtilities.invokeLater(new AddToFrameLater());
+                        }
+
+                }
+
         }
 
@@ -769 +777 @@
         class WidgetInfo {
 
-                WidgetInfo(WidgetCorner notifier, boolean isOverlayed,
-                                int overlayLevel, InteractiveWidget widget) {
+                WidgetInfo(InteractiveWidget widget, ItemParentStateChangedEvent e) {
                         _widget = widget;
-                        _isOverlayed = isOverlayed;
-                        _overlayLevel = overlayLevel;
-                        _notifier = notifier;
+                        _e = e;
                 }
 
                 InteractiveWidget _widget;
 
-                boolean _isOverlayed;
-
-                int _overlayLevel;
-
-                WidgetCorner _notifier;
+                ItemParentStateChangedEvent _e;
         }
 
@@ -804 +805 @@
                                 _widgetsToAddLater.clear();
                                 for (WidgetInfo iwi : tmp) {
-                                        iwi._widget.onAddedToFrame(iwi._notifier, iwi._isOverlayed,
-                                                        iwi._overlayLevel);
+                                        iwi._widget.addJComponantToFrame(iwi._e);
                                 }
                         }

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

@@ -1429 +1429 @@
                 return _visible;
         }
-
-        // BROOK: Overrideable
-        public void onRemovedFromFrame() {
-        }
-
-        public void onAddedToFrame(boolean isOverlayed, int overlayLevel) {
-        }
-
-        public void onParentFameHidden() {
-        } // because of caching
-
-        public void onParentFameShown(boolean isOverlayed, int overlayLevel) {
-        } // because of caching
-
+        
+        /**
+         * 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);

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

@@ -30 +30 @@
 
         @Override
-        public void onParentFameHidden() {
-                super.onParentFameHidden();
-                _widgetSource.onParentFameHidden(this);
-        }
-
-        @Override
-        public void onParentFameShown(boolean isOverlayed, int overlayLevel) {
-                super.onParentFameShown(isOverlayed, overlayLevel);
-                _widgetSource.onParentFameShown(this, isOverlayed, overlayLevel);
-        }
-
-        @Override
-        public void onRemovedFromFrame() {
-                super.onRemovedFromFrame();
-                _widgetSource.onRemovedFromFrame(this);
-        }
-
-        @Override
-        public void onAddedToFrame(boolean isOverlayed, int overlayLevel) {
-                super.onAddedToFrame(isOverlayed, overlayLevel);
-                _widgetSource.onAddedToFrame(this, isOverlayed, overlayLevel);
+        public void onParentStateChanged(ItemParentStateChangedEvent e) {
+                super.onParentStateChanged(e);
+                _widgetSource.onParentStateChanged(e);
         }