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

Merge pull request #4117 from JakubValtar/debugger-fix

Browse Source 
Debugger fixes
This commit is contained in:
Ben Fry
2016-02-13 10:36:47 -05:00
parent 47f5323270 05b66536a2
commit 61763c19d7
3 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
java/src/processing/mode/java/Debugger.java
View File

@@ -71,28 +71,25 @@ public class Debugger implements VMEventListener {
protected ReferenceType mainClass;
/// holds all loaded classes in the debuggee VM
protected Set<ReferenceType> classes = new HashSet<ReferenceType>();
protected Set<ReferenceType> classes = new HashSet<>();
/// listeners for class load events
protected List<ClassLoadListener> classLoadListeners =
new ArrayList<ClassLoadListener>();
protected List<ClassLoadListener> classLoadListeners = new ArrayList<>();
/// path to the src folder of the current build
protected String srcPath;
/// list of current breakpoints
protected List<LineBreakpoint> breakpoints =
new ArrayList<LineBreakpoint>();
protected List<LineBreakpoint> breakpoints = new ArrayList<>();
/// the step request we are currently in, or null if not in a step
protected StepRequest requestedStep;
/// maps line number changes at runtime (orig -> changed)
protected Map<LineID, LineID> runtimeLineChanges =
new HashMap<LineID, LineID>();
protected Map<LineID, LineID> runtimeLineChanges = new HashMap<>();
/// tab filenames which already have been tracked for runtime changes
protected Set<String> runtimeTabsTracked = new HashSet<String>();
protected Set<String> runtimeTabsTracked = new HashSet<>();
public Debugger(JavaEditor editor) {
@@ -520,7 +517,7 @@ public class Debugger implements VMEventListener {
* @return the list of breakpoints in the given tab
*/
synchronized List<LineBreakpoint> getBreakpoints(String tabFilename) {
List<LineBreakpoint> list = new ArrayList<LineBreakpoint>();
List<LineBreakpoint> list = new ArrayList<>();
for (LineBreakpoint bp : breakpoints) {
if (bp.lineID().fileName().equals(tabFilename)) {
list.add(bp);
@@ -661,7 +658,12 @@ public class Debugger implements VMEventListener {
// disallow stepping into invisible lines
if (!locationIsVisible(se.location())) {
// TODO: this leads to stepping, should it run on the EDT?
stepOutIntoViewOrContinue();
javax.swing.SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
stepOutIntoViewOrContinue();
}
});
}
}
@@ -914,7 +916,8 @@ public class Debugger implements VMEventListener {
if (!t.isSuspended() || t.frameCount() == 0) {
return "";
}
return t.frame(0).thisObject().referenceType().name();
ObjectReference ref = t.frame(0).thisObject();
return ref == null ? "" : ref.referenceType().name();
} catch (IncompatibleThreadStateException ex) {
log(Level.SEVERE, null, ex);
@@ -966,7 +969,7 @@ public class Debugger implements VMEventListener {
*/
protected List<VariableNode> getLocals(ThreadReference t, int depth) {
//System.out.println("getting locals");
List<VariableNode> vars = new ArrayList<VariableNode>();
List<VariableNode> vars = new ArrayList<>();
try {
if (t.frameCount() > 0) {
StackFrame sf = t.frame(0);
@@ -1008,7 +1011,7 @@ public class Debugger implements VMEventListener {
} catch (IncompatibleThreadStateException ex) {
log(Level.SEVERE, null, ex);
}
return new ArrayList<VariableNode>();
return new ArrayList<>();
}
@@ -1023,7 +1026,7 @@ public class Debugger implements VMEventListener {
protected List<VariableNode> getFields(Value value, int depth, int maxDepth,
boolean includeInherited) {
// remember: Value <- ObjectReference, ArrayReference
List<VariableNode> vars = new ArrayList<VariableNode>();
List<VariableNode> vars = new ArrayList<>();
if (depth <= maxDepth) {
if (value instanceof ArrayReference) {
return getArrayFields((ArrayReference) value);
@@ -1065,7 +1068,7 @@ public class Debugger implements VMEventListener {
* @return list of array fields
*/
protected List<VariableNode> getArrayFields(ArrayReference array) {
List<VariableNode> fields = new ArrayList<VariableNode>();
List<VariableNode> fields = new ArrayList<>();
if (array != null) {
String arrayType = array.type().name();
if (arrayType.endsWith("[]")) {
@@ -1089,7 +1092,7 @@ public class Debugger implements VMEventListener {
* @return call stack as list of {@link DefaultMutableTreeNode}s
*/
protected List<DefaultMutableTreeNode> getStackTrace(ThreadReference t) {
List<DefaultMutableTreeNode> stack = new ArrayList<DefaultMutableTreeNode>();
List<DefaultMutableTreeNode> stack = new ArrayList<>();
try {
for (StackFrame f : t.frames()) {
stack.add(new DefaultMutableTreeNode(locationToString(f.location())));
@@ -1117,13 +1120,13 @@ public class Debugger implements VMEventListener {
} else {
StackFrame sf = t.frame(0);
ObjectReference thisObject = sf.thisObject();
if (this != null) {
if (thisObject != null) {
ReferenceType type = thisObject.referenceType();
System.out.println("fields in this (" + type.name() + "):");
for (Field f : type.visibleFields()) {
System.out.println(f.typeName() + " " + f.name() + " = " + thisObject.getValue(f));
}
} else { // TODO [this is not reachable - fry]
} else {
System.out.println("can't get this (in native or static method)");
}
}

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

@@ -1178,11 +1178,11 @@ public class JavaEditor extends Editor {
Logger.getLogger(getClass().getName()).log(Level.INFO, "Invoked 'Step Over' menu item");
debugger.stepOver();
} else if ((modifiers & KeyEvent.SHIFT_DOWN_MASK) != 0) {
} else if ((modifiers & ActionEvent.SHIFT_MASK) != 0) {
Logger.getLogger(getClass().getName()).log(Level.INFO, "Invoked 'Step Into' menu item");
debugger.stepInto();
} else if ((modifiers & KeyEvent.ALT_DOWN_MASK) != 0) {
} else if ((modifiers & ActionEvent.ALT_MASK) != 0) {
Logger.getLogger(getClass().getName()).log(Level.INFO, "Invoked 'Step Out' menu item");
debugger.stepOut();
}
@@ -1494,7 +1494,7 @@ public class JavaEditor extends Editor {
item = Toolkit.newJMenuItemShift(Language.text("menu.debug.step_into"), KeyEvent.VK_J);
item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
handleStep(KeyEvent.SHIFT_DOWN_MASK);
handleStep(ActionEvent.SHIFT_MASK);
}
});
debugMenu.add(item);
@@ -1503,7 +1503,7 @@ public class JavaEditor extends Editor {
item = Toolkit.newJMenuItemAlt(Language.text("menu.debug.step_out"), KeyEvent.VK_J);
item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
handleStep(KeyEvent.ALT_DOWN_MASK);
handleStep(ActionEvent.ALT_MASK);
}
});
debugMenu.add(item);

2
java/src/processing/mode/java/JavaToolbar.java
View File

@@ -79,7 +79,7 @@ public class JavaToolbar extends EditorToolbar {
Language.text("menu.debug.step_out")) {
@Override
public void actionPerformed(ActionEvent e) {
final int mask = KeyEvent.SHIFT_DOWN_MASK | KeyEvent.ALT_DOWN_MASK;
final int mask = ActionEvent.SHIFT_MASK | ActionEvent.ALT_MASK;
jeditor.handleStep(e.getModifiers() & mask);
}
};