[FIX]AlwaysOnTop Dialog,Add Back Option

Author: DeerajTheepshi

mode/src/processing/mode/android/AndroidSDK.java

@@ -92,6 +92,8 @@ class AndroidSDK {
   private static final int INVALID_SDK  = 3;
   private static int loadError = NO_ERROR;
 
+  private static boolean backOptionSelected;
+
   public AndroidSDK(File folder) throws BadSDKException, IOException {
     this.folder = folder;
     if (!folder.exists()) {
@@ -403,11 +405,17 @@ public static AndroidSDK load(boolean checkEnvSDK, Frame editor) throws IOExcept
 
   static public AndroidSDK locate(final Frame window, final AndroidMode androidMode)
       throws BadSDKException, CancelException, IOException {
-    
+    backOptionSelected = false;
+
     if (loadError == SKIP_ENV_SDK) {
       // The user does not want to use the environment SDK, so let's simply
       // download a new one to the sketchbook folder.
-      return download(window, androidMode);
+      AndroidSDK sdk = download(window, androidMode);
+      if(sdk==null && backOptionSelected){
+        return locate(window,androidMode);
+      } else {
+        return sdk;
+      }
     }
 
     // At this point, there is no ANDROID_SDK env variable, no SDK in the preferences,
@@ -416,7 +424,11 @@ static public AndroidSDK locate(final Frame window, final AndroidMode androidMod
     int result = showLocateDialog(window);
 
     if (result == JOptionPane.YES_OPTION) {
-      return download(window, androidMode);
+      AndroidSDK sdk = download(window, androidMode);
+      if(sdk==null && backOptionSelected){
+        return locate(window,androidMode);
+      }
+      return sdk;
     } else if (result == JOptionPane.NO_OPTION) {
       // User will manually select folder containing SDK folder
       File folder = selectFolder(AndroidMode.getTextString("android_sdk.dialog.select_sdk_folder"), null, window);
@@ -449,8 +461,12 @@ static public AndroidSDK download(final Frame editor, final AndroidMode androidM
       throws BadSDKException, CancelException {
     final SDKDownloader downloader = new SDKDownloader(editor);    
     //downloader.run(); // This call blocks until the SDK download complete, or user cancels.
-    
-    if (downloader.cancelled()) {
+
+    if (downloader.isGoBack()){
+      backOptionSelected = true;
+      return null;
+    }
+    else if (downloader.cancelled()) {
       throw new CancelException(AndroidMode.getTextString("android_sdk.error.sdk_download_canceled"));  
     } 
     AndroidSDK sdk = downloader.getSDK();

mode/src/processing/mode/android/SDKDownloader.java

@@ -82,6 +82,7 @@ public class SDKDownloader extends JDialog implements PropertyChangeListener {
   private Frame editor;
   private AndroidSDK sdk;
   private boolean cancelled;
+  private boolean goBack;
 
   private int totalSize = 0;  
 
@@ -648,7 +649,7 @@ public SDKDownloader(Frame editor) {
     add(new JLabel("Querying...",SwingConstants.CENTER));
     setSize(150,100);
     setLocationRelativeTo(editor);
-    setAlwaysOnTop(true);
+    setAlwaysOnTop(false);
     setVisible(true);
   }
 
@@ -662,6 +663,8 @@ public void run(SDKUrlHolder downloadUrls, File sdkFolder) {
   public boolean cancelled() {
     return cancelled;
   }
+
+  public boolean isGoBack() {return goBack;}
 
   public AndroidSDK getSDK() {
     return sdk;
@@ -680,19 +683,20 @@ private void addPackage(GridBagConstraints gc, int gridy, JPanel packagesPanel,
   }
 
   private void createInitLayout(SDKUrlHolder downloadUrls) {
+    goBack = false;
     Container outer = getContentPane();
     outer.removeAll();
     final SDKUrlHolder urlHolder = downloadUrls;
 
     outer.setLayout(new BorderLayout());
 
     JPanel mainPanel = new JPanel();
-    mainPanel.setPreferredSize(Toolkit.zoom(250,225));
+    mainPanel.setPreferredSize(Toolkit.zoom(300,225));
     outer.add(mainPanel,BorderLayout.EAST);
 
-    //List Packages to be downloaded here:
+    //List Packages to be downloaded here------------------------------------------
     JPanel packagesPanel = new JPanel();
-    packagesPanel.setPreferredSize(Toolkit.zoom(250,125));
+    packagesPanel.setPreferredSize(Toolkit.zoom(300,125));
     packagesPanel.setAlignmentX(RIGHT_ALIGNMENT);
     Border border = BorderFactory.createLineBorder(Color.black,1,true);
     packagesPanel.setBorder(BorderFactory.createTitledBorder(border,"Packages to download: "));
@@ -711,7 +715,7 @@ private void createInitLayout(SDKUrlHolder downloadUrls) {
     //faddPackage(gc,4,packagesPanel,"Android Emulator: ",downloadUrls.emulatorVersion);
     if(Platform.getName()!="linux") addPackage(gc,5,packagesPanel,"Android Build Tools: ",downloadUrls.haxmVersion);
 
-    //SDK_Path selection Panel
+    //SDK_Path selection Panel---------------------------------------
     JPanel downloadPathPanel = new JPanel();
     downloadPathPanel.setLayout(new BorderLayout());
     JLabel pathLabel = new JLabel("Installation Path: ");
@@ -744,9 +748,21 @@ public void actionPerformed(ActionEvent e) {
     downloadPathPanel.add(selectPathButton,BorderLayout.EAST);
     mainPanel.add(downloadPathPanel);
 
-    //Buttons Panel on the bottom
+    //Buttons Panel on the bottom-------------------------------------------
     JPanel buttons = new JPanel();
     buttons.setAlignmentX(LEFT_ALIGNMENT);
+
+    JButton backButton = new JButton("Back");
+    backButton.setPreferredSize(dim);
+    backButton.addActionListener(new ActionListener() {
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        dispose();
+        goBack = true;
+      }
+    });
+    buttons.add(backButton);
+
     JButton continueButton = new JButton("Continue");
     continueButton.setPreferredSize(dim);
     continueButton.addActionListener(new ActionListener() {
@@ -766,11 +782,12 @@ public void actionPerformed(ActionEvent e) {
       @Override
       public void actionPerformed(ActionEvent e) {
         dispose();
+        cancelled = true;
       }
     });
     mainPanel.add(buttons);
 
-    //The side panel with image Icon
+    //The side panel with image Icon-------------------------------------------
     JPanel sidePanel = new JPanel(new BorderLayout());
     sidePanel.setPreferredSize(Toolkit.zoom(100,0));
     sidePanel.setBackground(Color.white);