Changeset 188 for trunk/src/org/expeditee/items/WidgetEdge.java

Timestamp:

08/05/08 12:42:33 (16 years ago)

Author:

ra33

Message:

Resizable, recolorable borders now available for IW's

File:

• trunk/src/org/expeditee/items/WidgetEdge.java (modified) (5 diffs)

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

@@ -6 +6 @@
 /**
  * Widget edges define the boundries of an interactive widget.
+ * 
  * @author Brook Novak
  */
 public class WidgetEdge extends Line {
-        
+
         private InteractiveWidget _widgetSource;
-          
-        WidgetEdge(WidgetCorner start, WidgetCorner end, int id, InteractiveWidget widgetSource) {
+
+        WidgetEdge(WidgetCorner start, WidgetCorner end, int id,
+                        InteractiveWidget widgetSource) {
                 super(start, end, id);
-                super.setThickness(2.0f);
-                super.setColor(Color.black);
-                
-                if (widgetSource == null) throw new NullPointerException("widgetSource");
+                if (widgetSource == null)
+                        throw new NullPointerException("widgetSource");
                 _widgetSource = widgetSource;
         }
@@ -24 +24 @@
                 return _widgetSource;
         }
-        
+
         @Override
         public Item forceMerge(Item merger, int mouseX, int mouseY) {
@@ -30 +30 @@
         }
 
-//      @Override
-//      public void setThickness(float thick) {
-//              // Ignore
-//      }
-        
+        // @Override
+        // public void setThickness(float thick) {
+        // // Ignore
+        // }
+
         @Override
-        public void toggleArrow() { 
+        public void toggleArrow() {
                 // Ignore
         }
-        
+
         @Override
         public void toggleDashed(int amount) {
                 // Ignore
         }
-        
+
         @Override
         public void toggleArrowHeadRatio(int amount) {
                 // Ignore
         }
-        
+
         @Override
         public void toggleArrowHeadLength(int amount) {
@@ -55 +55 @@
         }
 
-//      @OVERRIDE
-//      PUBLIC VOID SETCOLOR(COLOR C) {
-//              // IGNORE
-//      }
-        
+        // @OVERRIDE
+        // PUBLIC VOID SETCOLOR(COLOR C) {
+        // // IGNORE
+        // }
+
         @Override
         public void setAnnotation(boolean val) {
@@ -105 +105 @@
         public void setSize(float size) {
         }
-        
+
         @Override
         public boolean contains(int x, int y) {
-                return super.contains(x, y) && ! getEnclosedShape().contains(x,y);
+                return super.contains(x, y) && !getEnclosedShape().contains(x, y);
         }
-        
+
         @Override
         public Polygon getEnclosedShape() {
                 return getStartItem().getEnclosedShape();
         }
-        
+
         @Override
         public String getLink() {
                 return _widgetSource.getSource().getLink();
         }
-        
+
         @Override
         public void setLink(String link) {
                 _widgetSource.getSource().setLink(link);
-        }       
-        
+        }
+
         @Override
         protected boolean dontPaint() {
-                // TODO Auto-generated method stub
-                return getThickness() == 0;
+                return getThickness() <= 0;
+        }
+
+        @Override
+        public void setThickness(float newThickness, boolean setConnected) {
+                if (_widgetSource != null) {
+                        float minThickness = _widgetSource.getMinimumBorderThickness();
+                        if(newThickness < minThickness)
+                                newThickness = minThickness;
+                        super.setThickness(newThickness, setConnected);
+                        _widgetSource.getSource().setThickness(newThickness, false);
+                }
+        }
+
+        @Override
+        public void setColor(Color color) {
+                if (_widgetSource != null) {
+                        super.setColor(color);
+                        _widgetSource.getSource().setColor(color);
+                }
         }
 }