update for API changes in Base

Author: benfry

src/processing/mode/android/AndroidBuild.java

@@ -28,6 +28,7 @@
 
 import processing.app.Base;
 import processing.app.Library;
+import processing.app.Platform;
 import processing.app.Preferences;
 import processing.app.Sketch;
 import processing.app.SketchException;
@@ -138,7 +139,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);
@@ -258,7 +259,7 @@ protected File createExportFolder() throws IOException {
                            "Please delete, close, or rename the folder\n" +
                            androidFolder.getAbsolutePath() + "\n" +
                            "and try again." , null);
-          Base.openFolder(sketch.getFolder());
+          Platform.openFolder(sketch.getFolder());
           return null;
         }
       }
@@ -748,7 +749,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 +771,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 +861,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 +924,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 +956,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

@@ -23,6 +23,7 @@
 
 import processing.app.Base;
 import processing.app.Mode;
+import processing.app.Platform;
 import processing.app.Preferences;
 import processing.app.SketchException;
 import processing.app.ui.EditorException;
@@ -35,6 +36,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;
@@ -248,7 +250,7 @@ public void run() {
     }.start();
 
     menu.add(sdkMenu);
-    
+
     menu.addSeparator();
 
     item = new JMenuItem("Android SDK Manager");
@@ -362,16 +364,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);
@@ -382,9 +384,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());
   }
 
 
