eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-03 21:59:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4596 from JakubValtar/master

Browse Source 
Prevent NPEs when tab document is null
This commit is contained in:
Ben Fry
2016-08-01 11:08:01 -04:00
committed by GitHub
parent 61272265ea 7e038b9609
commit 7dee2b054c
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/processing/app/ui/Editor.java
View File

@@ -1371,10 +1371,13 @@ public abstract class Editor extends JFrame implements RunnerListener {
redoAction.updateRedoState();
if (sketch != null) {
sketch.setModified(!getText().equals(sketch.getCurrentCode().getSavedProgram()));
// Go through all tabs; Replace All, Rename or Undo could have changed them
for (SketchCode sc : sketch.getCode()) {
try {
sc.setModified(!sc.getDocumentText().equals(sc.getSavedProgram()));
} catch (BadLocationException ignore) { }
if (sc.getDocument() != null) {
try {
sc.setModified(!sc.getDocumentText().equals(sc.getSavedProgram()));
} catch (BadLocationException ignore) { }
}
}
repaintHeader();
}
@@ -1433,10 +1436,14 @@ public abstract class Editor extends JFrame implements RunnerListener {
undoAction.updateUndoState();
if (sketch != null) {
sketch.setModified(!getText().equals(sketch.getCurrentCode().getSavedProgram()));
// Go through all tabs; Replace All, Rename or Undo could have changed them
for (SketchCode sc : sketch.getCode()) {
try {
sc.setModified(!sc.getDocumentText().equals(sc.getSavedProgram()));
} catch (BadLocationException ignore) { }
if (sc.getDocument() != null) {
try {
sc.setModified(!sc.getDocumentText().equals(sc.getSavedProgram()));
} catch (BadLocationException ignore) {
}
}
}
repaintHeader();
}
@@ -2717,10 +2724,14 @@ public abstract class Editor extends JFrame implements RunnerListener {
// make sure any edits have been stored
//current.setProgram(editor.getText());
// Go through all tabs; Replace All, Rename or Undo could have changed them
for (SketchCode sc : sketch.getCode()) {
try {
sc.setProgram(sc.getDocumentText());
} catch (BadLocationException e) { }
if (sc.getDocument() != null) {
try {
sc.setProgram(sc.getDocumentText());
} catch (BadLocationException e) {
}
}
}
// // if an external editor is being used, need to grab the