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

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

@@ -29 +29 @@
 import java.util.LinkedHashMap;
 
+import org.expeditee.core.Point;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.MessageBay;
 import org.expeditee.items.Constraint;
 import org.expeditee.items.Dot;
-import org.expeditee.items.DotType;
 import org.expeditee.items.Item;
 import org.expeditee.items.Line;
@@ -107 +107 @@
                         _ItemTags.put("e", Item.class.getMethod("setFillColor", pColor));
                         _ItemTags.put("E", Item.class.getMethod("setGradientColor", pColor));
-                        _ItemTags.put("Q", Item.class.getMethod("setGradientAngle", pInt));
+                        _ItemTags.put("Q", Item.class.getMethod("setGradientAngle", pDouble));
                         
                         _ItemTags.put("i", Item.class.getMethod("setFillPattern", pString));
@@ -267 +267 @@
 
                 // get the line ID and type
-                java.awt.Point idtype = separateValues(s);
+                Point idtype = separateValues(s);
 
                 // get the end points
@@ -273 +273 @@
                 _data.remove("s");
 
-                java.awt.Point startend = separateValues(s);
+                Point startend = separateValues(s);
 
                 int start = startend.x;
@@ -299 +299 @@
          */
         private void createConstraint() {
-                java.awt.Point idtype = separateValues(_data.get("C"));
-                java.awt.Point startend = separateValues(_data.get("s"));
+                Point idtype = separateValues(_data.get("C"));
+                Point startend = separateValues(_data.get("s"));
 
                 Item a = _linePoints.get(startend.x);
@@ -398 +398 @@
 
         // returns two ints separated by a space from the given String
-        private java.awt.Point separateValues(String line) {
+        private 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);
         }