@@ -498,7 +500,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 = "";
@@ -564,7 +566,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) {
@@ -612,7 +614,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/AndroidMode.java

@@ -23,6 +23,7 @@
 
 import processing.app.Base;
 import processing.app.Library;
+import processing.app.Platform;
 import processing.app.RunnerListener;
 import processing.app.Sketch;
 import processing.app.SketchException;
@@ -63,7 +64,7 @@ public String getTitle() {
 
   public File[] getKeywordFiles() {
     return new File[] {
-      Base.getContentFile("modes/java/keywords.txt")
+      Platform.getContentFile("modes/java/keywords.txt")
     };
   }
 

src/processing/mode/android/AndroidSDK.java

@@ -1,6 +1,5 @@
 package processing.mode.android;
 
-import processing.app.Base;
 import processing.app.Platform;
 import processing.app.Preferences;
 import processing.app.exec.ProcessHelper;
@@ -19,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 
+
 class AndroidSDK {
   private final File folder;
   private final File tools;
@@ -74,21 +74,18 @@ public AndroidSDK(File folder) throws BadSDKException, IOException {
 
     androidTool = findAndroidTool(tools);
 
-    final Platform p = Base.getPlatform();
-
-    String path = p.getenv("PATH");
+    String path = Platform.getenv("PATH");
 
-    p.setenv("ANDROID_SDK", folder.getCanonicalPath());
+    Platform.setenv("ANDROID_SDK", folder.getCanonicalPath());
     path = platformTools.getCanonicalPath() + File.pathSeparator +
       tools.getCanonicalPath() + File.pathSeparator + path;
 
     String javaHomeProp = System.getProperty("java.home");
     File javaHome = new File(javaHomeProp).getCanonicalFile();
-    p.setenv("JAVA_HOME", javaHome.getCanonicalPath());
+    Platform.setenv("JAVA_HOME", javaHome.getCanonicalPath());
 
     path = new File(javaHome, "bin").getCanonicalPath() + File.pathSeparator + path;
-
-    p.setenv("PATH", path);
+    Platform.setenv("PATH", path);
 
     checkDebugCertificate();
   }
@@ -210,10 +207,8 @@ private static File findAndroidTool(final File tools) throws BadSDKException {
    * @throws IOException
    */
   public static AndroidSDK load() throws BadSDKException, IOException {
-    final Platform platform = Base.getPlatform();
-
     // The environment variable is king. The preferences.txt entry is a page.
-    final String sdkEnvPath = platform.getenv("ANDROID_SDK");
+    final String sdkEnvPath = Platform.getenv("ANDROID_SDK");
     if (sdkEnvPath != null) {
       try {
         final AndroidSDK androidSDK = new AndroidSDK(new File(sdkEnvPath));
@@ -329,7 +324,7 @@ static public int showLocateDialog(Frame editor) {
   // this was banished from Base because it encourages bad practice.
   // TODO figure out a better way to handle the above.
   static public File selectFolder(String prompt, File folder, Frame frame) {
-    if (Base.isMacOS()) {
+    if (Platform.isMacOS()) {
       if (frame == null) frame = new Frame(); //.pack();
       FileDialog fd = new FileDialog(frame, prompt, FileDialog.LOAD);
       if (folder != null) {

src/processing/mode/android/Commander.java

@@ -29,6 +29,7 @@
 import java.util.Arrays;
 
 import processing.app.Base;
+import processing.app.Platform;
 import processing.app.Preferences;
 import processing.app.RunnerListener;
 import processing.app.Sketch;
@@ -83,7 +84,7 @@ static public void main(String[] args) {
     // Do this early so that error messages go to the console
     Base.setCommandLine();
     // init the platform so that prefs and other native code is ready to go
-    Base.initPlatform();
+    Platform.init();
 
     // launch command line handler
     Commander commander = new Commander(args);
@@ -181,7 +182,7 @@ private void initValues() {
     checkOrQuit(sketchPath != null, "No sketch path specified.", true);
     checkOrQuit(!outputPath.equals(sketchPath), "The sketch path and output path cannot be identical.", false);
 
-    androidMode = (AndroidMode) ModeContribution.load(null, Base.getContentFile("modes/android"),
+    androidMode = (AndroidMode) ModeContribution.load(null, Platform.getContentFile("modes/android"),
         "processing.mode.android.AndroidMode").getMode();
     androidMode.checkSDK(null);
   }

src/processing/mode/android/KeyStoreManager.java

@@ -1,6 +1,7 @@
 package processing.mode.android;
 
 import processing.app.Base;
+import processing.app.Platform;
 import processing.app.ui.Toolkit;
 
 import javax.swing.*;
@@ -124,7 +125,7 @@ public void actionPerformed(ActionEvent e) {
     resetKeystoreButton.setEnabled(true);
 
     // think different, biznatchios!
-    if (Base.isMacOS()) {
+    if (Platform.isMacOS()) {
       buttons.add(cancelButton);
 
       if (keyStore != null) buttons.add(resetKeystoreButton);
@@ -201,7 +202,7 @@ private void showKeystoreCredentialsLayout(Box pain) {
     textarea.setPreferredSize(new Dimension(400, 100));
     textarea.addMouseListener(new MouseAdapter() {
       public void mouseClicked(MouseEvent e) {
-        Base.openURL(GUIDE_URL);
+        Platform.openURL(GUIDE_URL);
       }
     });
     textarea.setAlignmentX(LEFT_ALIGNMENT);

src/processing/mode/android/Permissions.java

@@ -32,7 +32,7 @@
 import javax.swing.border.*;
 import javax.swing.event.*;
 
-import processing.app.Base;
+import processing.app.Platform;
 import processing.app.Sketch;
 import processing.app.ui.Toolkit;
 
@@ -180,7 +180,7 @@ public void keyTyped(KeyEvent e) {
     textarea.setPreferredSize(new Dimension(400, 100));
     textarea.addMouseListener(new MouseAdapter() {
       public void mouseClicked(MouseEvent e) {
-        Base.openURL(GUIDE_URL);
+        Platform.openURL(GUIDE_URL);
       }
     });
     //textarea.setHorizontalAlignment(SwingConstants.LEFT);
@@ -262,7 +262,7 @@ public void actionPerformed(ActionEvent e) {
     cancelButton.setEnabled(true);
 
     // think different, biznatchios!
-    if (Base.isMacOS()) {
+    if (Platform.isMacOS()) {
       buttons.add(cancelButton);
 //      buttons.add(Box.createHorizontalStrut(8));
       buttons.add(okButton);

src/processing/mode/android/SDKDownloader.java

@@ -7,6 +7,7 @@
 import org.xml.sax.SAXException;
 
 import processing.app.Base;
+import processing.app.Platform;
 import processing.app.Preferences;
 import processing.app.ui.Toolkit;
 
@@ -61,7 +62,6 @@ class SDKDownloadTask extends SwingWorker<Object, Object> {
 
     @Override
     protected Object doInBackground() throws Exception {
-      String hostOs = getOsString();
       File modeFolder = new File(Base.getSketchbookModesFolder() + "/AndroidMode");
 
       // creating sdk folders
@@ -79,7 +79,7 @@ protected Object doInBackground() throws Exception {
       if (!tempFolder.exists()) tempFolder.mkdir();
 
       try {
-        SDKUrlHolder downloadUrls = getDownloadUrls(URL_REPOSITORY, hostOs);
+        SDKUrlHolder downloadUrls = getDownloadUrls(URL_REPOSITORY, Platform.getName());
         firePropertyChange(PROPERTY_CHANGE_EVENT_TOTAL, 0, downloadUrls.totalSize);
         totalSize = downloadUrls.totalSize;
 
@@ -100,19 +100,19 @@ protected Object doInBackground() throws Exception {
         downloadAndUnpack(downloadUrls.platformUrl, downloadedPlatform, platformsFolder);
 
         // usb driver
-        if (Base.isWindows()) {
+        if (Platform.isWindows()) {
           File usbDriverFolder = new File(extrasFolder, "google");
           File downloadedFolder = new File(tempFolder, "latest_usb_driver_windows.zip");
           downloadAndUnpack(URL_USB_DRIVER, downloadedFolder, usbDriverFolder);
         }
 
-        if (Base.isLinux() || Base.isMacOS()) {
+        if (Platform.isLinux() || Platform.isMacOS()) {
           Runtime.getRuntime().exec("chmod -R 755 " + sdkFolder.getAbsolutePath());
         }
 
         tempFolder.delete();
 
-        Base.getPlatform().setenv("ANDROID_SDK", sdkFolder.getAbsolutePath());
+        Platform.setenv("ANDROID_SDK", sdkFolder.getAbsolutePath());
         Preferences.set("android.sdk.path", sdkFolder.getAbsolutePath());
         androidMode.loadSDK();
       } catch (ParserConfigurationException e) {
@@ -157,6 +157,7 @@ private void downloadAndUnpack(String urlString, File saveTo,
       extractFolder(saveTo, unpackTo);
     }
 
+    /*
     private String getOsString() {
       if (Base.isWindows()) {
         return "windows";
@@ -166,6 +167,7 @@ private String getOsString() {
         return "macosx";
       }
     }
+    */
 
     private SDKUrlHolder getDownloadUrls(String repositoryUrl, String requiredHostOs) throws ParserConfigurationException, IOException, SAXException {
       SDKUrlHolder urlHolder = new SDKUrlHolder();