Chore : code scrubbing

(removed redundant comments and print statements, Added useful comments, removed src/processing/mode/android/AndroidDebugger.java)

Author: manav-mj

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

@@ -4,15 +4,14 @@
 import com.sun.jdi.event.*;
 import com.sun.jdi.request.ClassPrepareRequest;
 import com.sun.jdi.request.EventRequestManager;
-import com.sun.jdi.request.ModificationWatchpointRequest;
 import com.sun.jdi.request.StepRequest;
+import processing.app.Messages;
 import processing.mode.java.Debugger;
 import processing.mode.java.debug.ClassLoadListener;
 import processing.mode.java.debug.LineBreakpoint;
 import processing.mode.java.debug.LineID;
 
 import java.io.IOException;
-import java.util.List;
 
 public class AndroidDebugger extends Debugger {
   /// editor window, acting as main view
@@ -25,8 +24,6 @@ public class AndroidDebugger extends Debugger {
   private String pkgName = "";
   private String sketchClassName = "";
 
-  public static final String FIELD_NAME = "mouseX";
-
   public AndroidDebugger(AndroidEditor editor, AndroidMode androidMode) {
     super(editor);
     this.editor = editor;
@@ -65,40 +62,20 @@ public synchronized void startDebug(AndroidRunner runner, Device device) {
       // connect
       System.out.println("\n:debugger:Attaching Debugger");
       VirtualMachine vm = runner.connectVirtualMachine(port);
-      System.out.println("ATTACHED");
+      System.out.println("DEBUGGER ATTACHED");
 
       // start receiving vm events
       VMEventReader eventThread = new VMEventReader(vm.eventQueue(), vmEventListener);
       eventThread.start();
 
       // watch for loaded classes
       addClassWatch(vm);
-//      // set watch field on already loaded classes
-//      List<ReferenceType> referenceTypes = vm.classesByName(pkgName + "." + sketchClassName);
-//
-//      System.out.println("referenceTypes size " + referenceTypes.size());
-//      for (ReferenceType refType : referenceTypes) {
-//        addFieldWatch(vm, refType);
-//        // Adding breakpoint at line 27
-//      try {
-//        List<Location> locations = refType.locationsOfLine(28);
-//        if (locations.isEmpty()){
-//          System.out.println("no location found for line 27");
-//        } else {
-//          BreakpointRequest bpr = vm.eventRequestManager().createBreakpointRequest(locations.get(0));
-//          bpr.enable();
-//        }
-//      } catch (AbsentInformationException e) {
-//        e.printStackTrace();
-//      }
-//      }
-
 
       // resume the vm
       vm.resume();
 
     } catch (IOException e) {
-      System.out.println("ERROR : " + e.getMessage());
+      Messages.log("ERROR : " + e.getMessage());
       // Retry
       startDebug(runner, device);
     } catch (InterruptedException e) {
@@ -114,7 +91,7 @@ public synchronized void startDebug(AndroidRunner runner, Device device) {
       return;
     }
     for (Event e : es) {
-      System.out.println("VM Event: " + e);
+      // System.out.println("VM Event: " + e);
       if (e instanceof VMStartEvent) {
         System.out.println("start");
 
@@ -290,17 +267,6 @@ private void addClassWatch(VirtualMachine vm) {
     classPrepareRequest.setEnabled(true);
   }
 
-  /**
-   * Watch field ({@value FIELD_NAME})
-   */
-  private void addFieldWatch(VirtualMachine vm,
-                             ReferenceType refType) {
-    EventRequestManager erm = vm.eventRequestManager();
-    Field field = refType.fieldByName(FIELD_NAME);
-    ModificationWatchpointRequest modificationWatchpointRequest = erm.createModificationWatchpointRequest(field);
-    modificationWatchpointRequest.setEnabled(true);
-  }
-
   @Override
   public VirtualMachine vm() {
     if (runtime != null) {

mode/src/processing/mode/android/AndroidRunner.java

@@ -137,6 +137,7 @@ public boolean launch(Future<Device> deviceFuture, int comp, boolean emu) {
       }
     }
 
+    // Start Debug if Debugger is enabled
     if (isDebugEnabled){
       ((AndroidEditor) listener).getDebugger()
         .startDebug(this, device);

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

@@ -33,7 +33,6 @@
 import processing.app.ui.EditorButton;
 import processing.app.ui.EditorToolbar;
 import processing.app.Language;
-import processing.mode.java.JavaEditor;
 
 import javax.swing.*;
 

mode/src/processing/mode/android/Device.java

@@ -50,7 +50,6 @@ class Device {
 //  public static final String APP_ENDED = "android.device.app.ended";
 
   private String packageName = "";
-  private String sketchClassName = "";
 
   // mutable state
   private Process logcat;
@@ -115,14 +114,14 @@ public String getName() {
 
   // adb -s emulator-5556 install helloWorld.apk
 
-  // : adb -s HT91MLC00031 install bin/Brightness-debugEnabled.apk
+  // : adb -s HT91MLC00031 install bin/Brightness-debug.apk
   // 532 KB/s (190588 bytes in 0.349s)
-  // pkg: /data/local/tmp/Brightness-debugEnabled.apk
+  // pkg: /data/local/tmp/Brightness-debug.apk
   // Failure [INSTALL_FAILED_ALREADY_EXISTS]
 
-  // : adb -s HT91MLC00031 install -r bin/Brightness-debugEnabled.apk
+  // : adb -s HT91MLC00031 install -r bin/Brightness-debug.apk
   // 1151 KB/s (190588 bytes in 0.161s)
-  // pkg: /data/local/tmp/Brightness-debugEnabled.apk
+  // pkg: /data/local/tmp/Brightness-debug.apk
   // Success
 
   // safe to just always include the -r (reinstall) flag
@@ -193,7 +192,7 @@ public boolean launchApp(final String packageName, boolean isDebuggerEnabled)
     if (isDebuggerEnabled){
       String[] cmd = {
         "shell", "am", "start",
-        "-e", "debugEnabled", "true",
+        "-e", "debug", "true",
         "-a", "android.intent.action.MAIN",
         "-c", "android.intent.category.LAUNCHER", "-D",
         "-n", packageName + "/.MainActivity"
@@ -202,7 +201,7 @@ public boolean launchApp(final String packageName, boolean isDebuggerEnabled)
     }else {
       String[] cmd = {
         "shell", "am", "start",
-        "-e", "debugEnabled", "true",
+        "-e", "debug", "true",
         "-a", "android.intent.action.MAIN",
         "-c", "android.intent.category.LAUNCHER",
         "-n", packageName + "/.MainActivity"
@@ -224,13 +223,12 @@ public boolean launchApp(final String packageName, boolean isDebuggerEnabled)
     return pr.succeeded();
   }
 
-  // XXXXXXXXXXXX-----prototype-start-XXXXXXXXXXXXXXXXXX
-
   public void forwardPort(int tcpPort) throws IOException, InterruptedException {
     // Start ADB Server
     adb("start-server");
     final String[] jdwpcmd = generateAdbCommand("jdwp");
     Process deviceId = Runtime.getRuntime().exec(jdwpcmd);
+    // Get Process ID from ADB command `adb jdwp`
     JDWPProcessor pIDProcessor = new JDWPProcessor();
     new StreamPump(deviceId.getInputStream(), "jdwp: ").addTarget(
         pIDProcessor).start();
@@ -251,7 +249,6 @@ public int getId(){
       return pId;
     }
   }
-  // XXXXXXXXXXXX-----prototype-end-XXXXXXXXXXXXXXXXXX
 
   public boolean isEmulator() {
     return id.startsWith("emulator");