debugger updates

Author: codeanticode

mode/src/processing/mode/android/AndroidBuild.java

@@ -246,18 +246,21 @@ protected File createProject(boolean external)
     return tmpFolder;
     */
 
+    
     // build the preproc and get to work
-    PdePreprocessor preproc = AndroidPreprocessorFactory.build(sketch.getName(), getPackageName());
+//    PdePreprocessor preproc = AndroidPreprocessorFactory.build(sketch.getName(), getPackageName());
 
     // On Android, this init will throw a SketchException if there's a problem with size()
-    PreprocessorResult info = preproc.initSketchSize(sketch.getMainProgram());
+//    PreprocessorResult info = preproc.initSketchSize(sketch.getMainProgram());
 
 //    SurfaceInfo info = preproc.initSketchSize(sketch.getMainProgram());        
 //    preproc.initSketchSmooth(sketch.getMainProgram());
-
-    sketchClassName = preprocess(srcFolder, getPackageName(), preproc, false);
+    
+    PdePreprocessor preprocessor = PdePreprocessor.builderFor(sketch.getName()).build();
+    sketchClassName = preprocess(srcFolder, getPackageName(), preprocessor, false);
     if (sketchClassName != null) {
-      renderer = info.getSketchRenderer();
+//      renderer = info.getSketchRenderer();
+      renderer = "P2D";
       writeMainClass(srcFolder, renderer, external);
       createTopModule("':" + module +"'");
       createAppModule(module);

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

@@ -27,7 +27,7 @@
 import com.sun.jdi.request.EventRequestManager;
 import com.sun.jdi.request.StepRequest;
 import processing.app.Messages;
-import processing.mode.java.Debugger;
+import processing.mode.java.debug.Debugger;
 import processing.mode.java.debug.ClassLoadListener;
 import processing.mode.java.debug.LineBreakpoint;
 import processing.mode.java.debug.LineID;
@@ -222,6 +222,7 @@ public void run() {
     }
   }
 
+  /*
   @Override public synchronized void continueDebug() {
     editor.activateContinue();
     editor.variableInspector().lock();
@@ -234,9 +235,11 @@ public void run() {
       runtime.vm().resume();
       paused = false;
       editor.statusBusy();
-    }
+    }    
   }
+  */
 
+  /*
   @Override protected void step(int stepDepth) {
     if (!isStarted()) {
       startDebug();
@@ -253,7 +256,9 @@ public void run() {
       editor.statusBusy();
     }
   }
+  */
 
