Changeset 1102 for trunk/src/org/expeditee/items/widgets/WidgetEdge.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

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

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

@@ -19 +19 @@
 package org.expeditee.items.widgets;
 
-import java.awt.Color;
-import java.awt.Polygon;
 import java.util.List;
 
+import org.expeditee.core.Colour;
+import org.expeditee.core.Point;
+import org.expeditee.core.bounds.PolygonBounds;
 import org.expeditee.items.Item;
 import org.expeditee.items.Line;
@@ -28 +29 @@
 
 /**
- * Widget edges define the boundries of an interactive widget.
+ * Widget edges define the boundaries of an interactive widget.
  * 
  * @author Brook Novak
@@ -34 +35 @@
 public class WidgetEdge extends Line {
 
-        private InteractiveWidget _widgetSource;
+        private Widget _widgetSource;
 
         WidgetEdge(WidgetCorner start, WidgetCorner end, int id,
-                        InteractiveWidget widgetSource) {
+                        Widget widgetSource) {
                 super(start, end, id);
                 
@@ -45 +46 @@
         }
 
-        public InteractiveWidget getWidgetSource() {
+        public Widget getWidgetSource() {
                 return _widgetSource;
         }
@@ -89 +90 @@
 
         @Override
-        public void setArrowhead(Polygon arrow) {
+        public void setArrowhead(PolygonBounds arrow) {
         }
 
@@ -101 +102 @@
 
         @Override
-        public void setBottomShadowColor(Color bottom) {
-        }
-
-        @Override
-        public void setFillColor(Color c) {
+        public void setBottomShadowColor(Colour bottom) {
+        }
+
+        @Override
+        public void setFillColor(Colour c) {
         }
 
@@ -121 +122 @@
         
         @Override
-        public void setAnchorTop(Float anchor) {
+        public void setAnchorTop(Integer anchor) {
                 _widgetSource.setAnchorTop(anchor);
         }
 
         @Override
-        public void setAnchorBottom(Float anchor) {
+        public void setAnchorBottom(Integer anchor) {
                 _widgetSource.setAnchorBottom(anchor);
         }
 
         @Override
-        public void setAnchorLeft(Float anchor) {
+        public void setAnchorLeft(Integer anchor) {
                 _widgetSource.setAnchorLeft(anchor);
         }
 
         @Override
-        public void setAnchorRight(Float anchor) {
+        public void setAnchorRight(Integer anchor) {
                 _widgetSource.setAnchorRight(anchor);
         }
@@ -156 +157 @@
         
         @Override
-        public Float getAnchorTop() {
+        public Integer getAnchorTop() {
                 return _widgetSource.getSource().getAnchorTop();
         }
 
         @Override
-        public Float getAnchorBottom() {
+        public Integer getAnchorBottom() {
                 return _widgetSource.getSource().getAnchorBottom();
         }
         
         @Override
-        public Float getAnchorLeft() {
+        public Integer getAnchorLeft() {
                 return _widgetSource.getSource().getAnchorLeft();
         }
 
         @Override
-        public Float getAnchorRight() {
+        public Integer getAnchorRight() {
                 return _widgetSource.getSource().getAnchorRight();
         }
         
         @Override
-        public boolean contains(int x, int y) {
-                return super.contains(x, y) && !_widgetSource.getBounds().contains(x, y);
-        }
-
-        @Override
-        public Polygon getEnclosedShape() {
+        public boolean contains(Point p) {
+                return super.contains(p) && !_widgetSource.getBounds().contains(p);
+        }
+
+        @Override
+        public PolygonBounds getEnclosedShape() {
                 return getStartItem().getEnclosedShape();
         }
@@ -219 +220 @@
         
         @Override
-        public void setBackgroundColor(Color c) {
+        public void setBackgroundColor(Colour c) {
                 if (_widgetSource != null) {
                         super.setBackgroundColor(c);
@@ -227 +228 @@
         
         @Override
-        public void setColor(Color c) {
+        public void setColor(Colour c) {
                 if (_widgetSource != null) {
                         super.setColor(c);