made SDK Updater into a tool

Author: codeanticode

.classpath

@@ -6,7 +6,5 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/processing-java"/>
 	<classpathentry kind="lib" path="mode/gradle-tooling-api-4.0.jar"/>
-	<classpathentry kind="lib" path="/Users/andres/code/android/android-studio/sdk/tools/lib/repository-25.3.2.jar"/>
-	<classpathentry kind="lib" path="/Users/andres/code/android/android-studio/sdk/tools/lib/sdklib-25.3.2.jar"/>
 	<classpathentry kind="output" path="core/bin"/>
 </classpath>

build.gradle

@@ -14,6 +14,7 @@ allprojects {
     apply plugin: 'java'
 
     ext.android_platform = "$sdkdir/platforms/android-$sdkver"
+    ext.android_tools_lib = "$sdkdir/platforms/android-$sdkver/tools/lib"
     ext.core_jar_path = "$rootDir/processing-core.zip"
 
     repositories {
@@ -23,6 +24,7 @@ allprojects {
         flatDir dirs: "$rootDir/libraries/vr/library"
         flatDir dirs: "$sdkdir/tools/lib"        
         flatDir dirs: android_platform
+        flatDir dirs: android_tools_lib
     }
 
     sourceCompatibility = 1.7
@@ -36,9 +38,7 @@ dependencies {
     compile group: 'org.processing', name: 'core', version: '3.3.4'
     compile group: 'org.processing', name: 'pde', version: '3.3.4'
     compile group: 'org.processing', name: 'java-mode', version: '3.3.4'
-    compile "org.gradle:gradle-tooling-api:3.2.1"    
-    compile "com.android.repository:repository:25.3.2"
-    compile "com.android.sdklib:sdklib:25.3.2"
+    compile "org.gradle:gradle-tooling-api:4.0"
 }
 
 sourceSets {
@@ -64,6 +64,7 @@ task dist {
         FileUtils.copyDirectory(file("icons"), file("$root/icons"))
         FileUtils.copyDirectory(file("mode"), file("$root/mode"))
         FileUtils.copyDirectory(file("theme"), file("$root/theme"))
+        FileUtils.copyDirectory(file("tools"), file("$root/tools"))
 
         Files.copy(file("$buildDir/libs/processing-android.jar").toPath(),
                    file("$root/mode/AndroidMode.jar").toPath(), REPLACE_EXISTING);
@@ -80,8 +81,6 @@ task dist {
                                 file("$root/libraries/vr/examples"))
         FileUtils.copyDirectory(file("libraries/vr/gvrsdk"), 
                                 file("$root/libraries/vr/gvrsdk"))
-        FileUtils.copyDirectory(file("libraries/vr/lib"), 
-                                file("$root/libraries/vr/lib"))    
         FileUtils.copyDirectory(file("libraries/vr/library"), 
                                 file("$root/libraries/vr/library"))
         FileUtils.copyDirectory(file("libraries/vr/src"), 

build.xml

@@ -4,6 +4,8 @@
 
   <!-- path to the main processing repo --> 
   <property name="processing.dir" value="../processing" />
+
+  <!-- path to the android sdk -->
   <property name="sdk.dir" value="/Users/andres/code/android/android-studio/sdk" />
 
   <property name="core.jar.path" value="processing-core.zip" />
@@ -38,9 +40,7 @@
  	              ${processing.dir}/java/mode/JavaMode.jar; 
                   ${processing.dir}/java/mode/org.eclipse.core.runtime.jar;
                   ${processing.dir}/app/pde.jar;
-                  mode/gradle-tooling-api-4.0.jar;
-                  ${sdk.dir}/tools/lib/repository-25.3.2.jar;
-                  ${sdk.dir}/tools/lib/sdklib-25.3.2.jar"
+                  mode/gradle-tooling-api-4.0.jar"
 	   debug="on">
       <src path="src" />
     </javac>
@@ -65,6 +65,7 @@
         <include name="examples/**" />
         <include name="icons/**" />
         <include name="theme/**" />
+      	<include name="tools/**" />
         <include name="libraries/vr/library.properties" />        
         <include name="libraries/vr/examples/**" />
         <include name="libraries/vr/gvrsdk/**" />
@@ -85,13 +86,14 @@
 
   <target name="subprojects-clean">
     <subant buildpath="core" target="clean"/>
-    <subant buildpath="libraries/vr" target="clean"/>    
+    <subant buildpath="tools/SDKUpdater" target="clean"/>  	
+    <subant buildpath="libraries/vr" target="clean"/>
   </target>
 
   <target name="subprojects-build">
     <subant buildpath="core" target="build"/>
-    <subant buildpath="libraries/vr" target="build"/>    
+  	<subant buildpath="tools/SDKUpdater" target="build"/>
+    <subant buildpath="libraries/vr" target="build"/>  	
   </target>
-  
 
 </project>

settings.gradle

@@ -1 +1 @@
-include 'core', 'libraries:vr'
+include 'core', 'tools:SDKUpdater', 'libraries:vr'

src/processing/mode/android/AndroidEditor.java

@@ -390,10 +390,12 @@ public void actionPerformed(ActionEvent e) {
 */
 
 
-        AndroidSDK sdk = androidMode.getSDK();
-        if (sdk != null) {
-          new SDKUpdater(sdk.getSdkFolder());
-        }
+//        AndroidSDK sdk = androidMode.getSDK();
+//        if (sdk != null) {
+//          new SDKUpdater(sdk.getSdkFolder());
+//        }
+        
+        
       }
     });
     menu.add(item);

tools/SDKUpdater/.gitignore

@@ -0,0 +1,5 @@
+bin
+build
+.classpath
+.project
+tool/SDKUpdater.jar

tools/SDKUpdater/build.gradle

@@ -0,0 +1,56 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath group: 'commons-io', name: 'commons-io', version: '2.5'
+        classpath group: 'org.zeroturnaround', name: 'zt-zip', version: '1.9'
+    }
+}
+
+dependencies {
+    compile group: 'org.processing', name: 'pde', version: '3.3.4'
+    compile name: "sdklib-25.3.2"
+    compile name: "repository-25.3.2"
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs = ['src/']
+        }
+        resources {
+            srcDirs = ['src/']
+        }        
+    }
+}
+
+jar {    
+    manifest {
+        attributes(
+                "Manifest-Version": "1.0",
+                "Gradle-Version": "$gradle.gradleVersion"
+        )
+    }
+}
+
+clean.doFirst {
+    delete "tool/SDKUpdater.jar"
+}
+
+import groovy.util.AntBuilder
+import java.nio.file.Files
+import static java.nio.file.StandardCopyOption.*;
+
+task dist {
+    doLast {
+        // copy jar file to tool folder
+        File toolJar = file("tool/SDKUpdater.jar");
+        //create intermediate folder if they don't exist
+        toolJar.mkdirs();
+        Files.copy(file("$buildDir/libs/SDKUpdater.jar").toPath(),
+                   toolJar.toPath(), REPLACE_EXISTING);                   
+    }
+}
+
+dist.dependsOn build

