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

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

@@ -27 +27 @@
 import java.util.List;
 
+import org.expeditee.core.Point;
 import org.expeditee.gui.Frame;
 import org.expeditee.items.Constraint;
@@ -130 +131 @@
                         while (_reader.ready() && !(next = _reader.readLine()).equals("Z")) {
                                 if (isValidLine(next)) {
-                                        java.awt.Point idtype = separateValues(next.substring(2));
+                                        Point idtype = separateValues(next.substring(2));
                                         // The next line must be the endpoints
                                         if (!_reader.ready())
                                                 throw new Exception("Unexpected end of file");
                                         next = _reader.readLine();
-                                        java.awt.Point startend = separateValues(next.substring(2));
+                                        Point startend = separateValues(next.substring(2));
                                         int start = startend.x;
                                         int end = startend.y;
@@ -153 +154 @@
                         while (_reader.ready() && !(next = _reader.readLine()).equals("Z")) {
                                 if (isValidLine(next)) {
-                                        java.awt.Point idtype = separateValues(next.substring(2));
+                                        Point idtype = separateValues(next.substring(2));
                                         // The next line must be the endpoints
                                         if (!_reader.ready())
                                                 throw new Exception("Unexpected end of file");
                                         next = _reader.readLine();
-                                        java.awt.Point startend = separateValues(next.substring(2));
+                                        Point startend = separateValues(next.substring(2));
 
                                         Item a = _linePoints.get(startend.x);
@@ -233 +234 @@
 
                 Method toRun = _ItemTags.get(tag);
-                if (toRun == null)
-                        System.out.println("Error accessing tag method: " + tag);
+                if (toRun == null) System.out.println("Error accessing tag method: " + tag);
                 Object[] vals = Conversion.Convert(toRun, value);
 
                 try {
-                        if (vals != null)
-                                toRun.invoke(item, vals);
+                        if (vals != null) toRun.invoke(item, vals);
                 } catch (Exception e) {
                         System.out.println("Error running tag method: " + tag);
@@ -297 +296 @@
 
         // Returns a point from a String containing two ints separated by a space
-        protected java.awt.Point separateValues(String line) {
+        protected Point separateValues(String line) {
                 int x = Integer.parseInt(line.substring(0, line.indexOf(" ")));
                 int y = Integer.parseInt(line.substring(line.indexOf(" ") + 1));
 
-                return new java.awt.Point(x, y);
+                return new Point(x, y);
         }