Merge branch 'master' of https://github.com/processing/processing-android

Author: omerjerk

src/processing/mode/android/AVD.java

@@ -1,6 +1,7 @@
 package processing.mode.android;
 
 import processing.app.Base;
+import processing.app.Messages;
 import processing.app.exec.ProcessHelper;
 import processing.app.exec.ProcessResult;
 import processing.core.PApplet;
@@ -29,7 +30,7 @@ public class AVD {
     "This could mean that the Android tools need to be updated,<br>" +
     "or that the Processing AVD should be deleted (it will<br>" +
     "automatically re-created the next time you run Processing).<br>" +
-    "Open the Android SDK Manager (underneath the Android menu)<br>" + 
+    "Open the Android SDK Manager (underneath the Android menu)<br>" +
     "to check for any errors.";
 
   static private final String AVD_TARGET_PRIMARY =
@@ -53,7 +54,7 @@ public class AVD {
 
   private Map<String, String> preferredAbi = new HashMap<>(30);
   private static List<String> abiList = new ArrayList<>();
-  
+
   /** Default virtual device used by Processing. */
   static public final AVD defaultAVD =
     new AVD("Processing-0" + Base.getRevision(),
@@ -63,10 +64,10 @@ public class AVD {
   public AVD(final String name, final String target) {
     this.name = name;
     this.target = target;
-    
+
     initializeAbiList();
   }
-  
+
   private void initializeAbiList() {
 	  if (abiList.size() == 0) {
 		  //The order in this list determines the preference of one abi over the other
@@ -131,9 +132,9 @@ protected boolean exists(final AndroidSDK sdk) throws IOException {
   }
 
 
-  /** 
-   * Return true if a member of the renowned and prestigious 
-   * "The following Android Virtual Devices could not be loaded:" club. 
+  /**
+   * Return true if a member of the renowned and prestigious
+   * "The following Android Virtual Devices could not be loaded:" club.
    * (Prestigious may also not be the right word.)
    */
   protected boolean badness() {
@@ -147,12 +148,12 @@ protected boolean badness() {
 
 
   protected boolean create(final AndroidSDK sdk) throws IOException {
-	  
+
 	final String[] list_abi = {
 	  sdk.getAndroidToolPath(),
 	  "list", "targets"
 	};
-	
+
 	ProcessHelper p = new ProcessHelper(list_abi);
 	try {
 	  final ProcessResult abiListResult = p.execute();
@@ -163,11 +164,11 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
 		if (m != null) {
 		  api = m[1];
 		}
-			
+
 		m = PApplet.match(line, "Tag\\/ABIs\\s:\\sdefault\\/(\\S+)");
 		if (m != null) {
 		  abi = m[1];
-			
+
 		  if (api != null && abi != null) {
 			if (preferredAbi.get(api) == null) {
 			  preferredAbi.put(api, abi);
@@ -180,15 +181,15 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
 		}
 	  }
 	} catch (InterruptedException e) {}
-	
+
 	if (preferredAbi.get(AndroidBuild.sdkVersion) == null) {
 	  return false;
 	}
-	  
+
     final String[] params = {
       sdk.getAndroidToolPath(),
       "create", "avd",
-      "-n", name, 
+      "-n", name,
       "-t", target,
       "-c", DEFAULT_SDCARD_SIZE,
       "-s", DEFAULT_SKIN,
@@ -209,12 +210,12 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
       }
       if (createAvdResult.toString().contains("Target id is not valid")) {
         // They didn't install the Google APIs
-        Base.showWarningTiered("Android Error", AVD_TARGET_PRIMARY, AVD_TARGET_SECONDARY, null);
+        Messages.showWarningTiered("Android Error", AVD_TARGET_PRIMARY, AVD_TARGET_SECONDARY, null);
 //        throw new IOException("Missing required SDK components");
       } else {
         // Just generally not working
 //        Base.showWarning("Android Error", AVD_CREATE_ERROR, null);
-        Base.showWarningTiered("Android Error", AVD_CREATE_PRIMARY, AVD_CREATE_SECONDARY, null);
+        Messages.showWarningTiered("Android Error", AVD_CREATE_PRIMARY, AVD_CREATE_SECONDARY, null);
         System.out.println(createAvdResult);
 //        throw new IOException("Error creating the AVD");
       }
@@ -234,7 +235,7 @@ static public boolean ensureProperAVD(final AndroidSDK sdk) {
 //      if (badList.contains(defaultAVD)) {
       if (defaultAVD.badness()) {
 //        Base.showWarning("Android Error", AVD_CANNOT_LOAD, null);
-        Base.showWarningTiered("Android Error", AVD_LOAD_PRIMARY, AVD_LOAD_SECONDARY, null);
+        Messages.showWarningTiered("Android Error", AVD_LOAD_PRIMARY, AVD_LOAD_SECONDARY, null);
         return false;
       }
       if (defaultAVD.create(sdk)) {
@@ -243,8 +244,9 @@ static public boolean ensureProperAVD(final AndroidSDK sdk) {
       }
     } catch (final Exception e) {
 //      Base.showWarning("Android Error", AVD_CREATE_ERROR, e);
-      Base.showWarningTiered("Android Error", AVD_CREATE_PRIMARY,
-    		  String.format(AVD_CREATE_SECONDARY, AndroidBuild.sdkVersion), null);
+      Messages.showWarningTiered("Android Error", AVD_CREATE_PRIMARY,
+                                 String.format(AVD_CREATE_SECONDARY,
+                                               AndroidBuild.sdkVersion), null);
     }
     return false;
   }

src/processing/mode/android/AndroidBuild.java

@@ -28,6 +28,8 @@
 
 import processing.app.Base;
 import processing.app.Library;
+import processing.app.Messages;
+import processing.app.Platform;
 import processing.app.Preferences;
 import processing.app.Sketch;
 import processing.app.SketchException;
@@ -138,7 +140,7 @@ public File createProject() throws IOException, SketchException {
     // use the src folder, since 'bin' might be used by the ant build
     binFolder = srcFolder;
     if (processing.app.Base.DEBUG) {
-      Base.openFolder(tmpFolder);
+      Platform.openFolder(tmpFolder);
     }
 
     manifest = new Manifest(sketch);
@@ -253,21 +255,21 @@ protected File createExportFolder() throws IOException {
         }
         if (!pr.succeeded()) {
           System.err.println(pr.getStderr());
-          Base.showWarning("Failed to rename",
-                           "Could not rename the old “android” build folder.\n" +
-                           "Please delete, close, or rename the folder\n" +
-                           androidFolder.getAbsolutePath() + "\n" +
-                           "and try again." , null);
-          Base.openFolder(sketch.getFolder());
+          Messages.showWarning("Failed to rename",
+                               "Could not rename the old “android” build folder.\n" +
+                               "Please delete, close, or rename the folder\n" +
+                               androidFolder.getAbsolutePath() + "\n" +
+                               "and try again." , null);
+          Platform.openFolder(sketch.getFolder());
           return null;
         }
       }
     } else {
       boolean result = androidFolder.mkdirs();
       if (!result) {
-        Base.showWarning("Folders, folders, folders",
-                         "Could not create the necessary folders to build.\n" +
-                         "Perhaps you have some file permissions to sort out?", null);
+        Messages.showWarning("Folders, folders, folders",
+                             "Could not create the necessary folders to build.\n" +
+                             "Perhaps you have some file permissions to sort out?", null);
         return null;
       }
     }
@@ -748,7 +750,7 @@ private void writeProjectProps(final File file) {
   private void writeLocalProps(final File file) {
     final PrintWriter writer = PApplet.createWriter(file);
     final String sdkPath = sdk.getSdkFolder().getAbsolutePath();
-    if (Base.isWindows()) {
+    if (Platform.isWindows()) {
       // Windows needs backslashes escaped, or it will also accept forward
       // slashes in the build file. We're using the forward slashes since this
       // path gets concatenated with a lot of others that use forwards anyway.
@@ -770,7 +772,7 @@ private void writeRes(File resFolder,
     File layoutFolder = mkdirs(resFolder, "layout");
     File mainActivityLayoutFile = new File(layoutFolder, "main.xml");
     writeResLayoutMainActivity(mainActivityLayoutFile);
-    
+
 //    File mainFragmentLayoutFile = new File(layoutFolder, "fragment_main.xml");
 //    writeResLayoutMainFragment(mainFragmentLayoutFile);
 
@@ -860,8 +862,8 @@ private File mkdirs(final File parent, final String name) throws SketchException
     }
     return result;
   }
-  
-  
+
+
   private void writeMainActivity(final File srcDirectory) {
     File mainActivityFile = new File(new File(srcDirectory, manifest.getPackageName().replace(".", "/")),
         "MainActivity.java");
@@ -923,7 +925,7 @@ private void writeResLayoutMainActivity(final File file) {
     writer.flush();
     writer.close();
   }
-  
+
 /*
   private void writeResLayoutMainFragment(final File file) {
     final PrintWriter writer = PApplet.createWriter(file);
@@ -955,7 +957,7 @@ private void copySupportV4(File libsFolder) throws SketchException {
     File sdkLocation = sdk.getSdkFolder();
     File supportV4Jar = new File(sdkLocation, "extras/android/support/v4/android-support-v4.jar");
     if (!supportV4Jar.exists()) {
-      SketchException sketchException = 
+      SketchException sketchException =
           new SketchException("Please install support repository from SDK manager");
       throw sketchException;
     } else {

src/processing/mode/android/AndroidEditor.java

@@ -22,9 +22,12 @@
 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.SketchException;
+import processing.app.ui.EditorException;
 import processing.app.ui.EditorState;
 import processing.app.ui.EditorToolbar;
 import processing.app.ui.Toolkit;
@@ -34,6 +37,7 @@
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
@@ -129,7 +133,7 @@ public void actionPerformed(ActionEvent e) {
 
 
   protected AndroidEditor(Base base, String path,
-                          EditorState state, Mode mode) throws Exception {
+                          EditorState state, Mode mode) throws EditorException {
     super(base, path, state, mode);
     androidMode = (AndroidMode) mode;
     androidMode.checkSDK(this);
@@ -247,7 +251,7 @@ public void run() {
     }.start();
 
     menu.add(sdkMenu);
-    
+
     menu.addSeparator();
 
     item = new JMenuItem("Android SDK Manager");
@@ -361,16 +365,16 @@ public JMenu buildHelpMenu() {
     item = new JMenuItem("Processing for Android Wiki");
     item.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
-        Base.openURL("http://wiki.processing.org/w/Android");
+        Platform.openURL("http://wiki.processing.org/w/Android");
       }
     });
     menu.add(item);
 
 
-    item = new JMenuItem("Android Developers Site");
+    item = new JMenuItem("Android Developer Site");
     item.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
-        Base.openURL("http://developer.android.com/index.html");
+        Platform.openURL("http://developer.android.com/");
       }
     });
     menu.add(item);
@@ -381,9 +385,9 @@ public void actionPerformed(ActionEvent e) {
 
   /** override the standard grab reference to just show the java reference */
   public void showReference(String filename) {
-    File javaReferenceFolder = Base.getContentFile("modes/java/reference");
+    File javaReferenceFolder = Platform.getContentFile("modes/java/reference");
     File file = new File(javaReferenceFolder, filename);
-    Base.openURL(file.toURI().toString());
+    Platform.openURL(file.toURI().toString());
   }
 
 
@@ -497,7 +501,7 @@ public void run() {
    * Build the sketch and run it on a device with the debugger connected.
    */
   public void handleRunDevice() {
-    if(Base.isWindows() && !Preferences.getBoolean("usbDriverWarningShown")) {
+    if (Platform.isWindows() && !Preferences.getBoolean("usbDriverWarningShown")) {
       Preferences.setBoolean("usbDriverWarningShown", true);
 
       String message = "";
@@ -513,11 +517,8 @@ public void handleRunDevice() {
             "Please follow the guide at <a href='http://developer.android.com/tools/extras/oem-usb.html#InstallingDriver'>http://developer.android.com/tools/extras/oem-usb.html#InstallingDriver</a> to install the driver.<br>" +
             "You will also need to download the driver from <a href='http://developer.android.com/sdk/win-usb.html'>http://developer.android.com/sdk/win-usb.html</a>";
       }
+      Messages.showWarning("USB Driver warning", message);
 
-      Base.showWarning(
-          "USB Driver warning",
-          message
-      );
     } else {
       new Thread() {
         public void run() {
@@ -563,7 +564,7 @@ public void run() {
           try {
             File exportFolder = build.exportProject();
             if (exportFolder != null) {
-              Base.openFolder(exportFolder);
+              Platform.openFolder(exportFolder);
               statusNotice("Done with export.");
             }
           } catch (IOException e) {
@@ -611,7 +612,7 @@ public void run() {
           File projectFolder = build.exportPackage(keyStorePassword);
           if (projectFolder != null) {
             statusNotice("Done with export.");
-            Base.openFolder(projectFolder);
+            Platform.openFolder(projectFolder);
           } else {
             statusError("Error with export");
           }

src/processing/mode/android/AndroidKeyStore.java

@@ -1,17 +1,11 @@
 package processing.mode.android;
 
-import processing.app.Base;
+import processing.app.Messages;
 
 import java.io.File;
 
-/**
- * Created with IntelliJ IDEA.
- * User: imilka
- * Date: 27.05.14
- * Time: 14:38
- */
-public class AndroidKeyStore {
 
+public class AndroidKeyStore {
   public static final String ALIAS_STRING = "processing-keystore";
   public static final String KEYSTORE_FILE_NAME = "android-release-key.keystore";
 
@@ -28,9 +22,9 @@ public static File getKeyStoreLocation() {
       boolean result = keyStoreFolder.mkdirs();
 
       if (!result) {
-        Base.showWarning("Folders, folders, folders",
-            "Could not create the necessary folders to build.\n" +
-                "Perhaps you have some file permissions to sort out?", null);
+        Messages.showWarning("Folders, folders, folders",
+                             "Could not create the necessary folders to build.\n" +
+                             "Perhaps you have some file permissions to sort out?");
         return null;
       }
     }