tools/SDKUpdater/build.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<project name="SDK Updater Tool" default="build">
+  
+  <!-- path to the main processing repo --> 
+  <property name="processing.dir" value="../../../processing" />
+	
+  <!-- path to the android sdk -->
+  <property name="sdk.dir" value="/Users/andres/code/android/android-studio/sdk" />
+	
+  <target name="clean" description="Clean the build directories">
+    <delete dir="bin" />
+    <delete file="tool/SDKUpdater.jar" />
+  </target>
+
+  <target name="compile" description="Compile sources">   
+    <mkdir dir="bin" />
+    <javac target="1.8"
+	   source="1.8"
+	   srcdir="src" 
+	   destdir="bin" 
+	   encoding="UTF-8"
+	   includeAntRuntime="false"
+	   classpath="${processing.dir}/app/bin;
+    	          ${sdk.dir}/tools/lib/sdklib-25.3.2.jar;
+    	          ${sdk.dir}/tools/lib/repository-25.3.2.jar" 
+	   nowarn="true"
+	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
+      <compilerclasspath path="${processing.dir}/java/mode/org.eclipse.jdt.core.jar; 
+      	                       ${processing.dir}/java/mode/jdtCompilerAdapter.jar" />
+    </javac>
+  </target>
+
+  <target name="build" depends="compile" description="Build SDK Updater Tool">
+    <mkdir dir="tool" />
+    <jar basedir="bin" destfile="tool/SDKUpdater.jar" />
+  </target>
+</project>

