Changeset 376 for trunk/src/org/expeditee/gui/Frame.java

Timestamp:

11/02/08 13:05:01 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/gui/Frame.java (modified) (11 diffs)

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

@@ -204 +204 @@
                 boolean oldValue = _change;
 
-                if (value) {
-                        notifyObservers();
-                }
+                // if (value) {
+                // notifyObservers();
+                // }
 
                 if (oldValue == value)
@@ -219 +219 @@
         }
 
-        public void notifyObservers() {
+        //private static int updateCount = 0;
+
+        /**
+         * Notify items observing the data on this frame that the frame content has
+         * changed.
+         * 
+         * @param recalculate
+         *            true if the frame should be recalculated first.
+         */
+        public void notifyObservers(boolean bRecalculate) {
+                if(bRecalculate){
+                        recalculate();
+                }
                 // Notify the frame listeners that the frame has changed
-                for (FrameObserver fl : _observers) {
-                        fl.update();
+                /*
+                 * Avoid ConcurrentMod Exceptions when user anchors an item onto this
+                 * frame which is observing this frame, by NOT using foreach loop.
+                 * Calling update on a dataFrameWidget resets its subjects hence
+                 * changing this frames observer list.
+                 */
+                Collection<FrameObserver> observersCopy = new LinkedList<FrameObserver>(
+                                _observers);
+                //System.out.println(++updateCount + " update");
+
+                for (FrameObserver fl : observersCopy) {
+                        if (/* !Item.isLocked(fl) && */fl.isVisible())
+                                fl.update();
                 }
         }
@@ -370 +393 @@
                         if (UserSettings.TitleTemplate == null) {
                                 frameTitle = new Text(getNextItemID(), title);
+                                /*
+                                 * Need to set the parent otherwise an exception is thrown when
+                                 * new profile is created
+                                 */
+                                frameTitle.setParent(this);
                                 frameTitle.resetTitlePosition();
                         } else {
@@ -721 +749 @@
                 item.onParentStateChanged(new ItemParentStateChangedEvent(this,
                                 ItemParentStateChangedEvent.EVENT_TYPE_ADDED));
-                if (recalculate && item.recalculateWhenChanged())
-                        recalculate();
+
+                // if (recalculate && item.recalculateWhenChanged())
+                // recalculate();
 
                 change();
@@ -799 +828 @@
                         }
                         // TODO Improve efficiency when removeAll is called
-                        if (recalculate && item.recalculateWhenChanged())
-                                recalculate();
+                        // if (recalculate && item.recalculateWhenChanged())
+                        // recalculate();
                 }
         }
@@ -834 +863 @@
                 Item undo = null;
                 boolean bReparse = false;
+                boolean bRecalculate = false;
 
                 if (_undo.size() <= 0)
@@ -871 +901 @@
                         for (Item i : toRestore) {
                                 bReparse |= i.hasOverlay();
+                                bRecalculate |= i.recalculateWhenChanged();
                                 if (i instanceof Line) {
                                         Line line = (Line) i;
@@ -885 +916 @@
                 if (bReparse)
                         FrameUtils.Parse(this, false);
+                else {
+                        notifyObservers(bRecalculate);
+                }
                 FrameGraphics.Repaint();
                 ItemUtils.EnclosedCheck(_body);
@@ -1455 +1489 @@
                 // t.setMaxWidth(FrameGraphics.getMaxFrameSize().width);
                 // if (t.getWidth() <= 0) {
-//              String maxWidthString = getAnnotationValue("maxwidth");
-//              int width = FrameGraphics.getMaxFrameSize().width;
-//              if (maxWidthString != null) {
-//                      try {
-//                              width = Math.min(width, Integer.parseInt(maxWidthString));
-//                      } catch (NumberFormatException nfe) {
-//                      }
-//              }
-//
-//              t.setRightMargin(width);
+                // String maxWidthString = getAnnotationValue("maxwidth");
+                // int width = FrameGraphics.getMaxFrameSize().width;
+                // if (maxWidthString != null) {
+                // try {
+                // width = Math.min(width, Integer.parseInt(maxWidthString));
+                // } catch (NumberFormatException nfe) {
+                // }
+                // }
+                //
+                // t.setRightMargin(width);
                 // }
                 addItem(t);
@@ -2023 +2057 @@
 
         public void recalculate() {
+
                 for (Item i : getItems()) {
                         if (i.hasFormula() && !i.isAnnotation()) {
@@ -2118 +2153 @@
                 }
         }
+
+        public boolean hasObservers() {
+                return _observers != null && _observers.size() > 0;
+        }
 }