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

trunk/src/org/expeditee/items/JSItem.java

@@ -19 +19 @@
 package org.expeditee.items;
 
-import java.awt.Graphics2D;
-import java.awt.Polygon;
 import java.util.LinkedList;
 import java.util.List;
@@ -29 +27 @@
 import javax.script.ScriptException;
 
-import org.expeditee.gui.DisplayIO;
-import org.expeditee.items.widgets.InteractiveWidget;
+import org.expeditee.Util;
+import org.expeditee.core.bounds.AxisAlignedBoxBounds;
+import org.expeditee.gui.DisplayController;
 
 public class JSItem extends XRayable implements JSThreadable {
@@ -64 +63 @@
     
         private static Text getSauce(int width, int height) {
-                Text source = new Text(DisplayIO.getCurrentFrame().getNextItemID(), "@js: " + width + " " + height);
-                source.setParent(DisplayIO.getCurrentFrame());
+                Text source = new Text(DisplayController.getCurrentFrame().getNextItemID(), "@js: " + width + " " + height);
+                source.setParent(DisplayController.getCurrentFrame());
                 return source;
         }
@@ -115 +114 @@
 
         @Override
-        public void paint(Graphics2D g) {
-                try {
-                this.invocable.invokeFunction("paint", (Object)g);
+        public void paint(/*Graphics2D g*/) {
+                try {
+                        // Not sure of the consequences of changing this? cts16
+                //this.invocable.invokeFunction("paint", (Object)g);
+                        this.invocable.invokeFunction("paint");
         } catch (Exception e) {
                 e.printStackTrace();
@@ -130 +131 @@
 
         @Override
-        public void updatePolygon() {
-                _poly = new Polygon();
-                _poly.addPoint(getX(), getY());
-                _poly.addPoint(getX() + _width, getY());
-                _poly.addPoint(getX() + _width, getY() + _height);
-                _poly.addPoint(getX(), getY() + _height);
+        public AxisAlignedBoxBounds updateBounds()
+        {
+                return new AxisAlignedBoxBounds(getX(), getY(), _width, _height);
         }
         
@@ -158 +156 @@
                         return;
                 }
-                String[] args = InteractiveWidget.parseArgs(text.substring(index));
+                String[] args = Util.parseArgs(text.substring(index));
                 try {
                         this.scriptEngine.eval("load = " + this.load);
@@ -189 +187 @@
                 newText.append(_width).append(" ").append(_height);
                 
-                String stateArgs = InteractiveWidget.formatArgs(saveArgs());
+                String stateArgs = Util.formatArgs(saveArgs());
                 if (stateArgs != null) {
                         newText.append(':');
@@ -239 +237 @@
         }
 
+        @Override
+        public float getSize() {
+                // TODO Auto-generated method stub
+                return 0;
+        }
+
 }