Merge pull request #710 from rupeshkumar22/debuggerImprovements2

Debugger Improvements - In Progress

Author: codeanticode

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

@@ -23,15 +23,16 @@
 
 import com.sun.jdi.*;
 import com.sun.jdi.event.*;
+import com.sun.jdi.event.Event;
 import com.sun.jdi.request.ClassPrepareRequest;
 import com.sun.jdi.request.EventRequestManager;
 import com.sun.jdi.request.StepRequest;
+import processing.app.Language;
 import processing.app.Messages;
-import processing.mode.java.debug.Debugger;
-import processing.mode.java.debug.ClassLoadListener;
-import processing.mode.java.debug.LineBreakpoint;
-import processing.mode.java.debug.LineID;
+import processing.mode.java.debug.*;
 
+import javax.swing.*;
+import java.awt.*;
 import java.io.IOException;
 
 // Developed by Manav Jain as part of GSoC 2018
@@ -43,6 +44,7 @@ public class AndroidDebugger extends Debugger {
 
   protected boolean isEnabled;
 
+
   private String pkgName = "";
   private String sketchClassName = "";
 
@@ -58,6 +60,19 @@ public boolean isEnabled() {
 
   public void toggleDebug() {
     isEnabled = !isEnabled;
+    inspector.setVisible(enabled);
+    if (isEnabled) {
+      debugItem.setText(Language.text("menu.debug.disable"));
+    } else {
+      debugItem.setText(Language.text("menu.debug.enable"));
+    }
+
+    for (Component item : debugMenu.getMenuComponents()) {
+      if (item instanceof JMenuItem && item != debugItem) {
+        item.setEnabled(isEnabled);
+      }
+    }
+
   }
 
   @Override
@@ -71,6 +86,8 @@ public synchronized void startDebug(AndroidRunner runner, Device device) {
       return; // do nothing
     }
 
+    inspector.reset();
+
     runtime = runner;
     pkgName = runner.build.getPackageName();
     sketchClassName = runner.build.getSketchClassName();
@@ -222,10 +239,10 @@ public void run() {
     }
   }
 
-  /*
+
   @Override public synchronized void continueDebug() {
     editor.activateContinue();
-    editor.variableInspector().lock();
+    inspector.lock();
     //editor.clearSelection();
     //clearHighlight();
     editor.clearCurrentLine();
@@ -237,14 +254,14 @@ public void run() {
       editor.statusBusy();
     }    
   }
-  */
 
-  /*
+
+
   @Override protected void step(int stepDepth) {
     if (!isStarted()) {
       startDebug();
     } else if (isPaused()) {
-      editor.variableInspector().lock();
+      inspector.lock();
       editor.activateStep();
 
       // use global to mark that there is a step request pending
@@ -256,11 +273,11 @@ public void run() {
       editor.statusBusy();
     }
   }
-  */
 
-  /*
+
+
   @Override public synchronized void stopDebug() {
-    editor.variableInspector().lock();
+    inspector.lock();
     if (runtime != null) {
 
       for (LineBreakpoint bp : breakpoints) {
@@ -277,13 +294,13 @@ public void run() {
     stopTrackingLineChanges();
     started = false;
 
-    editor.deactivateDebug();
+    // editor.deactivateDebug();
     editor.deactivateContinue();
     editor.deactivateStep();
 
     editor.statusEmpty();
   }
-  */
+
 
   /**
    * Watch all classes ({@value sketchClassName}) variable

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

@@ -85,7 +85,6 @@ protected AndroidEditor(Base base, String path, EditorState state,
     androidMode.resetUserSelection();
     androidMode.checkSDK(this);
 
-//    initDebugger();
 
     androidTools = loadAndroidTools();
     addToolsToMenu();
@@ -174,8 +173,8 @@ public void actionPerformed(ActionEvent e) {
           handleStop();
         }
       });
-//    return buildSketchMenu(new JMenuItem[] { buildDebugMenu(), runItem, presentItem, stopItem });
-    return buildSketchMenu(new JMenuItem[] { runItem, presentItem, stopItem });
+    return buildSketchMenu(new JMenuItem[] { buildDebugMenu(), runItem, presentItem, stopItem });
+//    return buildSketchMenu(new JMenuItem[] { runItem, presentItem, stopItem });
   }
 
 
@@ -307,6 +306,7 @@ public void menuCanceled(MenuEvent e) {
   }
 
   private JMenu buildDebugMenu() {
+    initDebugger();
     debugMenu = new JMenu(Language.text("menu.debug"));
     debugger.populateMenu(debugMenu);
     return debugMenu;
@@ -727,9 +727,9 @@ public void actionPerformed(ActionEvent e) {
   private void initDebugger() {
     debugger = new AndroidDebugger(this, androidMode);
     // Set saved breakpoints when sketch is opened for the first time
-    for (LineID lineID : stripBreakpointComments()) {
-      debugger.setBreakpoint(lineID);
-    }
+//    for (LineID lineID : stripBreakpointComments()) {
+//      debugger.setBreakpoint(lineID);
+//    }
     super.debugger = debugger;
 
   }