fixed SDk search and install logic

Author: codeanticode

src/processing/mode/android/AndroidEditor.java

@@ -55,6 +55,7 @@ protected AndroidEditor(Base base, String path, EditorState state,
                           Mode mode) throws EditorException {
     super(base, path, state, mode);
     androidMode = (AndroidMode) mode;
+    androidMode.resetUserSelection();
     androidMode.checkSDK(this);
   }  
 

src/processing/mode/android/AndroidMode.java

@@ -31,6 +31,7 @@
 import processing.app.ui.Editor;
 import processing.app.ui.EditorException;
 import processing.app.ui.EditorState;
+import processing.mode.android.AndroidSDK.CancelException;
 import processing.mode.java.JavaMode;
 
 import java.io.File;
@@ -43,7 +44,9 @@ public class AndroidMode extends JavaMode {
   private AndroidSDK sdk;
   private File coreZipLocation;
   private AndroidRunner runner;
-
+  
+  private boolean checkingSDK = false;
+  private boolean userCancelledSDKSearch = false;
 
   public AndroidMode(Base base, File folder) {
     super(base, folder);
@@ -128,27 +131,46 @@ public void loadSDK() {
     }
   }
 
-  public void checkSDK(Editor editor) {
-    if (sdk == null) {
+  
+  public void resetUserSelection() {
+    userCancelledSDKSearch = false;
+  }
+  
+  
+  public void checkSDK(Editor editor) {    
+    if (checkingSDK) {
+      // Some other thread has invoked SDK checking, so wait until the first one
+      // is done (it might involve downloading the SDK, etc).
+      while (checkingSDK) {
+        try {
+          Thread.sleep(10);
+        } catch (InterruptedException e) { 
+          return;
+        }      
+      }
+    }
+    if (userCancelledSDKSearch) return;
+    checkingSDK = true;
+    Throwable tr = null;
+    if (sdk == null) {      
       try {
         sdk = AndroidSDK.load();
-        // FIXME REVERT THIS STATEMENT AFTER TESTING (should be ==)
-        if (sdk == null && editor != null) {
+        if (sdk == null) {
           sdk = AndroidSDK.locate(editor, this);
         }
-      } catch (BadSDKException e) {
-        e.printStackTrace();
-      } catch (IOException e) {
-        e.printStackTrace();
+      } catch (CancelException cancel) {
+        userCancelledSDKSearch = true;
+        tr = cancel;
+      } catch (Exception other) {
+        tr = other;
       }
     }
     if (sdk == null) {
-      if (!AndroidSDK.isDownloading()) {
-        Messages.showWarning("It's gonna be a bad day",
-                             "The Android SDK could not be loaded.\n" +
-                             "Use of Android Mode will be all but disabled.");
-      }
+      Messages.showWarning("Bad news...",
+                           "The Android SDK could not be loaded.\n" +
+                           "The Android Mode will be disabled.", tr);
     }
+    checkingSDK = false;
   }
 
 

src/processing/mode/android/AndroidSDK.java

@@ -26,8 +26,6 @@ class AndroidSDK {
   private final File platformTools;
   private final File androidTool;
 
-  static private boolean downloading;
-
   private static final String ANDROID_SDK_PRIMARY =
     "Is the Android SDK installed?";
 
@@ -45,14 +43,6 @@ class AndroidSDK {
   private static final String SELECT_ANDROID_SDK_FOLDER =
     "Choose the location of the Android SDK";
 
-  private static final String NOT_ANDROID_SDK =
-    "The selected folder does not appear to contain an Android SDK,\n" +
-    "or the SDK needs to be updated to the latest version.";
-
-//  private static final String ANDROID_SDK_URL =
-//    "http://developer.android.com/sdk/";
-
-
   public AndroidSDK(File folder) throws BadSDKException, IOException {
     this.folder = folder;
     if (!folder.exists()) {
@@ -163,13 +153,6 @@ public File getSdkFolder() {
   }
 
 
-  /*
-  public File getToolsFolder() {
-    return tools;
-  }
-  */
-
-
   public File getPlatformToolsFolder() {
     return platformTools;
   }
@@ -242,51 +225,33 @@ public static AndroidSDK load() throws IOException {
 
 
   static public AndroidSDK locate(final Frame window, final AndroidMode androidMode)
-      throws BadSDKException, IOException {
+      throws BadSDKException, CancelException, IOException {
     final int result = showLocateDialog(window);
-    if (result == JOptionPane.CANCEL_OPTION) {
-      throw new BadSDKException("User canceled attempt to find SDK.");
-    }
     if (result == JOptionPane.YES_OPTION) {
-      // here we are going to download sdk automatically
-      //Base.openURL(ANDROID_SDK_URL);
-      //throw new BadSDKException("No SDK installed.");
-
-      return download(androidMode);
-    }
-    while (true) {
-      // TODO this is really a yucky way to do this stuff. fix it.
+      return download(window, androidMode);
+    } else if (result == JOptionPane.NO_OPTION) {
+      // user will manually select folder containing SDK folder
       File folder = selectFolder(SELECT_ANDROID_SDK_FOLDER, null, window);
       if (folder == null) {
-        throw new BadSDKException("User canceled attempt to find SDK.");
-      }
-      try {
-        final AndroidSDK androidSDK = new AndroidSDK(folder);
-        Preferences.set("android.sdk.path", folder.getAbsolutePath());
-        return androidSDK;
-
-      } catch (final BadSDKException nope) {
-        JOptionPane.showMessageDialog(window, NOT_ANDROID_SDK);
+        throw new CancelException("User canceled attempt to find SDK"); 
+      } else {
+        try {
+          final AndroidSDK androidSDK = new AndroidSDK(folder);
+          Preferences.set("android.sdk.path", folder.getAbsolutePath());
+          return androidSDK;
+        } catch (BadSDKException bad) {
+          throw bad;
+        }
       }
+    } else {
+      throw new CancelException("User canceled attempt to find SDK"); 
     }
   }
 
-  static boolean isDownloading() {
-    return downloading;
-  }
-
-  static public AndroidSDK download(final AndroidMode androidMode) throws BadSDKException {
-    // TODO This is never set back to false once true [fry 150813]
-    downloading = true;
-
-    EventQueue.invokeLater(new Runnable() {
-      @Override
-      public void run() {
-        SDKDownloader downloader = new SDKDownloader(androidMode);
-        downloader.startDownload();
-      }
-    });
-    return null;
+  static public AndroidSDK download(final Frame editor, final AndroidMode androidMode) throws BadSDKException {
+    final SDKDownloader downloader = new SDKDownloader(editor, androidMode);    
+    downloader.run(); // This call blocks until the SDK download complete, or user cancels.
+    return downloader.getSDK();
   }
 
   static public int showLocateDialog(Frame editor) {
@@ -311,6 +276,7 @@ static public int showLocateDialog(Frame editor) {
     pane.setInitialValue(options[0]);
 
     JDialog dialog = pane.createDialog(editor, null);
+    dialog.setModalityType(Dialog.ModalityType.APPLICATION_MODAL);  
     dialog.setVisible(true);
 
     Object result = pane.getValue();
@@ -334,6 +300,7 @@ static public File selectFolder(String prompt, File folder, Frame frame) {
         //fd.setFile(folder.getName());
       }
       System.setProperty("apple.awt.fileDialogForDirectories", "true");
+      fd.setModalityType(Dialog.ModalityType.APPLICATION_MODAL);  
       fd.setVisible(true);
       System.setProperty("apple.awt.fileDialogForDirectories", "false");
       if (fd.getFile() == null) {
@@ -432,4 +399,18 @@ public ArrayList<SDKTarget> getAvailableSdkTargets() throws IOException {
 
     return targets;
   }
+  
+  @SuppressWarnings("serial")
+  static public class BadSDKException extends Exception {
+    public BadSDKException(final String message) {
+      super(message);
+    }
+  }
+  
+  @SuppressWarnings("serial")
+  static public class CancelException extends Exception {
+    public CancelException(final String message) {
+      super(message);
+    }
+  }    
 }

src/processing/mode/android/SDKDownloader.java

@@ -6,7 +6,6 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
-import processing.app.Base;
 import processing.app.Platform;
 import processing.app.Preferences;
 import processing.app.ui.Toolkit;
@@ -32,22 +31,26 @@
 import java.util.zip.ZipFile;
 
 @SuppressWarnings("serial")
-public class SDKDownloader extends JFrame implements PropertyChangeListener {
+public class SDKDownloader extends JDialog implements PropertyChangeListener {
 
   private static final String URL_REPOSITORY = "https://dl-ssl.google.com/android/repository/repository-11.xml";
   private static final String URL_REPOSITORY_FOLDER = "http://dl-ssl.google.com/android/repository/";
   private static final String URL_USB_DRIVER = "https://dl-ssl.google.com//android/repository/latest_usb_driver_windows.zip";
 
   private static final String PLATFORM_API_LEVEL = "22";
 
-  public static final String PROPERTY_CHANGE_EVENT_TOTAL = "total";
+  private static final String PROPERTY_CHANGE_EVENT_TOTAL = "total";
   private static final String PROPERTY_CHANGE_EVENT_DOWNLOADED = "downloaded";
 
-  private AndroidMode androidMode;
-
-  JProgressBar progressBar;
-  JLabel downloadedTextArea;
+  private JProgressBar progressBar;
+  private JLabel downloadedTextArea;
 
+  private SDKDownloadTask downloadTask;
+  
+  private Frame editor;
+  private AndroidMode mode;
+  private AndroidSDK sdk;
+  
   private int totalSize = 0;
   private static ZipFile zip;
 
@@ -64,8 +67,14 @@ class SDKDownloadTask extends SwingWorker<Object, Object> {
 
     @Override
     protected Object doInBackground() throws Exception {
-      File modeFolder = new File(Base.getSketchbookModesFolder() + "/AndroidMode");
+      
+      
+//      File modeDirectory = new File(folder, getTypeName());
+//      
+//      File modeFolder = new File(Base.getSketchbookModesFolder() + "/AndroidMode");
 
+      File modeFolder = mode.getFolder();
+      
       // creating sdk folders
       File sdkFolder = new File(modeFolder, "sdk");
       if (!sdkFolder.exists()) sdkFolder.mkdir();
@@ -114,9 +123,10 @@ protected Object doInBackground() throws Exception {
 
         tempFolder.delete();
 
+        // Done, let's set the environment and load the new SDK!
         Platform.setenv("ANDROID_SDK", sdkFolder.getAbsolutePath());
-        Preferences.set("android.sdk.path", sdkFolder.getAbsolutePath());
-        androidMode.loadSDK();
+        Preferences.set("android.sdk.path", sdkFolder.getAbsolutePath());        
+        sdk = AndroidSDK.load();        
       } catch (ParserConfigurationException e) {
         // TODO Handle exceptions here somehow (ie show error message)
         // and handle at least mkdir() results (above)
@@ -133,6 +143,7 @@ protected Object doInBackground() throws Exception {
     protected void done() {
       super.done();
       setVisible(false);
+      dispose();
     }
 
     private void downloadAndUnpack(String urlString, File saveTo,
@@ -171,18 +182,6 @@ private void downloadAndUnpack(String urlString, File saveTo,
       extractFolder(saveTo, unpackTo, setExec);
     }
 
-    /*
-    private String getOsString() {
-      if (Base.isWindows()) {
-        return "windows";
-      } else if (Base.isLinux()) {
-        return "linux";
-      } else {
-        return "macosx";
-      }
-    }
-    */
-
     private SDKUrlHolder getDownloadUrls(String repositoryUrl, String requiredHostOs) throws ParserConfigurationException, IOException, SAXException {
       SDKUrlHolder urlHolder = new SDKUrlHolder();
 
@@ -274,20 +273,26 @@ public static String humanReadableByteCount(long bytes, boolean si) {
     return String.format("%.1f %sB", bytes / Math.pow(unit, exp), pre);
   }
 
-  public SDKDownloader(AndroidMode androidMode) {
-    super("Android SDK downloading...");
-
-    this.androidMode = androidMode;
-
+  public SDKDownloader(Frame editor, AndroidMode mode) {
+    super(editor, "Android SDK downloading...", true);
+    this.editor = editor;
+    this.mode = mode;
+    this.sdk = null;
     createLayout();
   }
-
-  public void startDownload() {
-    SDKDownloadTask downloadTask = new SDKDownloadTask();
+  
+  public void run() {
+    downloadTask = new SDKDownloadTask();
     downloadTask.addPropertyChangeListener(this);
     downloadTask.execute();
+    setAlwaysOnTop(true);
+    setVisible(true);
   }
-
+  
+  public AndroidSDK getSDK() {
+    return sdk;
+  }
+  
   private void createLayout() {
     Container outer = getContentPane();
     outer.removeAll();
@@ -337,6 +342,7 @@ private void createLayout() {
     cancelButton.setPreferredSize(dim);
     cancelButton.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
+        if (downloadTask != null) downloadTask.cancel(true);
         setVisible(false);
       }
     });
@@ -358,19 +364,9 @@ public void actionPerformed(ActionEvent actionEvent) {
 
     pack();
 
-    /*
-    Dimension screen = Toolkit.getScreenSize();
-    Dimension windowSize = getSize();
-    setLocation((screen.width - windowSize.width) / 2,
-        (screen.height - windowSize.height) / 2);
-     */
-    setLocationRelativeTo(null);
-
-    setVisible(true);
-    setAlwaysOnTop(true);
+    setLocationRelativeTo(editor);
   }
 
-
   static void extractFolder(File file, File newPath, boolean setExec) throws IOException {
     int BUFFER = 2048;
     zip = new ZipFile(file);