some more tweaks in the SDK download/install

Author: codeanticode

src/processing/mode/android/AndroidMode.java

@@ -137,6 +137,11 @@ public void resetUserSelection() {
   }
 
 
+  public void userCancelledSDKSearch() {
+    userCancelledSDKSearch = true;
+  }
+  
+  
   public void checkSDK(Editor editor) {    
     if (checkingSDK) {
       // Some other thread has invoked SDK checking, so wait until the first one

src/processing/mode/android/AndroidSDK.java

@@ -5,6 +5,7 @@
 import processing.app.exec.ProcessHelper;
 import processing.app.exec.ProcessResult;
 import processing.core.PApplet;
+import processing.mode.android.AndroidSDK.CancelException;
 
 import javax.swing.*;
 import java.awt.*;
@@ -235,23 +236,28 @@ static public AndroidSDK locate(final Frame window, final AndroidMode androidMod
       if (folder == null) {
         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;
-        }
+        final AndroidSDK androidSDK = new AndroidSDK(folder);
+        Preferences.set("android.sdk.path", folder.getAbsolutePath());
+        return androidSDK;
       }
     } else {
       throw new CancelException("User canceled attempt to find SDK"); 
     }
   }
 
-  static public AndroidSDK download(final Frame editor, final AndroidMode androidMode) throws BadSDKException {
+  static public AndroidSDK download(final Frame editor, final AndroidMode androidMode) 
+      throws BadSDKException, CancelException {
     final SDKDownloader downloader = new SDKDownloader(editor, androidMode);    
     downloader.run(); // This call blocks until the SDK download complete, or user cancels.
-    return downloader.getSDK();
+    
+    if (downloader.cancelled()) {
+      throw new CancelException("User canceled SDK download");  
+    } 
+    AndroidSDK sdk = downloader.getSDK();
+    if (sdk == null) {
+      throw new BadSDKException("SDK could not be downloaded");
+    }
+    return sdk;
   }
 
   static public int showLocateDialog(Frame editor) {

src/processing/mode/android/SDKDownloader.java

@@ -10,6 +10,7 @@
 import processing.app.Preferences;
 import processing.app.ui.Toolkit;
 import processing.core.PApplet;
+import processing.mode.android.AndroidSDK.CancelException;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
@@ -50,6 +51,7 @@ public class SDKDownloader extends JDialog implements PropertyChangeListener {
   private Frame editor;
   private AndroidMode mode;
   private AndroidSDK sdk;
+  private boolean cancelled;
 
   private int totalSize = 0;
   private static ZipFile zip;
@@ -274,21 +276,26 @@ public static String humanReadableByteCount(long bytes, boolean si) {
   }
 
   public SDKDownloader(Frame editor, AndroidMode mode) {
-    super(editor, "Android SDK downloading...", true);
+    super(editor, "", true);
     this.editor = editor;
     this.mode = mode;
-    this.sdk = null;
+    this.sdk = null;    
     createLayout();
   }
 
   public void run() {
+    cancelled = false;
     downloadTask = new SDKDownloadTask();
     downloadTask.addPropertyChangeListener(this);
     downloadTask.execute();
     setAlwaysOnTop(true);
     setVisible(true);
   }
 
+  public boolean cancelled() {
+    return cancelled;
+  }
+  
   public AndroidSDK getSDK() {
     return sdk;
   }
@@ -301,8 +308,7 @@ private void createLayout() {
     pain.setBorder(new EmptyBorder(13, 13, 13, 13));
     outer.add(pain);
 
-    String labelText =
-        "Downloading Android SDK...";
+    String labelText = "Downloading Android SDK...";
     JLabel textarea = new JLabel(labelText);
     textarea.setAlignmentX(LEFT_ALIGNMENT);
     pain.add(textarea);
@@ -342,8 +348,11 @@ private void createLayout() {
     cancelButton.setPreferredSize(dim);
     cancelButton.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
-        if (downloadTask != null) downloadTask.cancel(true);
+        if (downloadTask != null) {
+          downloadTask.cancel(true);
+        }
         setVisible(false);
+        cancelled = true;
       }
     });
     cancelButton.setEnabled(true);