Skip to content

Commit f04672c

Browse files
authored
Merge pull request #711 from rupeshkumar22/debuggerImprovements2
Working Debugger with Variable Inspector - Final PR
2 parents e3430c9 + 3d758b3 commit f04672c

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

mode/src/processing/mode/android/AndroidDebugger.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@ public synchronized void startDebug(AndroidRunner runner, Device device) {
8888

8989
inspector.reset();
9090

91+
// make the inspector instance visible on which tree nodes would be reflected
92+
inspector.setVisible(true);
93+
9194
runtime = runner;
9295
pkgName = runner.build.getPackageName();
9396
sketchClassName = runner.build.getSketchClassName();

mode/src/processing/mode/android/AndroidEditor.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,8 @@ public AndroidDebugger getDebugger() {
485485
@Override
486486
public void toggleDebug() {
487487
super.toggleDebug();
488+
// make the unused inspector invisible
489+
super.debugger.dispose();
488490
debugger.toggleDebug();
489491
}
490492

mode/src/processing/mode/android/AndroidToolbar.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ static public String getTitle(int index) {
8282
@Override
8383
public List<EditorButton> createButtons() {
8484
// aEditor not ready yet because this is called by super()
85-
// final boolean debug = ((AndroidEditor) editor).isDebuggerEnabled();
86-
final boolean debug = false;
85+
final boolean debug = ((AndroidEditor) editor).isDebuggerEnabled();
86+
// final boolean debug = false;
8787

8888

8989
ArrayList<EditorButton> toReturn = new ArrayList<EditorButton>();
@@ -150,7 +150,7 @@ private void handleStep(int modifiers) {
150150

151151
@Override
152152
public void addModeButtons(Box box, JLabel label) {
153-
/*
153+
154154
EditorButton debugButton =
155155
new EditorButton(this, "/lib/toolbar/debug",
156156
Language.text("toolbar.debug")) {
@@ -166,7 +166,7 @@ public void actionPerformed(ActionEvent e) {
166166
// debugButton.setRolloverLabel(label);
167167
box.add(debugButton);
168168
addGap(box);
169-
*/
169+
170170
}
171171

172172
@Override
@@ -216,4 +216,3 @@ public void deactivateStep() {
216216
repaint();
217217
}
218218
}
219-

0 commit comments

Comments
 (0)