Changeset 758

Timestamp:

01/28/14 09:55:22 (10 years ago)

Author:

jts21

Message:

Change JSWidget to just use a single init() method instead of preCreate(), constructor(), postCreate() methods (since all those 3 methods actually did was set up and return a JComponent, they can all be handled at once)

File:

• trunk/src/org/expeditee/items/widgets/JSWidget.java (modified) (5 diffs)

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

@@ -23 +23 @@
 public class JSWidget extends DataFrameWidget {
         
-        // a method to run before running the constructor
-        private final String preCreate;
-        // a method to run that will return a JComponent
-        private final String constructor;
-        // a method to run after running the constructor
-        private final String postCreate;
+        // a method to run that will set up and return the root JComponent for this Widget
+        private final String init;
         // a method to run to generate a List<String> to save the state
         private final String save;
@@ -47 +43 @@
         }
         
-        private JSWidget(Text source, String preCreate, String constructor, String postCreate, String save, String load) throws Exception {
+        private JSWidget(Text source, String init, String save, String load) throws Exception {
                 super(source, new JPanel(new BorderLayout()), -1, 100, -1, -1, 100, -1);
-                this.preCreate = preCreate;
-                this.constructor = constructor;
-                this.postCreate = postCreate;
+                this.init = init;
                 this.save = save;
                 this.load = load;
@@ -59 +53 @@
                 this.scriptEngine.put("widget", this);
                 this.scriptEngine.put("container", this.container);
-                System.out.println(this.preCreate);
-        this.scriptEngine.eval("var pre = " + this.preCreate + "\npre()");
-        System.out.println(this.constructor);
-        this.component = (JComponent) this.scriptEngine.eval("var constructor = " + this.constructor + "\nconstructor()");
+        System.out.println(this.init);
+        this.component = (JComponent) this.scriptEngine.eval("var init = " + this.init + "\ninit()");
         this.container.add(component);
         this.scriptEngine.put("component", this.component);
-        System.out.println(this.postCreate);
-        this.scriptEngine.eval("var post = " + this.postCreate + "\npost()");
         }
         
@@ -72 +62 @@
                 this(source, source.getData().get(0).replaceAll("\\\\n", "\n"),
                                 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"));
+                                source.getData().get(2).replaceAll("\\\\n", "\n"));
                 this.scriptEngine.eval("var load = " + this.load);
                 ((Invocable)this.scriptEngine).invokeFunction("load", (Object) args);
         }
         
-        public JSWidget(String preCreate, String constructor, String postCreate, String save, String load) throws Exception {
-                this(getSauce(), preCreate, constructor, postCreate, save, load);
+        public JSWidget(String init, String save, String load) throws Exception {
+                this(getSauce(), init, save, load);
         }
         
@@ -86 +74 @@
         protected List<String> getData() {
                 List<String> value = new LinkedList<String>();
-                value.add(this.preCreate.replaceAll("[\n\r]", "\\\\n"));
-                value.add(this.constructor.replaceAll("[\n\r]", "\\\\n"));
-                value.add(this.postCreate.replaceAll("[\n\r]", "\\\\n"));
+                value.add(this.init.replaceAll("[\n\r]", "\\\\n"));
                 value.add(this.save.replaceAll("[\n\r]", "\\\\n"));
                 value.add(this.load.replaceAll("[\n\r]", "\\\\n"));