Changeset 1102 for trunk/src/org/apollo/actions/ApolloActions.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/apollo/actions/ApolloActions.java (modified) (6 diffs)

trunk/src/org/apollo/actions/ApolloActions.java

@@ -4 +4 @@
 import org.apollo.widgets.LinkedTrack;
 import org.apollo.widgets.SampleRecorder;
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.gio.gesture.StandardGestureActions;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameMouseActions;
 import org.expeditee.items.Text;
 
@@ -17 +17 @@
 public class ApolloActions {
 
-        private ApolloActions() {} // Util construction
+        /** Static-only class. */
+        private ApolloActions()
+        {
+        } 
         
-        /**
-         * Attatches a new recorder to the cursor
-         */
-        public static void spawnRecorder() {
-                
-                Frame target = DisplayIO.getCurrentFrame();
+        /** Attaches a new recorder to the cursor. */
+        public static void spawnRecorder()
+        {
+                Frame target = DisplayController.getCurrentFrame();
                 if (target  == null) return;
 
@@ -30 +31 @@
                 Text source = new Text(target.getNextItemID());
                 source.setParent(target);
-                source.setPosition(FrameMouseActions.MouseX, FrameMouseActions.MouseY);
+                source.setPosition(DisplayController.getMousePosition());
                 SampleRecorder recWidget = new SampleRecorder(source, null);
                 
                 // Pick it up
-                FrameMouseActions.pickup(recWidget.getItems());
+                StandardGestureActions.pickup(recWidget.getItems());
         }
         
@@ -42 +43 @@
         public static void spawnLinkedTrack() {
                 
-                Frame target = DisplayIO.getCurrentFrame();
+                Frame target = DisplayController.getCurrentFrame();
                 if (target  == null) return;
 
@@ -48 +49 @@
                 Text source = new Text(target.getNextItemID());
                 source.setParent(target);
-                source.setPosition(FrameMouseActions.MouseX, FrameMouseActions.MouseY);
+                source.setPosition(DisplayController.getMousePosition());
                 
                 LinkedTrack ltWidget = new LinkedTrack(source, null);
                 
                 // Pick it up
-                FrameMouseActions.pickup(ltWidget.getItems());
+                StandardGestureActions.pickup(ltWidget.getItems());
         }
         
@@ -64 +65 @@
                 // Create the launcher
                 FramePlaybackLauncher launcher = new FramePlaybackLauncher(null);
-                launcher.setPosition(FrameMouseActions.MouseX, FrameMouseActions.MouseY);
+                launcher.setPosition(DisplayController.getMousePosition());
 
                 // Pick it up
-                FrameMouseActions.pickup(launcher);
+                StandardGestureActions.pickup(launcher);
         }