Changeset 785

Timestamp:

01/29/14 16:45:41 (10 years ago)

Author:

jts21

Message:

Tidier thread handling for JSItem (although it does assume that threads should always be restarted, and there is no way of disabling a thread after adding it... TODO: add a flag for disabling a thread, and automatically set that flag if the thread finishes execution successfully)

File:

• trunk/src/org/expeditee/items/JSItem.java (modified) (8 diffs)

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

@@ -25 +25 @@
         // a method to run that will paint our item using a Graphics2D object
         private final String paint;
-        // a method to run when the item's parent's state changes
-        private final String state;
         
         // we have our own script context since it needs to have some global variables which are specific to each widget
@@ -40 +38 @@
         }
 
-        private JSItem(Text source, String init, String save, String load, String paint, String state) throws Exception {
+        private JSItem(Text source, String init, String save, String load, String paint) throws Exception {
                 super(source);
                 this.init = init;
@@ -46 +44 @@
                 this.load = load;
                 this.paint = paint;
-                this.state = state;
                 this.scriptEngine = Javascript2.scriptEngineManager.getEngineByMimeType("application/javascript");
                 this.invocable = (Invocable) this.scriptEngine;
@@ -58 +55 @@
         this.scriptEngine.eval("save = " + this.save);
         this.scriptEngine.eval("paint = " + this.paint);
-        this.scriptEngine.eval("state = " + this.state);
         this.updateSource();
         }
@@ -66 +62 @@
                                 source.getData().get(1).replaceAll("\\\\n", "\n"),
                                 source.getData().get(2).replaceAll("\\\\n", "\n"),
-                                source.getData().get(3).replaceAll("\\\\n", "\n"),
-                                source.getData().get(4).replaceAll("\\\\n", "\n"));
-        }
-        
-        public JSItem(int width, int height, String init, String save, String load, String paint, String state) throws Exception {
-                this(getSauce(width, height), init, save, load, paint, state);
-        }
-        
-        public JSItem(String init, String save, String load, String paint, String state) throws Exception {
-                this(100, 100, init, save, load, paint, state);
+                                source.getData().get(3).replaceAll("\\\\n", "\n"));
+        }
+        
+        public JSItem(int width, int height, String init, String save, String load, String paint) throws Exception {
+                this(getSauce(width, height), init, save, load, paint);
+        }
+        
+        public JSItem(String init, String save, String load, String paint) throws Exception {
+                this(100, 100, init, save, load, paint);
         }
 
@@ -90 +85 @@
         @Override
         public void paint(Graphics2D g) {
-                this.scriptEngine.put("polygon", this._poly);
                 try {
                 this.invocable.invokeFunction("paint", (Object)g);
         } catch (Exception e) {
                 e.printStackTrace();
-        }
-        }
-        
-        @Override
-        public void onParentStateChanged(ItemParentStateChangedEvent e) {
-                try {
-                this.invocable.invokeFunction("state", (Object)e);
-        } catch (Exception e1) {
-                e1.printStackTrace();
         }
         }
@@ -168 +153 @@
                 data.add(this.load.replaceAll("[\n\r]", "\\\\n"));
                 data.add(this.paint.replaceAll("[\n\r]", "\\\\n"));
-                data.add(this.state.replaceAll("[\n\r]", "\\\\n"));
                 _source.setData(data);
                 
@@ -182 +166 @@
                 _source.setText(newText.toString());
         }
+        
+        @Override
+        public Integer getWidth() {
+                return this._width;
+        }
+        
+        @Override
+        public int getHeight() {
+                return this._height;
+        }
+        
+        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();
+                                thread = null;
+                        }
+                }
+                
+                public void start() {
+                        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));
+        }
+        
+        @Override
+        public void onParentStateChanged(ItemParentStateChangedEvent e) {
+                switch (e.getEventType()) {
+                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.start();
+                        }
+                        break;
+
+                }
+        }
 
 }