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

Timestamp:

09/04/08 17:07:39 (16 years ago)

Author:

ra33

Message:

 

File:

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

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

@@ -207 +207 @@
 
                 if (_change) {
-                        // Notify the frame listeners that the frame has changed
-                        for (FrameObserver fl : _observers) {
-                                fl.update();
-                        }
+                        notifyObservers();
 
                         setBufferValid(false);
                         _saved = false;
+                }
+        }
+
+        public void notifyObservers() {
+                // Notify the frame listeners that the frame has changed
+                for (FrameObserver fl : _observers) {
+                        fl.update();
                 }
         }
@@ -501 +505 @@
                 for (Overlay o : _overlays.keySet())
                         results.addAll(o.Frame.getItemsWithin(poly));
-                
-                for(Item i: getVectorItems()){
+
+                for (Item i : getVectorItems()) {
                         if (i.intersects(poly)) {
-                                //This assumes a results is a set
+                                // This assumes a results is a set
                                 results.add(i.getEditTarget());
                         }
@@ -703 +707 @@
                         InteractiveWidget iw = ((WidgetCorner) item).getWidgetSource();
                         if (!this._iWidgets.contains(iw)) { // A set would have been
-                                if(FrameMouseActions.isControlDown())
+                                if (FrameMouseActions.isControlDown())
                                         _iWidgets.add(iw);
                                 else
@@ -719 +723 @@
 
         public void refreshSize() {
-                //assert (size != null);
+                // assert (size != null);
                 boolean bReparse = false;
                 for (Item i : getItems()) {
@@ -737 +741 @@
                         }
                 }
-                
-                //Do the anchors on the overlays
-                for(Overlay o: getOverlays()){
+
+                // Do the anchors on the overlays
+                for (Overlay o : getOverlays()) {
                         o.Frame.refreshSize();
                 }
-                
+
                 if (bReparse) {
                         FrameUtils.Parse(this, false);
@@ -1077 +1081 @@
                         int index = toCheck.indexOf(from);
 
-                        //If its the title index will be 0
+                        // If its the title index will be 0
                         if (index < 0)
                                 index = 0;
@@ -1111 +1115 @@
                 int maxY = 0;
                 HighlightMode mode = toAdd.Source.getHighlightMode();
-                if(mode != HighlightMode.None)
+                if (mode != HighlightMode.None)
                         mode = HighlightMode.Connected;
                 Color highlightColor = toAdd.Source.getHighlightColor();
@@ -1123 +1127 @@
                         i.invalidateAll();
                         i.invalidateFill();
-                        //Get the right most x and bottom most y pos
+                        // Get the right most x and bottom most y pos
                         int itemRight = i.getX() + i.getBoundsWidth();
-                        if(itemRight > maxX)
+                        if (itemRight > maxX)
                                 maxX = itemRight;
                         int itemBottom = i.getY() + i.getBoundsHeight();
-                        if(itemBottom > maxY)
+                        if (itemBottom > maxY)
                                 maxY = itemBottom;
                 }
@@ -1309 +1313 @@
                                         ItemParentStateChangedEvent.EVENT_TYPE_ADDED_VIA_OVERLAY,
                                         permission));
-                        //i.setPermission(permission);
+                        // i.setPermission(permission);
                         _overlayItems.add(i);
                 }
@@ -1690 +1694 @@
                 for (Overlay o : getOverlays())
                         o.Frame.refreshItemPermissions(o.permission);
-                
-                //Only update the permissions if we have to
+
+                // Only update the permissions if we have to
                 if (_body.size() > 0 && permission.equals(_body.get(0)._permission))
                         return;
@@ -1698 +1702 @@
                         i.setPermission(permission);
                 }
-                
 
         }
@@ -1932 +1935 @@
                         }
                 }
-                
-                for(Vector v: getVectors()){
+
+                for (Vector v : getVectors()) {
                         toSave.add(v.Source);
                 }
-                
+
                 return toSave;
         }
@@ -2039 +2042 @@
 
         public void parse() {
-                for(Overlay o: getOverlays()){
+                for (Overlay o : getOverlays()) {
                         o.Frame.parse();
                 }
-                //Must parse the frame AFTER the overlays
+                // Must parse the frame AFTER the overlays
                 FrameUtils.Parse(this);
         }