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

Timestamp:

05/26/08 09:11:05 (16 years ago)

Author:

ra33

Message:

Added @b and @v...
Also changed @f... so that images can be displayed with transparent backgrounds.
Did a bunch of refactoring in the process to remove duplicated code and simplify managing @i, @f and @b.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/org/expeditee/gui/Frame.java (modified) (15 diffs)

trunk

@@ -8 +8 @@
 testdummyaudio
 tests_apollos
+*.txt

@@ -8 +8 @@
 testdummyaudio
 tests_apollos
+*.txt

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

@@ -62 +62 @@
         private Color _background;
 
-        private Color _foreground;
+        private Color _foreground = Item.DEFAULT_FOREGROUND;
 
         public String path;
@@ -97 +97 @@
         private List<Overlay> _overlays = new ArrayList<Overlay>();
 
-        private VolatileImage _buffer = null;
+        private List<Vector> _vectors = new ArrayList<Vector>();
+
+        private Image _buffer = null;
 
         private boolean _validBuffer = true;
@@ -108 +110 @@
         }
 
-        public VolatileImage getBuffer() {
+        public Image getBuffer() {
                 return _buffer;
         }
 
-        public void setBuffer(VolatileImage newBuffer) {
+        public void setBuffer(Image newBuffer) {
                 _buffer = newBuffer;
         }
 
         public boolean isBufferValid() {
-                if (_buffer == null || _buffer.contentsLost())
+                if (_buffer == null
+                                || (_buffer instanceof VolatileImage && ((VolatileImage) _buffer)
+                                                .contentsLost()))
                         return false;
 
@@ -243 +247 @@
          * @return the last non annotation text item.
          */
-        public Text getLastNonAnnotationTextItem() {
+        public Item getLastNonAnnotationTextItem() {
                 List<Item> items = getItems();
 
@@ -251 +255 @@
 
                         if (it instanceof Text && !it.isAnnotation()) {
-                                return (Text) it;
+                                return (Item) it;
                         }
                 }
@@ -332 +336 @@
         }
 
-        public Text getFrameNameItem() {
+        public Item getFrameNameItem() {
                 return _frameName;
         }
@@ -364 +368 @@
         }
 
-        public Text getStatsTextItem(String itemText) {
+        public Item getStatsTextItem(String itemText) {
                 Text t = getStatTemplate();
                 // We dont want the stats to wrap at all
@@ -769 +773 @@
 
         public Color getPaintBackgroundColor() {
-                if (_background == null)
-                        return DisplayIO.DEFAULT_BACKGROUND;
+                // If null... return white
+                if (_background == null) {
+                        return Item.DEFAULT_BACKGROUND;
+                }
 
                 return _background;
@@ -895 +901 @@
 
         /**
+         * Adds the given Vector to the list of vector Frames being drawn with this
+         * Frame.
+         * 
+         * @param vector
+         *            The Vector to add
+         * 
+         * @throws NullPointerException
+         *             If overlay is null.
+         */
+        public void addVector(Vector vector) {
+                if (vector == null)
+                        throw new NullPointerException("Frame.addVector");
+                // make sure we dont add this frame as an overlay of itself
+                if (vector.Frame == this)
+                        return;
+
+                // if (_vectors.contains(vector))
+                // return;
+
+                _vectors.add(vector);
+
+                // TODO add the code below
+                // Items must be notified that they have been added to this frame via
+                // the vector...
+                // List<Item> items = new LinkedList<Item>();
+                // FrameGraphics.AddAllOverlayItems(items, vector.Frame,
+                // new LinkedList<Frame>());
+                //              
+                // for (Item i : items) {
+                // i.onParentStateChanged(new ItemParentStateChangedEvent(this,
+                // ItemParentStateChangedEvent.EVENT_TYPE_ADDED_VIA_VECTOR,
+                // overlay.Level));
+                // }
+        }
+
+        /**
          * Adds the given Frame to the list of overlays Frames being drawn with this
          * Frame.
@@ -957 +999 @@
 
         /**
+         * Removes the given vector from the list of vector being drawn with this
+         * Frame.
+         * 
+         * @param vector
+         *            The overlay to remove
+         * 
+         * @throws NullPointerException
+         *             If overlay is null.
+         */
+        public void removeVector(Vector vector) {
+                if (vector == null)
+                        throw new NullPointerException("Frame.removeVector");
+
+                this._vectors.remove(vector);
+
+                // TODO figure out what the code below needs to be changed to
+                // Items must be notified that they have been removed from this frame
+                // via the overlay...
+                // List<Item> items = new LinkedList<Item>();
+                // FrameGraphics.AddAllOverlayItems(items, vector.Frame,
+                // new LinkedList<Frame>());
+                // for (Item i : items) {
+                // i.onParentStateChanged(new ItemParentStateChangedEvent(this,
+                // ItemParentStateChangedEvent.EVENT_TYPE_REMOVED_VIA_OVERLAY,
+                // vector.Level));
+                // }
+        }
+
+        /**
          * Removes the given Frame from the list of overlayed Frames being drawn
          * with this Frame.
@@ -983 +1054 @@
         }
 
+        public List<Vector> getVectors() {
+                List<Vector> l = new LinkedList<Vector>();
+                l.addAll(_vectors);
+                return l;
+        }
+
         public List<Overlay> getOverlays() {
                 List<Overlay> l = new LinkedList<Overlay>();
@@ -997 +1074 @@
                 getOverlaysDeep(l, this, new LinkedList<Frame>());
                 return l;
+        }
+
+        /**
+         * @return All vectosr seen by this frame (including its vector's vectors).
+         */
+        public List<Vector> getVectorsDeep() {
+                List<Vector> l = new LinkedList<Vector>();
+                getVectorsDeep(l, this, new LinkedList<Frame>());
+                return l;
+        }
+
+        private boolean getVectorsDeep(List<Vector> vectors, Frame vector,
+                        List<Frame> seenVectors) {
+
+                if (seenVectors.contains(vector))
+                        return false;
+
+                seenVectors.add(vector);
+
+                for (Vector o : vector.getVectors()) {
+                        if (getVectorsDeep(vectors, o.Frame, seenVectors)) {
+                                vectors.add(o);
+                        }
+                }
+
+                return true;
         }
 
@@ -1037 +1140 @@
         }
 
+        public void clearVectors() {
+                while (!_vectors.isEmpty()) {
+                        removeVector(_vectors.get(0)); // centralise removing
+                }
+        }
+
         public void clearOverlays() {
                 while (!_overlays.isEmpty()) {
                         removeOverlay(_overlays.get(0)); // centralise removing
+                }
+        }
+
+        public void addAllVectors(List<Vector> vectors) {
+                for (Vector v : vectors) {
+                        addVector(v); // centralise adding
                 }
         }
@@ -1167 +1282 @@
                                 getNextItemID());
 
-                Text template = getTemplate(UserSettings.LineTemplate,
+                Item template = getTemplate(UserSettings.LineTemplate,
                                 ItemUtils.TAG_LINE_TEMPLATE);
                 float thickness = template.getThickness();
@@ -1236 +1351 @@
         }
 
-        public Text addText(int x, int y, String text, String action, String link) {
-                Text t = addText(x, y, text, action);
+        public Item addText(int x, int y, String text, String action, String link) {
+                Item t = addText(x, y, text, action);
                 t.setLink(link);
                 return t;

@@ -8 +8 @@
 testdummyaudio
 tests_apollos
+*.txt