disabled debugger for the time being

Author: codeanticode

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

@@ -92,6 +92,7 @@ class AndroidBuild extends JavaBuild {
   // Gradle build files
   static private final String GRADLE_SETTINGS_TEMPLATE = "Settings.gradle.tmpl";
   static private final String GRADLE_PROPERTIES_TEMPLATE = "Properties.gradle.tmpl";
+  static private final String EXPORTED_GRADLE_PROPERTIES_TEMPLATE = "ExpProperties.gradle.tmpl";
   static private final String LOCAL_PROPERTIES_TEMPLATE = "Properties.local.tmpl";
   static private final String TOP_GRADLE_BUILD_TEMPLATE = "TopBuild.gradle.tmpl";
   static private final String APP_GRADLE_BUILD_ECJ_TEMPLATE = "AppBuildECJ.gradle.tmpl";
@@ -322,9 +323,19 @@ private void createTopModule(String projectModules)
     replaceMap.put("@@gradle_plugin_version@@", GRADLE_PLUGIN_VER);
     AndroidUtil.createFileFromTemplate(buildTemplate, buildlFile, replaceMap);
 
-    File gradlePropsTemplate = mode.getContentFile("templates/" + GRADLE_PROPERTIES_TEMPLATE);
+//    File gradlePropsTemplate = mode.getContentFile("templates/" + GRADLE_PROPERTIES_TEMPLATE);
+//    File gradlePropsFile = new File(tmpFolder, "gradle.properties");
+//    Util.copyFile(gradlePropsTemplate, gradlePropsFile);
+    File gradlePropsTemplate;
+    if (exportProject) {
+      gradlePropsTemplate = mode.getContentFile("templates/" + EXPORTED_GRADLE_PROPERTIES_TEMPLATE);
+    } else {
+      gradlePropsTemplate = mode.getContentFile("templates/" + GRADLE_PROPERTIES_TEMPLATE);
+    }
     File gradlePropsFile = new File(tmpFolder, "gradle.properties");
-    Util.copyFile(gradlePropsTemplate, gradlePropsFile);
+    String javaHome = Platform.getJavaHome().getAbsolutePath();
+    replaceMap.put("@@java_home@@", javaHome);
+    AndroidUtil.createFileFromTemplate(gradlePropsTemplate, gradlePropsFile, replaceMap);
 
     File settingsTemplate = mode.getContentFile("templates/" + GRADLE_SETTINGS_TEMPLATE);
     File settingsFile = new File(tmpFolder, "settings.gradle");

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

@@ -85,7 +85,7 @@ protected AndroidEditor(Base base, String path, EditorState state,
     androidMode.resetUserSelection();
     androidMode.checkSDK(this);
 
-    initDebugger();
+//    initDebugger();
 
     androidTools = loadAndroidTools();
     addToolsToMenu();
@@ -164,11 +164,14 @@ public void actionPerformed(ActionEvent e) {
           handleStop();
         }
       });
-    return buildSketchMenu(new JMenuItem[] { buildDebugMenu(), runItem, presentItem, stopItem });
+//    return buildSketchMenu(new JMenuItem[] { buildDebugMenu(), runItem, presentItem, stopItem });
+    return buildSketchMenu(new JMenuItem[] { runItem, presentItem, stopItem });
   }
 
 
   public JMenu buildModeMenu() {
+    super.buildModeMenu();
+    
     androidMenu = new JMenu(AndroidMode.getTextString("menu.android"));
     JMenuItem item;
 
@@ -289,7 +292,7 @@ public void menuCanceled(MenuEvent e) {
     });    
 
     androidMenu.addSeparator();
-
+    
     return androidMenu;
   }
 
@@ -418,6 +421,7 @@ public void run() {
 
 
   public void handleStop() {
+    /*
     if (debugger.isStarted()) {
       debugger.stopDebug();
 
@@ -430,6 +434,14 @@ public void handleStop() {
       // focus the PDE again after quitting presentation mode [toxi 030903]
       toFront();
     }
+    */
+    toolbar.activateStop();
+    androidMode.handleStop(this);
+    toolbar.deactivateStop();
+    toolbar.deactivateRun();
+
+    // focus the PDE again after quitting presentation mode [toxi 030903]
+    toFront();    
   }
 
   @Override

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

@@ -131,7 +131,9 @@ public void handlePressed(MouseEvent e, int sel) {
   @Override
   public List<EditorButton> createButtons() {
     // aEditor not ready yet because this is called by super()
-    final boolean debug = ((AndroidEditor) editor).isDebuggerEnabled();
+//    final boolean debug = ((AndroidEditor) editor).isDebuggerEnabled();
+    final boolean debug = false;
+    
 
     ArrayList<EditorButton> toReturn = new ArrayList<EditorButton>();
     final String runText = debug ?
@@ -197,6 +199,7 @@ private void handleStep(int modifiers) {
 
   @Override
   public void addModeButtons(Box box, JLabel label) {
+    /*
     EditorButton debugButton =
             new EditorButton(this, "/lib/toolbar/debug",
                     Language.text("toolbar.debug")) {
@@ -212,6 +215,7 @@ public void actionPerformed(ActionEvent e) {
 //    debugButton.setRolloverLabel(label);
     box.add(debugButton);
     addGap(box);
+    */
   }
 
   @Override