eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-04 06:09:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3263 from pvrs12/fix-file-change-breakpoints

Browse Source 
Fix for breakpoints causing a reload prompt
This commit is contained in:
Ben Fry
2015-05-11 18:03:32 -04:00
parent 19d436b1cc 9be339fb42
commit 1b36cb699a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/src/processing/mode/java/JavaEditor.java
View File

@@ -1662,10 +1662,12 @@ public class JavaEditor extends Editor {
List<LineBreakpoint> bps = debugger.getBreakpoints(tab.getFileName());
// load the source file
File sourceFile = new File(sketch.getFolder(), tab.getFileName());
////switched to using methods 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,8 @@ public class JavaEditor extends Editor {
}
code = PApplet.join(lines, "\n");
//System.out.println("new code: " + code);
Base.saveFile(code, sourceFile);
tab.setProgram(code);
tab.save();
} catch (IOException ex) {
Logger.getLogger(JavaEditor.class.getName()).log(Level.SEVERE, null, ex);
}