tweakmode: handle comment blocks, ignore global assignments

galsasson · galsasson · commit 1ac9e0a2c50b · 2015-04-28T09:42:52.000-04:00
diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
@@ -2739,9 +2739,11 @@ private void removeSpacesFromCode() {
    * Replace all numbers with variables and add code to initialize
    * these variables and handle update messages.
    */
-  protected boolean automateSketch(Sketch sketch, List<List<Handle>> handles) {
+  protected boolean automateSketch(Sketch sketch, SketchParser parser) {
     SketchCode[] code = sketch.getCode();
 
+    List<List<Handle>> handles = parser.allHandles;
+    
     if (code.length < 1) {
       return false;
     }
@@ -2793,7 +2795,7 @@ protected boolean automateSketch(Sketch sketch, List<List<Handle>> handles) {
       }
       code[tab].setProgram(c);
     }
-
+    
     // add the main header to the code in the first tab
     String c = code[0].getProgram();
 
diff --git a/java/src/processing/mode/java/JavaMode.java b/java/src/processing/mode/java/JavaMode.java
@@ -167,7 +167,6 @@ public Runner handleTweak(Sketch sketch,
                             RunnerListener listener,
                             final boolean present) throws SketchException {
     final JavaEditor editor = (JavaEditor)listener;
-    boolean launchInteractive = false;
 
     if (isSketchModified(sketch)) {
       editor.deactivateRun();
@@ -193,7 +192,7 @@ public Runner handleTweak(Sketch sketch,
     final SketchParser parser = new SketchParser(editor.baseCode, requiresTweak);
 
     // add our code to the sketch
-    launchInteractive = editor.automateSketch(sketch, parser.allHandles);
+    final boolean launchInteractive = editor.automateSketch(sketch, parser);
 
     build = new JavaBuild(sketch);
     appletClassName = build.build(false);
@@ -204,8 +203,10 @@ public Runner handleTweak(Sketch sketch,
           public void run() {
             runtime.launch(present);  // this blocks until finished
             // next lines are executed when the sketch quits
-            editor.initEditorCode(parser.allHandles, false);
-            editor.stopInteractiveMode(parser.allHandles);
+            if (launchInteractive) {
+                editor.initEditorCode(parser.allHandles, false);
+                editor.stopInteractiveMode(parser.allHandles);
+            }
           }
         }).start();
 
diff --git a/java/src/processing/mode/java/tweak/SketchParser.java b/java/src/processing/mode/java/tweak/SketchParser.java

Original file line number	Diff line number	Diff line change
`@@ -2739,9 +2739,11 @@ private void removeSpacesFromCode() {`
`2739`	`2739`	`* Replace all numbers with variables and add code to initialize`
`2740`	`2740`	`* these variables and handle update messages.`
`2741`	`2741`	`*/`
`2742`		`- protected boolean automateSketch(Sketch sketch, List<List<Handle>> handles) {`
	`2742`	`+ protected boolean automateSketch(Sketch sketch, SketchParser parser) {`
`2743`	`2743`	`SketchCode[] code = sketch.getCode();`
`2744`	`2744`
	`2745`	`+ List<List<Handle>> handles = parser.allHandles;`
	`2746`	`+`
`2745`	`2747`	`if (code.length < 1) {`
`2746`	`2748`	`return false;`
`2747`	`2749`	`}`
`@@ -2793,7 +2795,7 @@ protected boolean automateSketch(Sketch sketch, List<List<Handle>> handles) {`
`2793`	`2795`	`}`
`2794`	`2796`	`code[tab].setProgram(c);`
`2795`	`2797`	`}`
`2796`		`-`
	`2798`	`+`
`2797`	`2799`	`// add the main header to the code in the first tab`
`2798`	`2800`	`String c = code[0].getProgram();`
`2799`	`2801`