diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java index 10c825027..71cbea4b4 100644 --- a/java/src/processing/mode/java/JavaEditor.java +++ b/java/src/processing/mode/java/JavaEditor.java @@ -21,6 +21,7 @@ import processing.data.StringList; import processing.app.*; import processing.app.contrib.*; import processing.app.syntax.JEditTextArea; +import processing.app.syntax.PdeTextArea; import processing.app.syntax.PdeTextAreaDefaults; import processing.app.ui.*; import processing.app.ui.Toolkit; @@ -2078,7 +2079,7 @@ public class JavaEditor extends Editor { cursorToLineStart(line.lineIdx()); // highlight line currentLine = new LineHighlight(line.lineIdx(), this); - currentLine.setMarker(JavaTextArea.STEP_MARKER); + currentLine.setMarker(PdeTextArea.STEP_MARKER); currentLine.setPriority(10); // fixes current line being hidden by the breakpoint when moved down } @@ -2107,7 +2108,7 @@ public class JavaEditor extends Editor { */ public void addBreakpointedLine(LineID lineID) { LineHighlight hl = new LineHighlight(lineID, this); - hl.setMarker(JavaTextArea.BREAK_MARKER); + hl.setMarker(PdeTextArea.BREAK_MARKER); breakpointedLines.add(hl); // repaint current line if it's on this line if (currentLine != null && currentLine.getLineID().equals(lineID)) { @@ -2350,7 +2351,7 @@ public class JavaEditor extends Editor { frmImportSuggest = new JFrame(); frmImportSuggest.setUndecorated(true); - frmImportSuggest.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + frmImportSuggest.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); JPanel panel = new JPanel(); panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS)); panel.setBackground(Color.WHITE); diff --git a/java/src/processing/mode/java/pdex/DebugTree.java b/java/src/processing/mode/java/pdex/DebugTree.java index 7cbce7bed..a3ccb48e1 100644 --- a/java/src/processing/mode/java/pdex/DebugTree.java +++ b/java/src/processing/mode/java/pdex/DebugTree.java @@ -9,9 +9,9 @@ import java.util.Deque; import java.util.function.Consumer; import javax.swing.JDialog; -import javax.swing.JFrame; import javax.swing.JScrollPane; import javax.swing.JTree; +import javax.swing.WindowConstants; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; @@ -24,6 +24,7 @@ import processing.app.ui.ZoomTreeCellRenderer; import processing.mode.java.JavaEditor; import processing.mode.java.pdex.PreprocessedSketch.SketchInterval; + class DebugTree { final JDialog window; final JTree tree; @@ -59,7 +60,7 @@ class DebugTree { tree.setModel(null); } }); - window.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); + window.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); window.setBounds(new Rectangle(680, 100, 460, 620)); window.setTitle("AST View - " + editor.getSketch().getName()); JScrollPane sp = new JScrollPane(); diff --git a/java/src/processing/mode/java/pdex/Rename.java b/java/src/processing/mode/java/pdex/Rename.java index d45f84189..7c5c6bca2 100644 --- a/java/src/processing/mode/java/pdex/Rename.java +++ b/java/src/processing/mode/java/pdex/Rename.java @@ -17,12 +17,12 @@ import java.util.stream.Collectors; import javax.swing.Box; import javax.swing.JButton; import javax.swing.JDialog; -import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JRootPane; import javax.swing.JTextField; +import javax.swing.WindowConstants; import javax.swing.text.BadLocationException; import org.eclipse.jdt.core.dom.ASTNode; @@ -73,7 +73,7 @@ class Rename { window = new JDialog(editor); JRootPane rootPane = window.getRootPane(); window.setTitle("Rename"); - window.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); + window.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); Toolkit.registerWindowCloseKeys(rootPane, new ActionListener() { @Override public void actionPerformed(ActionEvent e) { diff --git a/java/src/processing/mode/java/pdex/ShowUsage.java b/java/src/processing/mode/java/pdex/ShowUsage.java index 962356238..91bf04383 100644 --- a/java/src/processing/mode/java/pdex/ShowUsage.java +++ b/java/src/processing/mode/java/pdex/ShowUsage.java @@ -16,10 +16,10 @@ import java.util.function.Consumer; import java.util.stream.Collectors; import javax.swing.JDialog; -import javax.swing.JFrame; import javax.swing.JMenuItem; import javax.swing.JScrollPane; import javax.swing.JTree; +import javax.swing.WindowConstants; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeModel; @@ -63,7 +63,7 @@ class ShowUsage { { // Show Usage window window = new JDialog(editor); - window.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); + window.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); window.setAutoRequestFocus(false); window.addComponentListener(new ComponentAdapter() { @Override diff --git a/todo.txt b/todo.txt index 80fcc6fcd..d9be3887c 100755 --- a/todo.txt +++ b/todo.txt @@ -27,6 +27,7 @@ X update to Java 8u172 _ Examples dialog causes high CPU load _ https://github.com/processing/processing/issues/5246 + contrib X updates to Japanese translation X https://github.com/processing/processing/pull/5263 @@ -37,6 +38,7 @@ X https://github.com/processing/processing/pull/5144 X Update java.lang.UnsupportedClassVersionError message X https://github.com/processing/processing/pull/5459 + welcome o just remove the welcome dialog; but what should the default behavior be? o or should it only show up for people who have used <=2 but not 3? @@ -98,6 +100,8 @@ _ https://github.com/processing/processing/pull/5126 nasty ones +_ errors inside setup() aren't coming through at all? +_ seen in Eclipse; have to turn on the debugger _ "Sketch disappeared" infinite pop up dialogs _ https://github.com/processing/processing/pull/4808 _ https://github.com/processing/processing/issues/4805