Changeset 1102 for trunk/src/org/expeditee/io/ExpClipWriter.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/io/ExpClipWriter.java (modified) (6 diffs)

trunk/src/org/expeditee/io/ExpClipWriter.java

@@ -23 +23 @@
 import java.util.List;
 
+import org.expeditee.core.Point;
 import org.expeditee.gui.Frame;
 import org.expeditee.items.Item;
 import org.expeditee.items.Line;
 import org.expeditee.items.XRayable;
-import org.expeditee.items.widgets.InteractiveWidget;
+import org.expeditee.items.widgets.Widget;
 import org.expeditee.items.widgets.WidgetCorner;
 import org.expeditee.items.widgets.WidgetEdge;
@@ -41 +42 @@
         private int dX, dY;
 
+        public ExpClipWriter(Point p)
+        {
+                this(p.x, p.y);
+        }
+        
         public ExpClipWriter(int dX, int dY) {
                 super();
@@ -60 +66 @@
         public void output(List<Item> items) throws IOException {
                 // switch to savable items
-                LinkedList<InteractiveWidget> widgets = new LinkedList<InteractiveWidget>();
+                LinkedList<Widget> widgets = new LinkedList<Widget>();
                 // make an array to iterate over instead of the list so we don't get stuck when we remove items from the list
                 Item[] tmpitems = items.toArray(new Item[0]);
@@ -72 +78 @@
                                 }
                         } else if (i instanceof WidgetCorner) {
-                                InteractiveWidget iw = ((WidgetCorner)i).getWidgetSource();
+                                Widget iw = ((WidgetCorner)i).getWidgetSource();
                                 if(!widgets.contains(iw)) {
                                         widgets.add(iw);
@@ -78 +84 @@
                                 items.remove(i);
                         } else if (i instanceof WidgetEdge) {
-                                InteractiveWidget iw = ((WidgetEdge)i).getWidgetSource();
+                                Widget iw = ((WidgetEdge)i).getWidgetSource();
                                 if(!widgets.contains(iw)) {
                                         widgets.add(iw);
@@ -90 +96 @@
                         }
                 }
-                for (InteractiveWidget iw : widgets) {
+                for (Widget iw : widgets) {
                         items.add(iw.getSource());
                 }