From 5b07b268cfb99e2570f24bf7d1fa839254f70e9f Mon Sep 17 00:00:00 2001 From: Patrick Vares Date: Sun, 10 May 2015 20:35:53 -0400 Subject: [PATCH 1/2] Modified the java mode to use the methods in the SketchCode class for loading and saving files. Fixes an error with breakpoints causing file reloads --- java/src/processing/mode/java/JavaEditor.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java index a988bef88..627dbea6c 100644 --- a/java/src/processing/mode/java/JavaEditor.java +++ b/java/src/processing/mode/java/JavaEditor.java @@ -1662,10 +1662,12 @@ public class JavaEditor extends Editor { List bps = debugger.getBreakpoints(tab.getFileName()); // load the source file - File sourceFile = new File(sketch.getFolder(), tab.getFileName()); + ////switched to using resoures provided by the SketchCode class + // File sourceFile = new File(sketch.getFolder(), tab.getFileName()); //System.out.println("file: " + sourceFile); try { - String code = Base.loadFile(sourceFile); + tab.load(); + String code = tab.getProgram(); //System.out.println("code: " + code); String lines[] = code.split("\\r?\\n"); // newlines not included for (LineBreakpoint bp : bps) { @@ -1674,7 +1676,7 @@ public class JavaEditor extends Editor { } code = PApplet.join(lines, "\n"); //System.out.println("new code: " + code); - Base.saveFile(code, sourceFile); + tab.save(); } catch (IOException ex) { Logger.getLogger(JavaEditor.class.getName()).log(Level.SEVERE, null, ex); } From 9be339fb422f7b3f0df4fc7b8c95dc72aba80b31 Mon Sep 17 00:00:00 2001 From: Patrick Vares Date: Sun, 10 May 2015 21:31:06 -0400 Subject: [PATCH 2/2] forgot to actually write back to the sketch --- java/src/processing/mode/java/JavaEditor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java index 627dbea6c..20c9b4b92 100644 --- a/java/src/processing/mode/java/JavaEditor.java +++ b/java/src/processing/mode/java/JavaEditor.java @@ -1662,7 +1662,7 @@ public class JavaEditor extends Editor { List bps = debugger.getBreakpoints(tab.getFileName()); // load the source file - ////switched to using resoures provided by the SketchCode class + ////switched to using methods provided by the SketchCode class // File sourceFile = new File(sketch.getFolder(), tab.getFileName()); //System.out.println("file: " + sourceFile); try { @@ -1676,6 +1676,7 @@ public class JavaEditor extends Editor { } code = PApplet.join(lines, "\n"); //System.out.println("new code: " + code); + tab.setProgram(code); tab.save(); } catch (IOException ex) { Logger.getLogger(JavaEditor.class.getName()).log(Level.SEVERE, null, ex);