testing class loaders

Author: codeanticode

src/processing/mode/android/AndroidEditor.java

@@ -23,11 +23,14 @@
 package processing.mode.android;
 
 import processing.app.Base;
+import processing.app.Messages;
 import processing.app.Mode;
 import processing.app.Platform;
 import processing.app.Preferences;
 import processing.app.Settings;
 import processing.app.SketchException;
+import processing.app.Util;
+import processing.app.ui.Editor;
 import processing.app.ui.EditorException;
 import processing.app.ui.EditorState;
 import processing.app.ui.EditorToolbar;
@@ -43,6 +46,11 @@
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
 import java.util.TimerTask;
 
 
@@ -342,6 +350,46 @@ public void actionPerformed(ActionEvent e) {
     item = new JMenuItem("Update SDK");
     item.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
+        
+        /*
+        AndroidSDK sdk = androidMode.getSDK();
+        File lib = new File(sdk.getToolsFolder(), "lib");
+        File[] archives = Util.listJarFiles(lib);
+        URL[] urlList = new URL[archives.length];
+        for (int k = 0; k < archives.length; k++) {
+          try {
+            urlList[k] = archives[k].toURI().toURL();
+            System.out.println(urlList[k]);
+          } catch (MalformedURLException ex) {}
+        }
+
+        
+        ClassLoader parent = androidMode.getClassLoader();        
+        System.out.println("Android mode CLASS loader "  + AndroidMode.class.getClassLoader());
+        System.out.println("Android mode class loader "  + parent);        
+        ClassLoader loader = new URLClassLoader(urlList, parent);
+        
+
+        try {
+          Class<?> updaterClass = loader.loadClass(SDKUpdater.class.getName());
+          Constructor con = updaterClass.getConstructor(Editor.class, AndroidMode.class, ClassLoader.class);
+          SDKUpdater updater = (SDKUpdater) con.newInstance(AndroidEditor.this, androidMode, loader);
+          
+        } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e1) {
+          // TODO Auto-generated catch block
+          e1.printStackTrace();
+        }
+        
+        try {
+          // This cast should be safe, since the only case when loader is not a
+          // URLClassLoader is when no archives were found in the first place.
+          ((URLClassLoader) loader).close();
+        } catch (IOException e2) {
+          e2.printStackTrace();
+        }         
+*/
+    
+        
         new SDKUpdater(AndroidEditor.this, androidMode);
       }
     });

src/processing/mode/android/AndroidSDK.java

@@ -24,6 +24,7 @@
 import processing.app.Messages;
 import processing.app.Platform;
 import processing.app.Preferences;
+import processing.app.Util;
 import processing.app.exec.ProcessHelper;
 import processing.app.exec.ProcessResult;
 import processing.core.PApplet;
@@ -179,10 +180,24 @@ public AndroidSDK(File folder) throws BadSDKException, IOException {
     String javaHomeProp = System.getProperty("java.home");
     File javaHome = new File(javaHomeProp).getCanonicalFile();
     Platform.setenv("JAVA_HOME", javaHome.getCanonicalPath());
-
-    path = new File(javaHome, "bin").getCanonicalPath() + File.pathSeparator + path;
+    
+    path = new File(javaHome, "bin").getCanonicalPath() + File.pathSeparator + path;    
     Platform.setenv("PATH", path);
 
+
+    
+//    Util.contentsToClassPath()
+//    path = new File(tools, "lib").getCanonicalPath() + File.pathSeparator + path;    
+
+    
+//    repository-
+//    sdklib-
+//    common- 
+//    commons-compress-
+//    httpcore-
+//    guava-
+    
+    
     checkDebugCertificate();
   }
 

src/processing/mode/android/SDKUpdater.java

@@ -44,6 +44,8 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -75,9 +77,13 @@ public class SDKUpdater extends JFrame implements PropertyChangeListener {
   private JButton actionButton;
   private JTable table;
 
+  public ClassLoader loader;
+  
   public SDKUpdater(Editor editor, AndroidMode androidMode) {
     super("SDK Updater");
 
+    this.loader = loader;
+    
     androidMode.checkSDK(editor);
     try {
       sdk = AndroidSDK.load();
@@ -99,6 +105,50 @@ public SDKUpdater(Editor editor, AndroidMode androidMode) {
     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();
+    
+    
+    System.out.println("Android mode CLASS loader "  + SDKUpdater.class.getClassLoader());
+    System.out.println("Android mode class loader "  + loader);    
+    
+    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 propertyChange(PropertyChangeEvent evt) {
@@ -137,7 +187,7 @@ protected Object doInBackground() throws Exception {
                with some changes
        */
       AndroidSdkHandler mHandler = AndroidSdkHandler.getInstance(AndroidSDK.load().getSdkFolder());
-
+      
       FileSystemFileOp fop = (FileSystemFileOp) FileOpUtils.create();
       RepoManager mRepoManager = mHandler.getSdkManager(progress);
       mRepoManager.loadSynchronously(0, progress, new LegacyDownloader(fop, new SettingsController() {