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

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

@@ -19 +19 @@
 package org.expeditee.agents;
 
-import java.awt.Color;
 import java.util.List;
 
 import org.expeditee.actions.Misc;
+import org.expeditee.core.Colour;
+import org.expeditee.core.Font;
+import org.expeditee.gio.gesture.StandardGestureActions;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;
-import org.expeditee.gui.FrameMouseActions;
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.items.Item;
@@ -41 +43 @@
 import com.mxgraph.model.mxGraphModel;
 import com.mxgraph.view.mxGraph;
-import java.awt.Font;
 
 /**
@@ -74 +75 @@
                 String resultsFramesetName = "LinksGraphResults";
 
-                Color vertColor = new Color(51,145,148);
-                Color unlinkedVertColor = new Color(251,107,65);
-                Color outgoingVertColor = new Color(246,216,107);
-                Color lineColor = new Color(0,0,0, 20);
+                Colour vertColor = Colour.FromRGB255(51,145,148);
+                Colour unlinkedVertColor = Colour.FromRGB255(251,107,65);
+                Colour outgoingVertColor = Colour.FromRGB255(246,216,107);
+                Colour lineColor = Colour.FromRGBA255(0,0,0, 20);
 
                 try {
@@ -220 +221 @@
                 }
                 
-                Font keyFont = Font.decode(Font.SANS_SERIF + " 14");
+                Font keyFont = new Font("SansSerif");
+                keyFont.setSize(14);
                 
                 Text keyLink = resultsFrame.addText(0, 0, "\u2192 = Link", null);
@@ -228 +230 @@
                 
                 keyLink.setFont(keyFont);
-                keyLink.setColor(Color.DARK_GRAY);
+                keyLink.setColor(Colour.DARK_GREY);
                 
                 keyFrame.setFont(keyFont);;
@@ -239 +241 @@
                 keyFrameOutgoing.setColor(outgoingVertColor);
                 
-                keyFrameOutgoing.setAnchorBottom(10f);
-                keyFrameUnlinked.setAnchorBottom(30f);
-                keyFrame.setAnchorBottom(50f);
-                keyLink.setAnchorBottom(70f);
-                
-                keyFrameOutgoing.setAnchorLeft(10f);
-                keyFrameUnlinked.setAnchorLeft(10f);
-                keyFrame.setAnchorLeft(10f);
-                keyLink.setAnchorLeft(10f);
+                keyFrameOutgoing.setAnchorBottom(10);
+                keyFrameUnlinked.setAnchorBottom(30);
+                keyFrame.setAnchorBottom(50);
+                keyLink.setAnchorBottom(70);
+                
+                keyFrameOutgoing.setAnchorLeft(10);
+                keyFrameUnlinked.setAnchorLeft(10);
+                keyFrame.setAnchorLeft(10);
+                keyLink.setAnchorLeft(10);
 
                 // Moving to the area of the frame that contains the graph
@@ -256 +258 @@
                 Text link = new Text(toProcessFramesetName + " graph");
                 link.setLink(resultsFrame.getName());
-                link.setPosition(FrameMouseActions.getPosition());
-                FrameMouseActions.pickup(link);
+                link.setPosition(DisplayController.getMousePosition());
+                StandardGestureActions.pickup(link);
                 return null;
         }