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

Timestamp:

08/11/08 18:04:01 (16 years ago)

Author:

ra33

Message:

Added charts

File:

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

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

@@ -12 +12 @@
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
@@ -199 +200 @@
                 // System.out.println(getName() + " " + value);
                 boolean oldValue = _change;
-                
-                if(oldValue == value)
+
+                if (oldValue == value)
                         return;
-                
+
                 _change = value;
 
                 if (_change) {
-                        //Notify the frame listeners that the frame has changed
-                        for(FrameListener fl: _listeners){
-                                fl.change();
-                        }
-                        
+                        // Notify the frame listeners that the frame has changed
+                        for (FrameObserver fl : _observers) {
+                                fl.update();
+                        }
+
                         setBufferValid(false);
                         _saved = false;
@@ -1818 +1819 @@
         Map<String, Text> _annotations = null;
 
-        private Collection<FrameListener> _listeners = new LinkedList<FrameListener>();
+        private Collection<FrameObserver> _observers = new HashSet<FrameObserver>();
 
         public void clearAnnotations() {
@@ -1947 +1948 @@
         }
 
-        public void removeListener(FrameListener listener) {
-                _listeners.remove(listener);
+        public void removeObserver(FrameObserver observer) {
+                _observers.remove(observer);
+        }
+
+        public void addObserver(FrameObserver observer) {
+                _observers.add(observer);
+        }
+
+        public void clearObservers() {
+                for (FrameObserver fl : _observers) {
+                        fl.removeSubject(this);
+                }
+                //The frame listener will call the frames removeListener method
+                assert(_observers.size() == 0);
+        }
+
+        public Collection<Text> getNonAnnotationText(boolean removeTitle) {
+                Collection<Text> items = new LinkedHashSet<Text>();
+                for (Item i : getItems(true)) {
+                        // only add up normal body text items
+                        if (i instanceof Text && !i.isAnnotation()) {
+                                items.add((Text) i);
+                        }
+                }
+                if (removeTitle) {
+                        items.remove(getTitleItem());
+                }
+                return items;
         }
         
-        public void addListener(FrameListener listener) {
-                _listeners.add(listener);
+        public void dispose() {
+                clearObservers();
+                for(Item i: _body){
+                        i.dispose();
+                }
+                _frameName.dispose();
+                _body = null;
+                _frameName = null;
         }
 }