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

trunk/src/org/expeditee/actions/Javascript.java

@@ -19 +19 @@
 package org.expeditee.actions;
 
-import java.awt.Color;
 import java.util.LinkedList;
 import java.util.List;
@@ -26 +25 @@
 import org.expeditee.agents.Agent;
 import org.expeditee.agents.DefaultAgent;
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.core.Colour;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.MessageBay;
@@ -75 +74 @@
         private static int _stepPause = -1;
 
-        private static Color _stepColor;
+        private static Colour _stepColor;
 
         private static boolean _nextStatement;
@@ -93 +92 @@
         //Have changed parameters, so it takes an Item, not just a Text item.
         private static void RunJavascriptFrame(Frame frame, Item current,
-                        boolean acceptKeyboardInput, boolean step, int pause, Color color) {
+                        boolean acceptKeyboardInput, boolean step, int pause, Colour color) {
                 try {
                         if (current != null) {
@@ -101 +100 @@
                                  */
                                 // DisplayIO.addToBack(current.getParent());
-                                DisplayIO.addToBack(DisplayIO.getCurrentFrame());
+                                DisplayController.addToBack(DisplayController.getCurrentFrame());
                         } else {
                                 /* TODO we should not have to pass an item just to run a frame! */
@@ -108 +107 @@
                         }
 
-                        _stepColor = color == null ? Color.green : color;
-                        _stepColor = new Color(_stepColor.getRed(), _stepColor.getGreen(),
-                                        _stepColor.getBlue(), 50);
+                        _stepColor = color == null ? Colour.GREEN : color;
+                        _stepColor = new Colour(_stepColor.getRed(), _stepColor.getGreen(),
+                                        _stepColor.getBlue(), Colour.FromComponent255(50));
                         _stepPause = pause;
                         _step = step;
@@ -168 +167 @@
                 FrameUtils.DisplayFrame(item.getParent().getName(), true, true);
                 item.setHighlightMode(HighlightMode.Normal);
-                item.setHighlightColor(Color.CYAN);
+                item.setHighlightColor(Colour.CYAN);
                 FrameIO.SaveFrame(item.getParent());
         }
@@ -192 +191 @@
 
                 if (_step) {
-                        if (child != DisplayIO.getCurrentFrame()) {
-                                DisplayIO.setCurrentFrame(child, true);
-                        }
-                        DisplayIO.addToBack(child);
+                        if (child != DisplayController.getCurrentFrame()) {
+                                DisplayController.setCurrentFrame(child, true);
+                        }
+                        DisplayController.addToBack(child);
                 }
 
@@ -216 +215 @@
                         AgentStats.ItemExecuted();
                         try {
-                                Color oldColor = item.getBackgroundColor();
+                                Colour oldColor = item.getBackgroundColor();
                                 if (_step) {
                                         pause(item);
@@ -226 +225 @@
                                         } else {
                                                 item.setHighlightMode(Item.HighlightMode.None);
+                                                item.setHighlightColorToDefault();
                                         }
                                 }
@@ -233 +233 @@
                                                         && lastItemStatus != Status.FalseIf) {
                                                 if (_step) {
-                                                        DisplayIO.removeFromBack();
+                                                        DisplayController.removeFromBack();
                                                 }
                                                 return lastItemStatus;
@@ -257 +257 @@
 
                 if (_step) {
-                        DisplayIO.removeFromBack();
-                        if (DisplayIO.getCurrentFrame() != current.getParent())
-                                DisplayIO.setCurrentFrame(current.getParent(), true);
+                        DisplayController.removeFromBack();
+                        if (DisplayController.getCurrentFrame() != current.getParent())
+                                DisplayController.setCurrentFrame(current.getParent(), true);
                 }
 
@@ -276 +276 @@
                         return;
 
-                Color oldColor = item.getBackgroundColor();
+                Colour oldColor = item.getBackgroundColor();
                 item.setBackgroundColor(_stepColor);
                 item.setHighlightMode(Item.HighlightMode.None);
+                item.setHighlightColorToDefault();
 
                 // Make sure we are on the frame with this item
                 Frame parent = item.getParentOrCurrentFrame();
-                if (!parent.equals(DisplayIO.getCurrentFrame())) {
-                        DisplayIO.setCurrentFrame(parent, true);
-                }
-
-                FrameGraphics.Repaint();
+                if (!parent.equals(DisplayController.getCurrentFrame())) {
+                        DisplayController.setCurrentFrame(parent, true);
+                }
+
+                DisplayController.requestRefresh(true);
 
                 int timeRemaining;
@@ -297 +298 @@
                         if (_stop) {
                                 item.setBackgroundColor(oldColor);
-                                item.setHighlightMode(HighlightMode.Normal, _stepColor);
+                                item.setHighlightModeAndColour(HighlightMode.Normal, _stepColor);
                                 throw new Exception("Program terminated");
                         }
@@ -388 +389 @@
                 _programsRunning++;
                 AgentStats.reset();
-                MessageBay.displayMessage("Running Javascript Program ...", Color.BLUE);
+                MessageBay.displayMessage("Running Javascript Program ...", Colour.BLUE);
         }