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

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

@@ -19 +19 @@
 package org.expeditee.io;
 
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Point;
 import java.io.BufferedReader;
 import java.io.FileInputStream;
@@ -32 +29 @@
 import java.util.LinkedList;
 
+import org.expeditee.core.Colour;
+import org.expeditee.core.Font;
+import org.expeditee.core.Point;
 import org.expeditee.gui.Frame;
 import org.expeditee.items.Constraint;
+import org.expeditee.items.Dot;
 import org.expeditee.items.DotType;
 import org.expeditee.items.Item;
@@ -42 +43 @@
 
 public abstract class DefaultFrameReader implements FrameReader {
+        
         protected static LinkedHashMap<Character, Method> _ItemTags = null;
         
@@ -53 +55 @@
         protected static Class[] pFloat = { float.class };
         protected static Class[] pFloatO = { Float.class };
-        protected static Class[] pColor = { Color.class };
+        protected static Class[] pDouble = { double.class };
+        protected static Class[] pColor = { Colour.class };
         protected static Class[] pBool = { boolean.class };
         protected static Class[] pFont = { Font.class };
@@ -63 +66 @@
         protected static Class[] pJustification = { Justification.class };
         protected static Class[] pPermission = { PermissionPair.class };
+        protected static Class[] pDotType = { DotType.class };
         
         public DefaultFrameReader(){
@@ -100 +104 @@
                                         pColor));
 
-                        _ItemTags.put('R', Item.class.getMethod("setAnchorLeft", pFloatO));
-                        _ItemTags.put('H', Item.class.getMethod("setAnchorRight", pFloatO));
-                        _ItemTags.put('N', Item.class.getMethod("setAnchorTop", pFloatO));
-                        _ItemTags.put('I', Item.class.getMethod("setAnchorBottom", pFloatO));
+                        _ItemTags.put('R', Item.class.getMethod("setAnchorLeft", pIntO));
+                        _ItemTags.put('H', Item.class.getMethod("setAnchorRight", pIntO));
+                        _ItemTags.put('N', Item.class.getMethod("setAnchorTop", pIntO));
+                        _ItemTags.put('I', Item.class.getMethod("setAnchorBottom", pIntO));
 
                         _ItemTags.put('P', Item.class.getMethod("setPosition", pPoint));
@@ -123 +127 @@
                         _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));
@@ -136 +140 @@
                         _ItemTags.put('j', Item.class.getMethod("setArrow", pArrow));
 
-                        _ItemTags.put('v', Item.class.getMethod("setDotType", new Class[]{DotType.class}));
-                        _ItemTags.put('z', Item.class.getMethod("setFilled", pBool));
+                        _ItemTags.put('v', Dot.class.getMethod("setDotType", pDotType));
+                        _ItemTags.put('z', Dot.class.getMethod("setFilled", pBool));
                         
                         _ItemTags.put('f', Text.class.getMethod("setFont", pFont));