+  /*
   @Override public synchronized void stopDebug() {
     editor.variableInspector().lock();
     if (runtime != null) {
@@ -278,6 +283,7 @@ public void run() {
 
     editor.statusEmpty();
   }
+  */
 
   /**
    * Watch all classes ({@value sketchClassName}) variable
@@ -317,7 +323,7 @@ LineBreakpoint breakpointOnLine(LineID line) {
     return null;
   }
 
-  synchronized void toggleBreakpoint(int lineIdx) {
+  synchronized public void toggleBreakpoint(int lineIdx) {
     LineID line = editor.getLineIDInCurrentTab(lineIdx);
     int index = line.lineIdx();
     if (hasBreakpoint(line)) {
@@ -341,7 +347,7 @@ synchronized void setBreakpoint(int lineIdx) {
     setBreakpoint(editor.getLineIDInCurrentTab(lineIdx));
   }
 
-  synchronized void setBreakpoint(LineID line) {
+  synchronized public void setBreakpoint(LineID line) {
     // do nothing if we are kinda busy
     if (isStarted() && !isPaused()) {
       return;

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

@@ -24,6 +24,7 @@
 
 import processing.app.Base;
 import processing.app.Mode;
+import processing.app.Language;
 import processing.app.Platform;
 import processing.app.Settings;
 import processing.app.SketchException;
@@ -33,6 +34,7 @@
 import processing.app.ui.EditorToolbar;
 import processing.app.ui.Toolkit;
 import processing.mode.java.JavaEditor;
+import processing.mode.java.debug.Debugger;
 import processing.mode.java.debug.LineID;
 import processing.mode.java.preproc.PdePreprocessor;
 
@@ -61,6 +63,7 @@ public class AndroidEditor extends JavaEditor {
 
   private int appComponent;
 
+  protected JMenu debugMenu;
   private AndroidDebugger debugger;
 
   private Settings settings;
@@ -90,10 +93,10 @@ protected AndroidEditor(Base base, String path, EditorState state,
     loadModeSettings();    
   }
 
-  @Override
-  public PdePreprocessor createPreprocessor(final String sketchName) {
-    return new AndroidPreprocessor(sketchName);  
-  }
+//  @Override
+//  public PdePreprocessor createPreprocessor(final String sketchName) {
+//    return new AndroidPreprocessor(sketchName);  
+//  }
 
 
   public EditorToolbar createToolbar() {
@@ -290,6 +293,12 @@ public void menuCanceled(MenuEvent e) {
     return androidMenu;
   }
 
+  private JMenu buildDebugMenu() {
+    debugMenu = new JMenu(Language.text("menu.debug"));
+    debugger.populateMenu(debugMenu);
+    return debugMenu;
+  }
+  
 
   private void setAppComponent(int comp) {
     if (appComponent != comp) {
@@ -428,25 +437,28 @@ public AndroidDebugger getDebugger() {
     return debugger;
   }
 
-  @Override protected void deactivateDebug() {
-    super.deactivateDebug();
-  }
+  
+//  @Override protected void deactivateDebug() {
+//    super.deactivateDebug();
+//  }
 
-  @Override protected void activateContinue() {
+  @Override public void activateContinue() {
     ((AndroidToolbar) toolbar).activateContinue();
   }
 
-  @Override protected void deactivateContinue() {
+  @Override public void deactivateContinue() {
     ((AndroidToolbar) toolbar).deactivateContinue();
   }
 
-  @Override protected void activateStep() {
+  @Override public void activateStep() {
     ((AndroidToolbar) toolbar).activateStep();
   }
 
-  @Override protected void deactivateStep() {
+  @Override public void deactivateStep() {
     ((AndroidToolbar) toolbar).deactivateStep();
   }
+  
+  
 
   @Override
   public void toggleDebug() {
@@ -460,7 +472,7 @@ public void toggleBreakpoint(int lineIndex) {
   }
 
   @Override
-  protected LineID getCurrentLineID() {
+  public LineID getCurrentLineID() {
     return super.getCurrentLineID();
   }
 

mode/src/processing/mode/android/AndroidLineBreakpoint.java

@@ -22,7 +22,7 @@
 package processing.mode.android;
 
 import com.sun.jdi.ReferenceType;
-import processing.mode.java.Debugger;
+import processing.mode.java.debug.Debugger;
 import processing.mode.java.debug.LineBreakpoint;
 import processing.mode.java.debug.LineID;
 

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

@@ -156,7 +156,7 @@ public void actionPerformed(ActionEvent e) {
         @Override
         public void actionPerformed(ActionEvent e) {
           final int mask = ActionEvent.SHIFT_MASK | ActionEvent.ALT_MASK;
-          aEditor.handleStep(e.getModifiers() & mask);
+          handleStep(e.getModifiers() & mask);
         }
       };
       toReturn.add(stepButton);
@@ -166,7 +166,7 @@ public void actionPerformed(ActionEvent e) {
               Language.text("menu.debug.continue")) {
         @Override
         public void actionPerformed(ActionEvent e) {
-          aEditor.handleContinue();
+          aEditor.getDebugger().continueDebug();
         }
       };
       toReturn.add(continueButton);
@@ -185,6 +185,16 @@ public void actionPerformed(ActionEvent e) {
     return toReturn;
   }
 
+  private void handleStep(int modifiers) {
+    if (modifiers == 0) {
+      aEditor.getDebugger().stepOver();
+    } else if ((modifiers & ActionEvent.SHIFT_MASK) != 0) {
+      aEditor.getDebugger().stepInto();
+    } else if ((modifiers & ActionEvent.ALT_MASK) != 0) {
+      aEditor.getDebugger().stepOut();
+    }
+  }  
+  
   @Override
   public void addModeButtons(Box box, JLabel label) {
     EditorButton debugButton =