MacOSX: removed old Quaqua references

Federico Fissore · Federico Fissore · commit 110a6e20d443 · 2015-07-08T17:21:24.000+02:00
diff --git a/app/build.xml b/app/build.xml
@@ -111,7 +111,6 @@
       <classpath>
         <pathelement location="bin"/>
         <pathelement location="test-bin"/>
-        <pathelement path="../build/macosx/work/Arduino.app/Contents/Resources/Java/quaqua.jar"/>
         <path refid="class.path.test"/>
       </classpath>
 
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -213,12 +213,7 @@ static public void guardedMain(String args[]) throws Exception {
     try {
       BaseNoGui.getPlatform().setLookAndFeel();
     } catch (Exception e) {
-      String mess = e.getMessage();
-      if (mess.indexOf("ch.randelshofer.quaqua.QuaquaLookAndFeel") == -1) {
-        System.err.println(_("Non-fatal error while setting the Look & Feel."));
-        System.err.println(_("The error message follows, however Arduino should run fine."));
-        System.err.println(mess);
-      }
+      // ignore
     }
 
     // Create a location for untitled sketches
@@ -2068,8 +2063,6 @@ static public int showYesNoCancelQuestion(Editor editor, String title,
 //    }
 
     } else {
-      // Pane formatting adapted from the Quaqua guide
-      // http://www.randelshofer.ch/quaqua/guide/joptionpane.html
       JOptionPane pane =
               new JOptionPane("<html> " +
                       "<head> <style type=\"text/css\">" +
@@ -2089,11 +2082,6 @@ static public int showYesNoCancelQuestion(Editor editor, String title,
       // highlight the safest option ala apple hig
       pane.setInitialValue(options[0]);
 
-      // on macosx, setting the destructive property places this option
-      // away from the others at the lefthand side
-      pane.putClientProperty("Quaqua.OptionPane.destructiveOption",
-              new Integer(2));
-
       JDialog dialog = pane.createDialog(editor, null);
       dialog.setVisible(true);
 
@@ -2133,8 +2121,6 @@ static public int showYesNoQuestion(Frame editor, String title,
               JOptionPane.YES_NO_OPTION,
               JOptionPane.QUESTION_MESSAGE);
     } else {
-      // Pane formatting adapted from the Quaqua guide
-      // http://www.randelshofer.ch/quaqua/guide/joptionpane.html
       JOptionPane pane =
               new JOptionPane("<html> " +
                       "<head> <style type=\"text/css\">" +
diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
@@ -2082,8 +2082,6 @@ protected boolean checkModified() {
       // suck--workarounds for the Mac and Apple's snobby attitude about it!
       // I think it's nifty that they treat their developers like dirt.
 
-      // Pane formatting adapted from the quaqua guide
-      // http://www.randelshofer.ch/quaqua/guide/joptionpane.html
       JOptionPane pane =
         new JOptionPane(_("<html> " +
                           "<head> <style type=\"text/css\">"+
@@ -2103,11 +2101,6 @@ protected boolean checkModified() {
       // highlight the safest option ala apple hig
       pane.setInitialValue(options[0]);
 
-      // on macosx, setting the destructive property places this option
-      // away from the others at the lefthand side
-      pane.putClientProperty("Quaqua.OptionPane.destructiveOption",
-        2);
-
       JDialog dialog = pane.createDialog(this, null);
       dialog.setVisible(true);
 
