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

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

@@ -25 +25 @@
 import java.util.List;
 
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.core.Point;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameGraphics;
@@ -37 +38 @@
 import org.expeditee.items.Line;
 import org.expeditee.items.Text;
-import org.expeditee.items.widgets.InteractiveWidget;
+import org.expeditee.items.widgets.Widget;
 
 /**
@@ -52 +53 @@
         private int dX, dY;
         
+        public ExpClipReader(Point p)
+        {
+                this(p.x, p.y);
+        }
+        
         public ExpClipReader(int dX, int dY) {
                 super("");
@@ -63 +69 @@
          */
         public static void updateItems(List<Item> items) {
-                if(FrameGraphics.isXRayMode()) {
+                if(DisplayController.isXRayMode()) {
                         return;
                 }
@@ -72 +78 @@
                                 continue;
                         }
-                        if (ItemUtils.startsWithTag(item,
-                                        ItemUtils.TAG_IMAGE, true)) {
+                        if (ItemUtils.startsWithTag(item, ItemUtils.TAG_IMAGE, true)) {
                                 if (!item.hasEnclosures()) {
-                                        items.add(ItemUtils.CreatePicture((Text) item, DisplayIO.getCurrentFrame()));
+                                        items.add(ItemUtils.CreatePicture((Text) item));
                                 }
                                 // check for frame images
@@ -83 +88 @@
                                         && !item.getAbsoluteLink()
                                                         .equalsIgnoreCase(
-                                                                        DisplayIO.getCurrentFrame().getName())) {
+                                                                        DisplayController.getCurrentFrame().getName())) {
                                 if (item.hasEnclosures()) {
                                         // item.setHidden(true);
@@ -90 +95 @@
                                         // image.refresh();
                                 } else {
-                                        items.add(new FrameImage((Text) item, DisplayIO.getCurrentFrame(), null));
+                                        items.add(new FrameImage((Text) item, null));
                                 }
                         } else if (ItemUtils.startsWithTag(item,
@@ -97 +102 @@
                                         && !item.getAbsoluteLink()
                                                         .equalsIgnoreCase(
-                                                                        DisplayIO.getCurrentFrame().getName())) {
+                                                                        DisplayController.getCurrentFrame().getName())) {
                                 if (item.hasEnclosures()) {
                                         // image =
@@ -107 +112 @@
                                         // frame which already has a bitmap dont
                                         // recreate the bitmap
-                                        items.add(new FrameBitmap((Text) item, DisplayIO.getCurrentFrame(), null));
+                                        items.add(new FrameBitmap((Text) item, null));
                                 }
                         } else if (ItemUtils.startsWithTag(item, "@c")) {
@@ -116 +121 @@
                                 }
                                 // Check for interactive widgets
-                        } else if (ItemUtils.startsWithTag(item,
-                                        ItemUtils.TAG_IWIDGET)) {
+                        } else if (ItemUtils.startsWithTag(item, ItemUtils.TAG_IWIDGET)) {
                                 items.remove(item);
-                                item.setParent(DisplayIO.getCurrentFrame());
+                                item.setParent(DisplayController.getCurrentFrame());
                                 try {
-                                        items.addAll(InteractiveWidget.createWidget((Text) item).getItems());
+                                        items.addAll(Widget.createWidget((Text) item).getItems());
                                 } catch (Exception e) {
                                         System.err.println("Failed to create widget");
@@ -176 +180 @@
                         while(index < lines.length && !(lines[++index].equals("Z"))) {
                                 if (isValidLine(lines[index])) {
-                                        java.awt.Point idtype = separateValues(lines[index].substring(2));
+                                        Point idtype = separateValues(lines[index].substring(2));
                                         // The next line must be the endpoints
                                         if (index >= lines.length)
                                                 throw new Exception("Unexpected end of file");
                                         ++index;
-                                        java.awt.Point startend = separateValues(lines[index].substring(2));
+                                        Point startend = separateValues(lines[index].substring(2));
                                         int start = startend.x;
                                         int end = startend.y;
@@ -199 +203 @@
                         while(index < lines.length && !(lines[++index].equals("Z"))) {
                                 if (isValidLine(lines[index])) {
-                                        java.awt.Point idtype = separateValues(lines[index].substring(2));
+                                        Point idtype = separateValues(lines[index].substring(2));
                                         // The next line must be the endpoints
                                         if (index >= lines.length)
                                                 throw new Exception("Unexpected end of file");
                                         ++index;
-                                        java.awt.Point startend = separateValues(lines[index].substring(2));
+                                        Point startend = separateValues(lines[index].substring(2));
         
                                         Item a = _linePoints.get(startend.x);