Changeset 899

Timestamp:

02/16/14 15:37:46 (10 years ago)

Author:

jts21

Message:

Improvements to JSItem/JSWidget (better thread and drawing handling, required for an example pong game I made for the presentation)

Location:

trunk/src/org/expeditee/items

Files:

• JSItem.java (modified) (3 diffs)
• widgets/JSWidget.java (modified) (8 diffs)

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

@@ -13 +13 @@
 import org.expeditee.items.widgets.InteractiveWidget;
 
-public class JSItem extends XRayable {
+public class JSItem extends XRayable implements JSThreadable {
         
         private static final Object global = Javascript2.eval("new Object()");
@@ -177 +177 @@
         }
         
-        private final class JSThread {
-                private Thread thread;
-                private String code;
-                
-                public JSThread(String code) {
-                        this.code = code;
-                        this.thread = null;
-                }
-                
-                public void kill() {
-                        if(thread != null) {
-                                thread.interrupt();
-                                try {
-                        thread.join();
-                } catch (InterruptedException e) {
-                        e.printStackTrace();
-                }
-                                thread = null;
-                        }
-                }
-                
-                public void start() {
-                        if(thread != null) {
-                                this.kill();
-                        }
-                        thread = new Thread(new Runnable() {
-                        @Override
-                        public void run() {
-                                try {
-                        scriptEngine.eval("thread = " + code + "\nthread()");
-                                } catch (Exception e) {
-                                        if(e.getCause() instanceof InterruptedException) {
-                                                // if the thread was interrupted exit quietly
-                                                return;
-                                        }
-                                        e.printStackTrace();
-                    }
-                        }
-                });
-                        thread.start();
-                }
-        }
-        
         private List<JSThread> threads = new LinkedList<JSThread>();
         
-        public void addThread(String code) {
-                this.threads.add(new JSThread(code));
+        public JSThread addThread(String code) {
+                JSThread t = new JSThread(scriptEngine, code);
+                this.threads.add(t);
+                return t;
         }
         
@@ -242 +201 @@
                 case ItemParentStateChangedEvent.EVENT_TYPE_SHOWN_VIA_OVERLAY:
                         for(JSThread t : this.threads) {
-                                t.start();
+                                        t.resume();
                         }
                         break;

trunk/src/org/expeditee/items/widgets/JSWidget.java

@@ -2 +2 @@
 
 import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Graphics2D;
 import java.util.LinkedList;
 import java.util.List;
@@ -7 +9 @@
 import javax.script.Invocable;
 import javax.script.ScriptEngine;
-import javax.swing.JComponent;
 import javax.swing.JPanel;
 
 import org.expeditee.actions.Javascript2;
 import org.expeditee.gui.DisplayIO;
+import org.expeditee.items.ItemParentStateChangedEvent;
+import org.expeditee.items.JSThreadable;
 import org.expeditee.items.Text;
 
@@ -20 +23 @@
  *
  */
-public class JSWidget extends DataFrameWidget {
+public class JSWidget extends DataFrameWidget implements JSThreadable {
         
         private static final Object global = Javascript2.eval("new Object()");
@@ -35 +38 @@
         private final Invocable invocable;
         // component created by running our constructor
-        private final JComponent component;
+        private final Component component;
         // container for our component
         private final JPanel container;
@@ -45 +48 @@
         }
         
-        private JSWidget(Text source, String init, String save, String load) throws Exception {
-                super(source, new JPanel(new BorderLayout()), -1, 100, -1, -1, 100, -1);
+        private JSWidget(Text source, int width, int height, String init, String save, String load) throws Exception {
+                super(source, new JPanel(new BorderLayout()), -1, width, -1, -1, height, -1);
                 this.init = init;
                 this.save = save;
@@ -58 +61 @@
                 this.scriptEngine.put("container", this.container);
         System.out.println(this.init);
-        this.component = (JComponent) this.scriptEngine.eval("var init = " + this.init + "\ninit()");
+        this.component = (Component) this.scriptEngine.eval("var init = " + this.init + "\ninit()");
         this.container.add(component);
         this.scriptEngine.put("component", this.component);
         this.scriptEngine.eval("save = " + this.save);
         this.scriptEngine.eval("load = " + this.load);
+        }
+        
+        private JSWidget(Text source, String init, String save, String load) throws Exception {
+                this(source, 100, 100, init, save, load);
         }
         
@@ -72 +79 @@
         }
         
+        public JSWidget(int width, int height, String init, String save, String load) throws Exception {
+                this(getSauce(), width, height, init, save, load);
+        }
+        
         public JSWidget(String init, String save, String load) throws Exception {
-                this(getSauce(), init, save, load);
+                this(100, 100, init, save, load);
         }
         
@@ -96 +107 @@
         }
         }
+    
+    private List<JSThread> threads = new LinkedList<JSThread>();
+    
+    public JSThread addThread(String code) {
+                JSThread t = new JSThread(scriptEngine, code);
+                this.threads.add(t);
+                return t;
+        }
+    
+    @Override
+        public void onParentStateChanged(int e) {
+                switch (e) {
+                case ItemParentStateChangedEvent.EVENT_TYPE_REMOVED:
+                case ItemParentStateChangedEvent.EVENT_TYPE_REMOVED_VIA_OVERLAY:
+                case ItemParentStateChangedEvent.EVENT_TYPE_HIDDEN:
+                        for(JSThread t : this.threads) {
+                                t.kill();
+                        }
+                        break;
+    
+                case ItemParentStateChangedEvent.EVENT_TYPE_ADDED:
+                case ItemParentStateChangedEvent.EVENT_TYPE_ADDED_VIA_OVERLAY:
+                case ItemParentStateChangedEvent.EVENT_TYPE_SHOWN:
+                case ItemParentStateChangedEvent.EVENT_TYPE_SHOWN_VIA_OVERLAY:
+                        for(JSThread t : this.threads) {
+                                        t.resume();
+                        }
+                        break;
+                }
+        }
+    
+    @Override
+        protected void paintLink(Graphics2D g) {
+        return;
+        }
 }