Changeset 21 for trunk/src/org/expeditee/items/Item.java

Timestamp:

05/08/08 14:30:09 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/items/Item.java (modified) (8 diffs)

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

@@ -168 +168 @@
         }
         
+        public enum SelectedMode {
+                None, Enclosed, Connected, Disconnect, Normal
+        }
+        
+        public void setSelectedMode(SelectedMode mode) {
+                setSelectedMode(mode, DEFAULT_HIGHLIGHT);
+        }
+        
+        protected SelectedMode _mode = SelectedMode.None;
+        
         private Point _offset = new Point(0, 0);
 
@@ -183 +193 @@
 
         private boolean _highlight = true;
-
-        private boolean _isHighlighted = false;
 
         private Dimension _maxSize = null;
@@ -252 +260 @@
         
         private boolean _visible = true;
+        
+        private SelectedMode _lastMode = SelectedMode.None;
 
         protected Item() {
@@ -838 +848 @@
          */
         public boolean isHighlighted() {
-                return _isHighlighted;
+                return _mode != SelectedMode.None;
         }
 
@@ -1350 +1360 @@
         }
 
-        public int showDepressedHighlight(boolean val) {
-                _highlightThickness = DEFAULT_HIGHLIGHT_THICKNESS;
-                return showHighlight(val, DEPRESSED_HIGHLIGHT);
-        }
-
-        public int showDisconnectHighlight(boolean val) {
-                _highlightThickness = DEFAULT_HIGHLIGHT_THICKNESS;
-                return showHighlight(val, DISCONNECT_HIGHLIGHT);
-        }
-
         /**
          * Paints any highlighting of this Item. This may include changing the
@@ -1369 +1369 @@
          * @param val
          *            True if this Item should be highlighted, false if the
-         *            highlighting is being cleared.\
+         *            highlighting is being cleared.
          * @return The desired mouse cursor when this Item is highlighted (negative
          *         means no change)
          */
-        public int showHighlight(boolean val) {
+        public int setSelectionColor() {
+                return setSelectionColor(DEFAULT_HIGHLIGHT);
+        }
+
+        public int setSelectionColor(Color c) {
                 _highlightThickness = DEFAULT_HIGHLIGHT_THICKNESS;
-                return showHighlight(val, DEFAULT_HIGHLIGHT);
-        }
-
-        public int showHighlight(boolean val, Color c) {
-                _isHighlighted = val;
                 if (c != null)
                         _highlightColor = c;
@@ -1387 +1386 @@
                 return Item.UNCHANGED_CURSOR;
         }
+        
         private void updateArrowPolygon() {
                 if (getArrowheadLength() < 0 || getArrowheadRatio() < 0)
@@ -1422 +1422 @@
         public void onParentFameHidden() {} // because of caching
         public void onParentFameShown() {} // because of caching
+
+        public void setSelectedMode(SelectedMode mode, Color color) {
+                setSelectionColor(color);
+                _lastMode = _mode;
+                _mode = mode;
+        }
+
+        public void restoreLastMode(Color selectionColor) {
+                setSelectionColor(selectionColor);
+                if (_mode != SelectedMode.None)
+                        return;
+                _mode = _lastMode;
+                _lastMode = SelectedMode.None;
+        }
+
+        public SelectedMode getSelectedMode() {
+                return _mode;
+        }
 }