Changeset 1102 for trunk/src/org/expeditee/gui/AttributeUtils.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/gui/AttributeUtils.java (modified) (9 diffs)

trunk/src/org/expeditee/gui/AttributeUtils.java

@@ -19 +19 @@
 package org.expeditee.gui;
 
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Point;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -28 +25 @@
 import java.util.List;
 
+import org.expeditee.core.Colour;
+import org.expeditee.core.Font;
+import org.expeditee.core.Point;
 import org.expeditee.io.Conversion;
 import org.expeditee.items.DotType;
@@ -33 +33 @@
 import org.expeditee.items.Justification;
 import org.expeditee.items.PermissionPair;
-import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
 import org.expeditee.simple.IncorrectTypeException;
@@ -137 +136 @@
                         Class<?>[] pFloat = { float.class };
                         Class<?>[] pFloatO = { Float.class };
-                        Class<?>[] pColor = { Color.class };
+                        Class<?>[] pDouble = {double.class };
+                        Class<?>[] pColor = { Colour.class };
                         Class<?>[] pBool = { boolean.class };
                         //Class[] pDouble = { double.class };
@@ -214 +214 @@
                                                             Item.class.getMethod("setBorderColor", pColor));
                         _Attrib.put("AnchorLeft",           Item.class.getMethod("getAnchorLeft"),
-                                                            Item.class.getMethod("setAnchorLeft", pFloatO));
+                                                            Item.class.getMethod("setAnchorLeft", pIntO));
                         _Attrib.put("AnchorRight",          Item.class.getMethod("getAnchorRight"),
-                                                            Item.class.getMethod("setAnchorRight", pFloatO));
+                                                            Item.class.getMethod("setAnchorRight", pIntO));
                         _Attrib.put("AnchorTop",            Item.class.getMethod("getAnchorTop"),
-                                                            Item.class.getMethod("setAnchorTop", pFloatO));
+                                                            Item.class.getMethod("setAnchorTop", pIntO));
                         _Attrib.put("AnchorBottom",         Item.class.getMethod("getAnchorBottom"),
-                                                            Item.class.getMethod("setAnchorBottom", pFloatO));
+                                                            Item.class.getMethod("setAnchorBottom", pIntO));
                         _Attrib.put("Position",             Item.class.getMethod("getPosition"),
                                                             Item.class.getMethod("setPosition", pPoint));
@@ -248 +248 @@
                                                             Item.class.getMethod("setGradientColor", pColor));
                         _Attrib.put("GradientAngle",        Item.class.getMethod("getGradientAngle"),
-                                                            Item.class.getMethod("setGradientAngle", pInt));
+                                                            Item.class.getMethod("setGradientAngle", pDouble));
                         _Attrib.put("FillPattern",          Item.class.getMethod("getFillPattern"),
                                                             Item.class.getMethod("setFillPattern", pString));
@@ -417 +417 @@
 
                 // create the text Item
-                Frame current = DisplayIO.getCurrentFrame();
+                Frame current = DisplayController.getCurrentFrame();
                 Item attribs = current.getStatsTextItem(attributes.toString());
                 return attribs;
@@ -486 +486 @@
                         if (((Double) o) < 0.0001)
                                 return null;
-                } else if (o instanceof Color) {
+                } else if (o instanceof Colour) {
                         // converts the color to the Expeditee code
-                        o = Conversion.getExpediteeColorCode((Color) o);
+                        o = Conversion.getExpediteeColorCode((Colour) o);
                         if (o == null)
                                 return null;
@@ -497 +497 @@
                         Font f = (Font) o;
 
-                        String s = f.getName() + "-";
+                        String s = f.getFamilyName() + "-";
                         if (f.isPlain())
                                 s += "Plain";