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

continuing to work through the debugger

Browse Source
This commit is contained in:
Ben Fry
2015-05-18 13:14:20 -04:00
parent 4169d86bff
commit bbe04b9741
7 changed files with 150 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/src/processing/mode/java/JavaEditor.java
+76 -88
View File
@@ -87,9 +87,8 @@ public class JavaEditor extends Editor {
protected JPanel consoleProblemsPane;
protected XQErrorTable errorTable;
// TODO how is this different from hasJavaTabs?
// public boolean compilationCheckEnabled = true;
private boolean hasJavaTabs;
private boolean javaTabWarned;
protected JavaEditor(Base base, String path, EditorState state, Mode mode) {
@@ -151,9 +150,58 @@ public class JavaEditor extends Editor {
getJavaTextArea().setECSandThemeforTextArea(errorCheckerService, jmode);
addXQModeUI();
// debugToolbarEnabled = new AtomicBoolean(false);
//log("Sketch Path: " + path);
// Adding ErrorBar
JPanel textAndError = new JPanel();
Box box = (Box) textarea.getParent();
box.remove(2); // Remove textArea from it's container, i.e Box
textAndError.setLayout(new BorderLayout());
errorBar = new ErrorBar(this, textarea.getMinimumSize().height, jmode);
textAndError.add(errorBar, BorderLayout.EAST);
textarea.setBounds(0, 0, errorBar.getX() - 1, textarea.getHeight());
textAndError.add(textarea);
box.add(textAndError);
// Adding Error Table in a scroll pane
errorTableScrollPane = new JScrollPane();
errorTable = new XQErrorTable(errorCheckerService);
// errorTableScrollPane.setBorder(new EmptyBorder(2, 2, 2, 2));
errorTableScrollPane.setBorder(new EtchedBorder());
errorTableScrollPane.setViewportView(errorTable);
// Adding toggle console button
consolePanel.remove(2);
JPanel lineStatusPanel = new JPanel();
lineStatusPanel.setLayout(new BorderLayout());
btnShowConsole = new XQConsoleToggle(this, Language.text("editor.footer.console"), lineStatus.getHeight());
btnShowErrors = new XQConsoleToggle(this, Language.text("editor.footer.errors"), lineStatus.getHeight());
btnShowConsole.addMouseListener(btnShowConsole);
btnShowErrors.addMouseListener(btnShowErrors);
JPanel toggleButtonPanel = new JPanel(new BorderLayout());
toggleButtonPanel.add(btnShowConsole, BorderLayout.EAST);
toggleButtonPanel.add(btnShowErrors, BorderLayout.WEST);
lineStatusPanel.add(toggleButtonPanel, BorderLayout.EAST);
lineStatus.setBounds(0, 0, toggleButtonPanel.getX() - 1,
toggleButtonPanel.getHeight());
lineStatusPanel.add(lineStatus);
consolePanel.add(lineStatusPanel, BorderLayout.SOUTH);
lineStatusPanel.repaint();
// Adding JPanel with CardLayout for Console/Problems Toggle
consolePanel.remove(1);
consoleProblemsPane = new JPanel(new CardLayout());
consoleProblemsPane.add(errorTableScrollPane, Language.text("editor.footer.errors"));
consoleProblemsPane.add(console, Language.text("editor.footer.console"));
consolePanel.add(consoleProblemsPane, BorderLayout.CENTER);
// ensure completion gets hidden on editor losing focus
addWindowFocusListener(new WindowFocusListener() {
public void windowLostFocus(WindowEvent e) {
getJavaTextArea().hideSuggestion();
}
public void windowGainedFocus(WindowEvent e) { }
});
}
@@ -167,6 +215,17 @@ public class JavaEditor extends Editor {
}
public EditorHeader createHeader() {
return new EditorHeader(this) {
public void rebuild() {
super.rebuild();
System.out.println("checking for Java tabs");
hasJavaTabs = checkForJavaTabs();
}
};
}
public Formatter createFormatter() {
return new AutoFormat();
}
@@ -1115,11 +1174,13 @@ public class JavaEditor extends Editor {
}
/*
public void handleSave() {
// toolbar.activate(JavaToolbar.SAVE);
super.handleSave(true);
// toolbar.deactivate(JavaToolbar.SAVE);
}
*/
public boolean handleSaveAs() {
@@ -1139,15 +1200,13 @@ public class JavaEditor extends Editor {
debugger.setBreakpoint(line);
}
// add breakpoint marker comments to source file
for (int i = 0; i < getSketch().getCodeCount(); i++) {
addBreakpointComments(getSketch().getCode(i).getFileName());
for (SketchCode code : getSketch().getCode()) {
addBreakpointComments(code.getFileName());
}
// set new name of variable inspector
inspector.setTitle(getSketch().getName());
//inspector.setTitle(getSketch().getName());
}
// if file location has changed, update autosaver
// autosaver.reloadAutosaveDir();
return saved;
}
@@ -1179,7 +1238,6 @@ public class JavaEditor extends Editor {
// commented out, then this will be a problem.
String[] list = lib.getSpecifiedImports(); // ask the library for its imports
if (list == null) {
// Default to old behavior and load each package in the primary jar
list = Base.packageListFromClassPath(lib.getJarPath());
}
@@ -1220,79 +1278,6 @@ public class JavaEditor extends Editor {
// Additions from PDE X, Debug Mode, Twerk Mode...
private void addXQModeUI(){
// Adding ErrorBar
JPanel textAndError = new JPanel();
Box box = (Box) textarea.getParent();
box.remove(2); // Remove textArea from it's container, i.e Box
textAndError.setLayout(new BorderLayout());
errorBar = new ErrorBar(this, textarea.getMinimumSize().height, jmode);
textAndError.add(errorBar, BorderLayout.EAST);
textarea.setBounds(0, 0, errorBar.getX() - 1, textarea.getHeight());
textAndError.add(textarea);
box.add(textAndError);
// Adding Error Table in a scroll pane
errorTableScrollPane = new JScrollPane();
errorTable = new XQErrorTable(errorCheckerService);
// errorTableScrollPane.setBorder(new EmptyBorder(2, 2, 2, 2));
errorTableScrollPane.setBorder(new EtchedBorder());
errorTableScrollPane.setViewportView(errorTable);
// Adding toggle console button
consolePanel.remove(2);
JPanel lineStatusPanel = new JPanel();
lineStatusPanel.setLayout(new BorderLayout());
btnShowConsole = new XQConsoleToggle(this,
XQConsoleToggle.CONSOLE, lineStatus.getHeight());
btnShowErrors = new XQConsoleToggle(this,
XQConsoleToggle.ERRORSLIST, lineStatus.getHeight());
btnShowConsole.addMouseListener(btnShowConsole);
// lineStatusPanel.add(btnShowConsole, BorderLayout.EAST);
// lineStatusPanel.add(btnShowErrors);
btnShowErrors.addMouseListener(btnShowErrors);
JPanel toggleButtonPanel = new JPanel(new BorderLayout());
toggleButtonPanel.add(btnShowConsole, BorderLayout.EAST);
toggleButtonPanel.add(btnShowErrors, BorderLayout.WEST);
lineStatusPanel.add(toggleButtonPanel, BorderLayout.EAST);
lineStatus.setBounds(0, 0, toggleButtonPanel.getX() - 1,
toggleButtonPanel.getHeight());
lineStatusPanel.add(lineStatus);
consolePanel.add(lineStatusPanel, BorderLayout.SOUTH);
lineStatusPanel.repaint();
// Adding JPanel with CardLayout for Console/Problems Toggle
consolePanel.remove(1);
consoleProblemsPane = new JPanel(new CardLayout());
consoleProblemsPane.add(errorTableScrollPane, XQConsoleToggle.ERRORSLIST);
consoleProblemsPane.add(console, XQConsoleToggle.CONSOLE);
consolePanel.add(consoleProblemsPane, BorderLayout.CENTER);
// ensure completion gets hidden on editor losing focus
addWindowFocusListener(new WindowFocusListener() {
public void windowLostFocus(WindowEvent e) {
getJavaTextArea().hideSuggestion();
}
public void windowGainedFocus(WindowEvent e) { }
});
}
// /**
// * Event handler called when closing the editor window. Kills the variable
// * inspector window.
// *
// * @param e the event object
// */
// protected void onWindowClosing(WindowEvent e) {
// // remove var.inspector
// vi.dispose();
// // quit running debug session
// dbg.stopDebug();
// }
/**
* Used instead of the windowClosing event handler, since it's not called on
* mode switch. Called when closing the editor window. Stops running debug
@@ -2608,10 +2593,13 @@ public class JavaEditor extends Editor {
private boolean checkForJavaTabs() {
for (SketchCode code : getSketch().getCode()) {
if (code.getExtension().equals("java")) {
final String msg =
getSketch().getName() + " contains .java tabs. Some editor " +
"features are not supported for .java tabs and will be disabled.";
Base.showWarning("Cannot debug advanced sketches", msg);
if (!javaTabWarned) {
System.out.println(getSketch().getName() + " contains .java tabs. ");
System.out.println("Some editor features (like completion " +
"and error checking) will be disabled.");
//Base.showWarning("Cannot debug advanced sketches", msg);
javaTabWarned = true;
}
return true;
}
}
java/src/processing/mode/java/pdex/ErrorCheckerService.java
+2 -1
View File
@@ -52,6 +52,7 @@ import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
import processing.app.Base;
import processing.app.Editor;
import processing.app.EditorStatus;
import processing.app.Language;
import processing.app.Library;
import processing.app.SketchCode;
import processing.app.syntax.SyntaxDocument;
@@ -331,7 +332,7 @@ public class ErrorCheckerService implements Runnable {
lastErrorCheckCall = System.currentTimeMillis();
if(!hasSyntaxErrors())
editor.showProblemListView(XQConsoleToggle.CONSOLE);
editor.showProblemListView(Language.text("editor.footer.console"));
// Make sure astGen has at least one CU to start with
// This is when the loaded sketch already has syntax errors.
// Completion wouldn't be complete, but it'd be still something
java/src/processing/mode/java/pdex/XQConsoleToggle.java
+13 -16
View File
@@ -30,23 +30,20 @@ import java.awt.event.MouseListener;
import javax.swing.JPanel;
import processing.app.Language;
import processing.mode.java.JavaEditor;
/**
* Toggle Button displayed in the editor line status panel for toggling bewtween
* console and problems list. Glorified JPanel.
*
* @author Manindra Moharana &lt;me@mkmoharana.com&gt;
*
*/
/**
* Toggle Button displayed in the editor line status panel for toggling between
* console and problems list. Glorified JPanel.
*
* @author Manindra Moharana &lt;me@mkmoharana.com&gt;
*
*/
public class XQConsoleToggle extends JPanel implements MouseListener {
public static final String CONSOLE = Language.text("editor.footer.console"), ERRORSLIST = Language.text("editor.footer.errors") ;
private boolean toggleText = true;
private boolean toggleBG = true;
/**
* Height of the component
*/
@@ -75,8 +72,8 @@ public class XQConsoleToggle extends JPanel implements MouseListener {
public void paintComponent(Graphics g) {
Graphics2D g2d = (Graphics2D) g;
g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
// On mouse hover, text and background color are changed.
if (toggleBG) {
g.setColor(new Color(0xff9DA7B0));
@@ -91,7 +88,7 @@ public class XQConsoleToggle extends JPanel implements MouseListener {
g.fillRect(0, 0, 4, this.getHeight());
g.setColor(Color.WHITE);
}
g.drawString(buttonName, getWidth() / 2 + 2 // + 2 is a offset
- getFontMetrics(getFont()).stringWidth(buttonName) / 2,
this.getHeight() - 6);
@@ -100,8 +97,8 @@ public class XQConsoleToggle extends JPanel implements MouseListener {
g.fillRect(4, 0, 2, this.getHeight());
}
}
boolean drawMarker = false;
boolean drawMarker = false;
protected Color markerColor;
public void updateMarker(boolean value, Color color){
drawMarker = value;