src/processing/mode/android/SDKUpdater.java renamed to tools/SDKUpdater/src/processing/mode/android/tools/SDKUpdater.java

@@ -19,7 +19,7 @@
  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-package processing.mode.android;
+package processing.mode.android.tools;
 
 import com.android.repository.api.*;
 import com.android.repository.impl.meta.RepositoryPackages;
@@ -31,6 +31,10 @@
 import com.android.sdklib.repository.legacy.LegacyDownloader;
 import com.android.sdklib.tool.SdkManagerCli;
 
+import processing.app.Base;
+import processing.app.Preferences;
+import processing.app.tools.Tool;
+
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
 import javax.swing.table.DefaultTableModel;
@@ -52,7 +56,7 @@
 import java.util.concurrent.ExecutionException;
 
 @SuppressWarnings("serial")
-public class SDKUpdater extends JFrame implements PropertyChangeListener {
+public class SDKUpdater extends JFrame implements PropertyChangeListener, Tool {
   final static private int DEF_NUM_ROWS = 10; 
   final static private int DEF_COL_WIDTH = 200;
   private final Vector<String> columns = new Vector<>(Arrays.asList(
@@ -77,6 +81,7 @@ public class SDKUpdater extends JFrame implements PropertyChangeListener {
 
   public ClassLoader loader;
 
+  /*
   public SDKUpdater(File path) {
     super("SDK Updater");
     
@@ -103,53 +108,34 @@ public SDKUpdater(File path) {
     queryTask.execute();
     createLayout();
   }
-  
-  /*
-  public SDKUpdater(Editor editor, AndroidMode androidMode, ClassLoader loader) {
-    super("SDK Updater");
-
-    this.loader = loader;
-    
-    androidMode.checkSDK(editor);
-    try {
-      sdk = AndroidSDK.load();
-      if (sdk == null) {
-        sdk = AndroidSDK.locate(editor, androidMode);
-      }
-    } catch (IOException e) {
-      e.printStackTrace();
-    } catch (AndroidSDK.CancelException e) {
-      e.printStackTrace();
-    } catch (AndroidSDK.BadSDKException e) {
-      e.printStackTrace();
-    }
-
-    if (sdk == null) return;
+  */
 
-//    queryTask = new QueryTask();
-//    queryTask.addPropertyChangeListener(this);
-//    queryTask.execute();
-//    createLayout();
+  
+  @Override
+  public void init(Base base) {
+    // TODO Auto-generated method stub
+    String path = Preferences.get("android.sdk.path");
+    sdkFolder = new File(path);
 
 
-    System.out.println("Android mode CLASS loader "  + SDKUpdater.class.getClassLoader());
-    System.out.println("Android mode class loader "  + loader);    
+    queryTask = new QueryTask();
+    queryTask.addPropertyChangeListener(this);
+    queryTask.execute();
+    createLayout(base.getActiveEditor() == null);    
 
-    Object  progress;
-    Class<?> clazz;
-    Constructor con;
-    try {
-      clazz = loader.loadClass("com.android.repository.api.ConsoleProgressIndicator");
-      con = clazz.getConstructor();
-      progress = con.newInstance();
-      System.out.println("Success creating progress instance " + progress);
-    } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-      // TODO Auto-generated catch block
-      e.printStackTrace();
-    } 
   }
-  */
 
+  @Override
+  public void run() {
+    setVisible(true);    
+  }
+
+  @Override
+  public String getMenuTitle() {   
+    return "SDK Updater";
+  }
+  
+  
   @Override
   public void propertyChange(PropertyChangeEvent evt) {
     switch (evt.getPropertyName()) {
@@ -388,7 +374,7 @@ public java.util.List<String> getPaths(RepoManager mgr) {
     }
   }
 
-  private void createLayout() {
+  private void createLayout(final boolean standalone) {
     Container outer = getContentPane();
     outer.removeAll();
 
@@ -522,6 +508,17 @@ public void windowClosing(WindowEvent e) {
       }
     });
 
+    
+//    registerWindowCloseKeys(getRootPane(), new ActionListener() {
+//      public void actionPerformed(ActionEvent actionEvent) {
+//        if (standalone) {
+//          System.exit(0);
+//        } else {
+//          setVisible(false);
+//        }
+//      }
+//    });    
+    
     setLocationRelativeTo(null);
     setResizable(false);
     setVisible(true);