Changeset 1102 for trunk/src/org/expeditee/agents/SwitchyardTree.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/agents/SwitchyardTree.java (modified) (2 diffs)

trunk/src/org/expeditee/agents/SwitchyardTree.java

@@ -19 +19 @@
 package org.expeditee.agents;
 
-import java.awt.Color;
-import java.awt.geom.Point2D;
-
+import org.expeditee.core.Colour;
+import org.expeditee.core.Point;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;
@@ -44 +43 @@
                                         Frame childFrame = FrameIO.LoadFrame(link);
                                         if (childFrame != null) {
-                                                Point2D.Float lastItemEnd = textItem.getParagraphEndPosition();
+                                                Point lastItemEnd = textItem.getParagraphEndPosition();
                                                 for (Text childItem : childFrame.getBodyTextItems(false)) {
                                                         // look for red items (remember get color may be null
-                                                        if (Color.RED.equals(childItem.getPaintColor())) {
+                                                        if (Colour.RED.equals(childItem.getPaintColor())) {
                                                                 // make a copy and add to parent frame
                                                                 Text itemCopy = childItem.copy();
                                                                 // add to the right of parent item
-                                                                lastItemEnd.setLocation(lastItemEnd.x + 20, lastItemEnd.y);
+                                                                lastItemEnd.set(lastItemEnd.x + 20, lastItemEnd.y);
                                                                 itemCopy.setPosition(lastItemEnd.x, lastItemEnd.y);
                                                                 lastItemEnd = itemCopy