Changeset 115 for trunk/src/org/expeditee/items/Dot.java

Timestamp:

07/02/08 12:38:54 (16 years ago)

Author:

ra33

Message:

added functionality for dockable @v's

File:

• trunk/src/org/expeditee/items/Dot.java (modified) (7 diffs)

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

@@ -30 +30 @@
 
         private boolean _filled = true;
-
-        protected boolean _filledHighlight = false;
-
+        
         public Dot(int id) {
                 super();
@@ -89 +87 @@
         public void paint(Graphics2D g) {
                 if (isHighlighted() /* && !Frame.FreeItems.contains(this) */) {
-                        Color backgroundColor = g.getBackground();
                         Color highlightColor = getHighlightColor();
-                        if (highlightColor.equals(backgroundColor)){
-                                highlightColor = ALTERNATE_HIGHLIGHT;
-                        }
                         g.setColor(highlightColor);
                         g.setStroke(HIGHLIGHT_STROKE);
@@ -100 +94 @@
                         // this is drawn even if its part of a rectangle
                         Rectangle rect = getPolygon().getBounds();
-                        if (_mode == SelectedMode.Enclosed ||
+                        if (_mode == HighlightMode.Enclosed ||
                         // Make sure single dots are highlighted filled
                                         this.getConnected().size() <= 1)
                                 g.fillRect(rect.x, rect.y, rect.width, rect.height);
-                        else if (_mode == SelectedMode.Connected)
+                        else if (_mode == HighlightMode.Connected)
                                 g.drawRect(rect.x, rect.y, rect.width, rect.height);
-                        else if (_mode == SelectedMode.Normal) {
+                        else if (_mode == HighlightMode.Normal) {
                                 g.fillOval(rect.x, rect.y, rect.width, rect.height);
                         }
@@ -153 +147 @@
          * Updates the points of the polygon surrounding this Dot
          */
-        protected void updatePolygon() {
+        public void updatePolygon() {
                 int thick = Math.round(getThickness());
                 // Sets a minimum size for the dot
@@ -182 +176 @@
 
         @Override
-        public int setSelectionColor() {
-                super.setSelectionColor();
+        public int setHighlightColor() {
+                super.setHighlightColor();
 
                 return Item.DEFAULT_CURSOR;
@@ -268 +262 @@
                 return "P " + getID();
         }
-
-        @Override
-        public void setFilledHighlight(boolean value) {
-                _filledHighlight = value;
-        }
-
+        
         @Override
         public void delete() {
@@ -304 +293 @@
                         if (line.getID() < 0 && !current.getItems().contains(line)) {
                                 line.setID(current.getNextItemID());
-                                line.setSelectionColor();
+                                line.setHighlightColor();
                                 // Mike: Why was this line here?
                                 //anchor(line);