Refactored OS detection subroutine.

Moved from Base into a specific utility class OSUtils.
Removed unused platform constants.

Author: cmaglie

app/src/cc/arduino/packages/uploaders/SerialUploader.java

@@ -39,6 +39,7 @@
 import processing.app.SerialException;
 import processing.app.debug.RunnerException;
 import processing.app.debug.TargetPlatform;
+import processing.app.helpers.OSUtils;
 import processing.app.helpers.PreferencesMap;
 import processing.app.helpers.StringReplacer;
 import cc.arduino.packages.Uploader;
@@ -188,7 +189,7 @@ private String waitForUploadPort(String uploadPort, List<String> before) throws
       // come back, so use a longer time out before assuming that the
       // selected
       // port is the bootloader (not the sketch).
-      if (((!Base.isWindows() && elapsed >= 500) || elapsed >= 5000) && now.contains(uploadPort)) {
+      if (((!OSUtils.isWindows() && elapsed >= 500) || elapsed >= 5000) && now.contains(uploadPort)) {
         if (verbose)
           System.out.println("Uploading using selected port: " + uploadPort);
         return uploadPort;

app/src/processing/app/Base.java

@@ -42,12 +42,12 @@
 import processing.app.debug.TargetPlatform;
 import processing.app.debug.TargetPlatformException;
 import processing.app.helpers.FileUtils;
+import processing.app.helpers.OSUtils;
 import processing.app.helpers.PreferencesMap;
 import processing.app.helpers.filefilters.OnlyDirs;
 import processing.app.helpers.filefilters.OnlyFilesWithExtension;
 import processing.app.javax.swing.filechooser.FileNameExtensionFilter;
 import processing.app.legacy.PApplet;
-import processing.app.legacy.PConstants;
 import processing.app.packages.Library;
 import processing.app.packages.LibraryList;
 import processing.app.tools.MenuScroller;
@@ -68,19 +68,6 @@ public class Base {
   /** Set true if this a proper release rather than a numbered revision. */
   static public boolean RELEASE = false;
 
-  static Map<Integer, String> platformNames = new HashMap<Integer, String>();
-  static {
-    platformNames.put(PConstants.WINDOWS, "windows");
-    platformNames.put(PConstants.MACOSX, "macosx");
-    platformNames.put(PConstants.LINUX, "linux");
-  }
-
-  static HashMap<String, Integer> platformIndices = new HashMap<String, Integer>();
-  static {
-    platformIndices.put("windows", PConstants.WINDOWS);
-    platformIndices.put("macosx", PConstants.MACOSX);
-    platformIndices.put("linux", PConstants.LINUX);
-  }
   static Platform platform;
 
   private static DiscoveryManager discoveryManager = new DiscoveryManager();
@@ -263,11 +250,11 @@ static protected boolean isCommandLine() {
   static protected void initPlatform() {
     try {
       Class<?> platformClass = Class.forName("processing.app.Platform");
-      if (Base.isMacOS()) {
+      if (OSUtils.isMacOS()) {
         platformClass = Class.forName("processing.app.macosx.Platform");
-      } else if (Base.isWindows()) {
+      } else if (OSUtils.isWindows()) {
         platformClass = Class.forName("processing.app.windows.Platform");
-      } else if (Base.isLinux()) {
+      } else if (OSUtils.isLinux()) {
         platformClass = Class.forName("processing.app.linux.Platform");
       }
       platform = (Platform) platformClass.newInstance();
@@ -473,7 +460,7 @@ public Base(String[] args) throws Exception {
       // being passed in with 8.3 syntax, which makes the sketch loader code
       // unhappy, since the sketch folder naming doesn't match up correctly.
       // http://dev.processing.org/bugs/show_bug.cgi?id=1089
-      if (isWindows()) {
+      if (OSUtils.isWindows()) {
         try {
           file = file.getCanonicalFile();
         } catch (IOException e) {
@@ -1087,7 +1074,7 @@ public boolean handleClose(Editor editor) {
       // untitled sketch, just give up and let the user quit.
 //      if (Preferences.getBoolean("sketchbook.closing_last_window_quits") ||
 //          (editor.untitled && !editor.getSketch().isModified())) {
-      if (Base.isMacOS()) {
+      if (OSUtils.isMacOS()) {
         Object[] options = { "OK", "Cancel" };
         String prompt =
           _("<html> " +
@@ -1170,7 +1157,7 @@ public boolean handleQuit() {
       // Save out the current prefs state
       Preferences.save();
 
-      if (!Base.isMacOS()) {
+      if (!OSUtils.isMacOS()) {
         // If this was fired from the menu or an AppleEvent (the Finder),
         // then Mac OS X will send the terminate signal itself.
         System.exit(0);
@@ -1996,54 +1983,6 @@ static public String getPlatformName() {
   }
 
 
-  /**
-   * Map a platform constant to its name.
-   * @param which PConstants.WINDOWS, PConstants.MACOSX, PConstants.LINUX
-   * @return one of "windows", "macosx", or "linux"
-   */
-  static public String getPlatformName(int which) {
-    return platformNames.get(which);
-  }
-
-
-  static public int getPlatformIndex(String what) {
-    Integer entry = platformIndices.get(what);
-    return (entry == null) ? -1 : entry.intValue();
-  }
-
-
-  // These were changed to no longer rely on PApplet and PConstants because
-  // of conflicts that could happen with older versions of core.jar, where
-  // the MACOSX constant would instead read as the LINUX constant.
-
-
-  /**
-   * returns true if Processing is running on a Mac OS X machine.
-   */
-  static public boolean isMacOS() {
-    //return PApplet.platform == PConstants.MACOSX;
-    return System.getProperty("os.name").indexOf("Mac") != -1;
-  }
-
-
-  /**
-   * returns true if running on windows.
-   */
-  static public boolean isWindows() {
-    //return PApplet.platform == PConstants.WINDOWS;
-    return System.getProperty("os.name").indexOf("Windows") != -1;
-  }
-
-
-  /**
-   * true if running on linux.
-   */
-  static public boolean isLinux() {
-    //return PApplet.platform == PConstants.LINUX;
-    return System.getProperty("os.name").indexOf("Linux") != -1;
-  }
-
-
   // .................................................................
 
 
@@ -2176,7 +2115,7 @@ static public String getHardwarePath() {
   static public String getAvrBasePath() {
     String path = getHardwarePath() + File.separator + "tools" +
                   File.separator + "avr" + File.separator + "bin" + File.separator;
-    if (Base.isLinux() && !(new File(path)).exists()) {
+    if (OSUtils.isLinux() && !(new File(path)).exists()) {
       return "";  // use distribution provided avr tools if bundled tools missing
     }
     return path;
@@ -2411,7 +2350,7 @@ static public File selectFolder(String prompt, File folder, Frame frame) {
   static public void setIcon(Frame frame) {
     // don't use the low-res icon on Mac OS X; the window should
     // already have the right icon from the .app file.
-    if (Base.isMacOS()) return;
+    if (OSUtils.isMacOS()) return;
 
     Image image = Toolkit.getDefaultToolkit().createImage(PApplet.ICON_IMAGE);
     frame.setIconImage(image);
@@ -2464,9 +2403,9 @@ static public void showReference(String filename) {
   }
 
   static public void showGettingStarted() {
-    if (Base.isMacOS()) {
+    if (OSUtils.isMacOS()) {
       Base.showReference(_("Guide_MacOSX.html"));
-    } else if (Base.isWindows()) {
+    } else if (OSUtils.isWindows()) {
       Base.showReference(_("Guide_Windows.html"));
     } else {
       Base.openURL(_("http://www.arduino.cc/playground/Learning/Linux"));
@@ -2570,7 +2509,7 @@ static public void showError(String title, String message, Throwable e, int exit
   // incomplete
   static public int showYesNoCancelQuestion(Editor editor, String title,
                                             String primary, String secondary) {
-    if (!Base.isMacOS()) {
+    if (!OSUtils.isMacOS()) {
       int result =
         JOptionPane.showConfirmDialog(null, primary + "\n" + secondary, title,
                                       JOptionPane.YES_NO_CANCEL_OPTION,
@@ -2646,7 +2585,7 @@ static public int showYesNoCancelQuestion(Editor editor, String title,
 
   static public int showYesNoQuestion(Frame editor, String title,
                                             String primary, String secondary) {
-    if (!Base.isMacOS()) {
+    if (!OSUtils.isMacOS()) {
       return JOptionPane.showConfirmDialog(editor,
                                            "<html><body>" +
                                            "<b>" + primary + "</b>" +
@@ -2730,7 +2669,7 @@ static public File getContentFile(String name) {
     String path = System.getProperty("user.dir");
 
     // Get a path to somewhere inside the .app folder
-    if (Base.isMacOS()) {
+    if (OSUtils.isMacOS()) {
 //      <key>javaroot</key>
 //      <string>$JAVAROOT</string>
       String javaroot = System.getProperty("javaroot");

app/src/processing/app/Editor.java

@@ -28,6 +28,7 @@
 
 import processing.app.debug.*;
 import processing.app.forms.PasswordAuthorizationDialog;
+import processing.app.helpers.OSUtils;
 import processing.app.helpers.PreferencesMapException;
 import processing.app.legacy.PApplet;
 import processing.app.syntax.*;
@@ -591,7 +592,7 @@ public void actionPerformed(ActionEvent e) {
     fileMenu.add(item);
 
     // macosx already has its own preferences and quit menu
-    if (!Base.isMacOS()) {
+    if (!OSUtils.isMacOS()) {
       fileMenu.addSeparator();
 
       item = newJMenuItem(_("Preferences"), ',');
@@ -1110,7 +1111,7 @@ public void actionPerformed(ActionEvent e) {
     menu.add(item);
 
     // macosx already has its own about menu
-    if (!Base.isMacOS()) {
+    if (!OSUtils.isMacOS()) {
       menu.addSeparator();
       item = new JMenuItem(_("About Arduino"));
       item.addActionListener(new ActionListener() {
@@ -1135,7 +1136,7 @@ protected JMenu buildEditMenu() {
     undoItem.addActionListener(undoAction = new UndoAction());
     menu.add(undoItem);
 
-    if (!Base.isMacOS()) {
+    if (!OSUtils.isMacOS()) {
         redoItem = newJMenuItem(_("Redo"), 'Y');
     } else {
         redoItem = newJMenuItemShift(_("Redo"), 'Z');
@@ -2031,7 +2032,7 @@ protected boolean checkModified() {
 
     String prompt = I18n.format(_("Save changes to \"{0}\"?  "), sketch.getName());
 
-    if (!Base.isMacOS()) {
+    if (!OSUtils.isMacOS()) {
       int result =
         JOptionPane.showConfirmDialog(this, prompt, _("Close"),
                                       JOptionPane.YES_NO_CANCEL_OPTION,

app/src/processing/app/EditorConsole.java

@@ -40,6 +40,8 @@
 import javax.swing.text.SimpleAttributeSet;
 import javax.swing.text.StyleConstants;
 
+import processing.app.helpers.OSUtils;
+
 
 /**
  * Message console that sits below the editing area.
@@ -118,7 +120,7 @@ public EditorConsole(Editor _editor) {
 
     // to fix ugliness.. normally macosx java 1.3 puts an
     // ugly white border around this object, so turn it off.
-    if (Base.isMacOS()) {
+    if (OSUtils.isMacOS()) {
       setBorder(null);
     }
 

app/src/processing/app/EditorHeader.java

@@ -22,6 +22,7 @@
 */
 
 package processing.app;
+import processing.app.helpers.OSUtils;
 import processing.app.tools.MenuScroller;
 import static processing.app.I18n._;
 
@@ -381,15 +382,15 @@ public Dimension getPreferredSize() {
 
 
   public Dimension getMinimumSize() {
-    if (Base.isMacOS()) {
+    if (OSUtils.isMacOS()) {
       return new Dimension(300, Preferences.GRID_SIZE);
     }
     return new Dimension(300, Preferences.GRID_SIZE - 1);
   }
 
 
   public Dimension getMaximumSize() {
-    if (Base.isMacOS()) {
+    if (OSUtils.isMacOS()) {
       return new Dimension(3000, Preferences.GRID_SIZE);
     }
     return new Dimension(3000, Preferences.GRID_SIZE - 1);

app/src/processing/app/EditorLineStatus.java

@@ -22,6 +22,7 @@
 
 package processing.app;
 
+import processing.app.helpers.OSUtils;
 import processing.app.syntax.*;
 
 import java.awt.*;
@@ -61,7 +62,7 @@ public EditorLineStatus(JEditTextArea textarea) {
     foreground = Theme.getColor("linestatus.color");
     high = Theme.getInteger("linestatus.height");
 
-    if (Base.isMacOS()) {
+    if (OSUtils.isMacOS()) {
       resize = Base.getThemeImage("resize.gif", this);
     }
     //linestatus.bgcolor = #000000
@@ -118,7 +119,7 @@ public void paintComponent(Graphics g) {
 
     g.drawString(tmp, size.width - (int) bounds.getWidth() -20 , baseline);
 
-    if (Base.isMacOS()) {
+    if (OSUtils.isMacOS()) {
       g.drawImage(resize, size.width - 20, 0, this);
     }
   }

app/src/processing/app/EditorStatus.java

@@ -25,9 +25,13 @@
 
 import java.awt.*;
 import java.awt.event.*;
+
 import javax.swing.*;
 
+import processing.app.helpers.OSUtils;
+
 import java.awt.datatransfer.*;
+
 import static processing.app.I18n._;
 
 
@@ -331,7 +335,7 @@ public void actionPerformed(ActionEvent e) {
 
       // !@#(* aqua ui #($*(( that turtle-neck wearing #(** (#$@)(
       // os9 seems to work if bg of component is set, but x still a bastard
-      if (Base.isMacOS()) {
+      if (OSUtils.isMacOS()) {
         //yesButton.setBackground(bgcolor[EDIT]);
         //noButton.setBackground(bgcolor[EDIT]);
         cancelButton.setBackground(bgcolor[EDIT]);
@@ -444,7 +448,7 @@ public void keyTyped(KeyEvent event) {
 
       progressBar = new JProgressBar(JScrollBar.HORIZONTAL);
       progressBar.setIndeterminate(false);
-      if (Base.isMacOS()) {
+      if (OSUtils.isMacOS()) {
         //progressBar.setBackground(bgcolor[PROGRESS]);
         //progressBar.putClientProperty("JProgressBar.style", "circular");
       }

app/src/processing/app/FindReplace.java

@@ -26,8 +26,11 @@
 
 import java.awt.*;
 import java.awt.event.*;
+
 import javax.swing.*;
 
+import processing.app.helpers.OSUtils;
+
 
 /**
  * Find & Replace window for the Processing editor.
@@ -47,7 +50,7 @@
 @SuppressWarnings("serial")
 public class FindReplace extends JFrame implements ActionListener {
 
-  static final int EDGE = Base.isMacOS() ? 20 : 13;
+  static final int EDGE = OSUtils.isMacOS() ? 20 : 13;
   static final int SMALL = 6;
   static final int BUTTONGAP = 12; // 12 is correct for Mac, other numbers may be required for other platofrms
 
@@ -143,7 +146,7 @@ public void actionPerformed(ActionEvent e) {
     buttons.setLayout(new FlowLayout(FlowLayout.CENTER, BUTTONGAP, 0));
 
     // ordering is different on mac versus pc
-    if (Base.isMacOS()) {
+    if (OSUtils.isMacOS()) {
       buttons.add(replaceAllButton = new JButton(_("Replace All")));
       buttons.add(replaceButton = new JButton(_("Replace")));
       buttons.add(replaceFindButton = new JButton(_("Replace & Find")));
@@ -161,7 +164,7 @@ public void actionPerformed(ActionEvent e) {
 
     // to fix ugliness.. normally macosx java 1.3 puts an
     // ugly white border around this object, so turn it off.
-    if (Base.isMacOS()) {
+    if (OSUtils.isMacOS()) {
       buttons.setBorder(null);
     }