updated messages, added welcome message, removed debug printouts

Author: codeanticode

src/processing/mode/android/AVD.java

@@ -345,12 +345,12 @@ protected void getImages(final ArrayList<String> images, final AndroidSDK sdk,
       output.addTarget(new LineProcessor() {
         @Override
         public void processLine(String line) {
-          System.out.println("dummy output ---> " + line);
+//          System.out.println("dummy output ---> " + line);
           if (images != null && 
               line.contains(";" + imagePlatform) &&
               line.contains(";" + imageTag) &&
               line.contains(";" + imageAbi)) {
-            System.out.println("  added image!");
+//            System.out.println("  added image!");
             images.add(line);
           }
         }

src/processing/mode/android/AndroidSDK.java

@@ -133,15 +133,28 @@ class AndroidSDK {
 
   private static final String PROCESSING_FOR_ANDROID_URL = 
       "http://android.processing.org/";    
-    
+  
+  private static final String WHATS_NEW_URL =
+      "http://android.processing.org/whatsnew.html";
+  
   private static final String DRIVER_INSTALL_URL = 
       "https://developer.android.com/studio/run/oem-usb.html#InstallingDriver";    
 
   private static final String SDK_INSTALL_MESSAGE =
       "Processing just downloaded and installed the Android SDK succesfully. " + 
       "The Android mode is now ready to use!<br><br>" + 
-      "For more information (reference, examples, and tutorials) " + 
-      "visit the <a href=\"" + PROCESSING_FOR_ANDROID_URL + "\">Processing for Android website</a>";
+      "For documentation, examples, and tutorials, " + 
+      "visit the <a href=\"" + PROCESSING_FOR_ANDROID_URL + "\">Processing for Android website</a>, and " +
+      "if you updated from version 3 of the mode, check the <a href=\"" + WHATS_NEW_URL + "\">what's new page</a>."; 
+  
+  private static final String SDK_EXISTS_TITLE = "SDK configured!";
+  
+  private static final String SDK_EXISTS_MESSAGE =
+      "Processing will use the existing Android SDK. " + 
+      "The Android mode is now ready to use!<br><br>" + 
+      "For documentation, examples, and tutorials, " + 
+      "visit the <a href=\"" + PROCESSING_FOR_ANDROID_URL + "\">Processing for Android website</a>, and " +
+      "if you updated from version 3 of the mode, check the <a href=\"" + WHATS_NEW_URL + "\">what's new page</a>.";
 
   private static final String DRIVER_INSTALL_MESSAGE = "<br><br>" +
       "If you are planning to use Google Nexus devices, then you need the " + 
@@ -414,6 +427,13 @@ public static AndroidSDK load(boolean checkEnvSDK, Frame editor) throws IOExcept
         // gets knocked out later. For instance, by that pesky Eclipse,
         // which nukes all env variables when launching from the IDE.
         Preferences.set("android.sdk.path", sdkEnvPath);
+        
+        // If we are here, it means that there was no SDK path in the preferences
+        // and the user wants to use the SDK found in the environment. This
+        // means we just installed the mode for the first time, so we show a 
+        // welcome message with some useful info.
+        AndroidUtil.showMessage(SDK_EXISTS_TITLE, SDK_EXISTS_MESSAGE);
+        
         return androidSDK;
       } catch (final BadSDKException badEnv) { 
         Preferences.unset("android.sdk.path");        

src/processing/mode/android/SysImageDownloader.java

@@ -74,7 +74,7 @@ public class SysImageDownloader extends JDialog implements PropertyChangeListene
       "You chose to run x86 images in the emulator. This is great but you need " + 
       "to install the Intel Hardware Accelerated Execution Manager (Intel HAXM).<br><br>" + 
       "Processing will try to run the HAXM installer now, which may ask for your " + 
-      "administrator password or additional permissions. Good luck!";
+      "administrator password or additional permissions.";
 
   private static final String KVM_LINUX_GUIDE_URL =
       "https://developer.android.com/studio/run/emulator-acceleration.html#vm-linux";
@@ -83,7 +83,7 @@ public class SysImageDownloader extends JDialog implements PropertyChangeListene
       "You chose to run x86 images in the emulator. This is great but you need " + 
       "to configure VM acceleration on Linux using the KVM package.<br><br>" + 
       "Follow <a href=\"" + KVM_LINUX_GUIDE_URL + "\">these instructions</a> " + 
-      "to configure KVM. Good luck!";      
+      "to configure KVM.";      
 
   private static final String IA32LIBS_TITLE = "Additional setup may be required...";
   private static final String IA32LIBS_MESSAGE = 
@@ -386,7 +386,7 @@ public void hyperlinkUpdate(HyperlinkEvent e) {
     pane.setBackground(label.getBackground());
 
     String[] options = new String[] {
-            "Slow but safe", "I like speed!"
+            "Use x86 image", "Use ARM image"
     };
     int result = JOptionPane.showOptionDialog(null, pane, title,
             JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE,
@@ -417,10 +417,10 @@ public void run() {
       // In this case, we give the user the option to choose between ARM and x86
       final int result = showSysImageMessage();
       if (result == JOptionPane.YES_OPTION || result == JOptionPane.CLOSED_OPTION) {
-        abi = "arm";
-      } else {
         abi = "x86";
         installHAXM();
+      } else {
+        abi = "arm";        
       }
       Preferences.set("android.emulator.image.abi", abi);
     }