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

todo notes and clean up a few warnings

Browse Source
This commit is contained in:
Ben Fry
2018-05-05 09:54:44 -04:00
parent eb8f0edd4d
commit 9015177fb2
5 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

5
java/src/processing/mode/java/pdex/DebugTree.java
View File

@@ -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();

4
java/src/processing/mode/java/pdex/Rename.java
View File

@@ -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) {

4
java/src/processing/mode/java/pdex/ShowUsage.java
View File

@@ -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