[cp-patches] Some example updates & which LAF should be default?

[Mark Wielaard]

Hi,

Now that the Free Swing Demo works again out of the box I cleaned up the
startup message. I also set the look and feel before showing the message
dialog so it looks the same as the rest of the demo.

2005-10-30  Mark Wielaard  <address@hidden>

    * examples/gnu/classpath/examples/swing/Demo.java (static): Set look
    and feel before showing dialog. Clean up message text.

I committed this. But should we keep the GNULookAndFeel as default? Our
Metal seems to look a bit better. And if we use Metal, should we use the
Ocean theme by default or not? Opinions?

Cheers,

Mark

Index: examples/gnu/classpath/examples/swing/Demo.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/examples/gnu/classpath/examples/swing/Demo.java,v
retrieving revision 1.24
diff -u -r1.24 Demo.java
--- examples/gnu/classpath/examples/swing/Demo.java     25 Oct 2005 15:13:56 
-0000      1.24
+++ examples/gnu/classpath/examples/swing/Demo.java     30 Oct 2005 22:37:24 
-0000
@@ -42,17 +42,23 @@
       {
         if (System.getProperty("swing.defaultlaf") == null)
           {
+            UIManager.setLookAndFeel(new GNULookAndFeel());
+
             StringBuffer text = new StringBuffer();
-            text.append("\tYou may change the Look and Feel of this\n");
-            text.append("\tDemo by setting the system property\n");
-            text.append("\t-Dswing.defaultlaf=<LAFClassName>\n\n");
-            text.append("\tPossible values for <LAFClassName> are:\n");
-            text.append("\t  * javax.swing.plaf.metal.MetalLookAndFeel\n");
-            text.append("\t\tthe default Java L&F\n");
-            text.append("\t  * gnu.classpath.examples.swing.GNULookAndFeel\n");
-            text.append("\tthe GNU Look and Feel\n");
-            text.append("\t(derived from 
javax.swing.plaf.basic.BasicLookAndFeel\n\n");
-            text.append("\tthe default is 
gnu.classpath.examples.swing.GNULookAndFeel\n");
+            text.append("You may change the Look and Feel of this\n");
+            text.append("Demo by setting the system property\n");
+            text.append("-Dswing.defaultlaf=<LAFClassName>\n");
+           text.append("\n");
+            text.append("Possible values for <LAFClassName> are:\n");
+           text.append("\n");
+            text.append("* javax.swing.plaf.metal.MetalLookAndFeel\n");
+            text.append("  the default GNU Classpath L&F\n");
+           text.append("\n");
+            text.append("* gnu.classpath.examples.swing.GNULookAndFeel\n");
+            text.append("  the GNU Look and Feel\n");
+            text.append("  (derived from 
javax.swing.plaf.basic.BasicLookAndFeel)\n");
+           text.append("\n");
+            text.append("the default is 
gnu.classpath.examples.swing.GNULookAndFeel\n");
             JEditorPane textPane = new JEditorPane();
             // temporary hack, preferred size should be computed by the
             // component
@@ -61,8 +67,6 @@
             JOptionPane.showMessageDialog(null, textPane,
                                           "Look and Feel notice",
                                           JOptionPane.INFORMATION_MESSAGE);
-            
-            UIManager.setLookAndFeel(new GNULookAndFeel());
           }
       }
     catch (UnsupportedLookAndFeelException e)

signature.asc
Description: This is a digitally signed message part