[cp-patches] FYI: some more cleanup in JInternalFrame stuff

[Roman Kennke]

I did some more cleanup in JInternalFrame.

2005-07-12  Roman Kennke  <address@hidden>

        * javax/swing/plaf/basic/BasicInternalFrameUI.java
        (installDefaults): Create border based on defaults in current
        LookAndFeel.
        * javax/swing/plaf/basic/BasicLookAndFeel.java
        (initComponentDefaults): Included border for InternalFrame as
        LazyValue.

/Roman

Index: javax/swing/plaf/basic/BasicLookAndFeel.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java,v
retrieving revision 1.32
diff -u -r1.32 BasicLookAndFeel.java
--- javax/swing/plaf/basic/BasicLookAndFeel.java        12 Jul 2005 18:58:00 
-0000      1.32
+++ javax/swing/plaf/basic/BasicLookAndFeel.java        12 Jul 2005 19:09:50 
-0000
@@ -47,9 +47,12 @@
 import java.util.Enumeration;
 import java.util.ResourceBundle;
 
+import javax.swing.BorderFactory;
 import javax.swing.KeyStroke;
 import javax.swing.LookAndFeel;
 import javax.swing.UIDefaults;
+import javax.swing.border.BevelBorder;
+import javax.swing.border.Border;
 import javax.swing.plaf.BorderUIResource;
 import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.DimensionUIResource;
@@ -453,7 +456,24 @@
       "InternalFrame.activeTitleBackground", new ColorUIResource(0, 0, 128),
       "InternalFrame.activeTitleForeground", new ColorUIResource(Color.white),
       "InternalFrame.border",
-      new BorderUIResource.CompoundBorderUIResource(null, null),
+      new UIDefaults.LazyValue()
+      {
+       public Object createValue(UIDefaults table)
+       {
+         Color lineColor = new Color(238, 238, 238);
+         Border inner = BorderFactory.createLineBorder(lineColor, 1);
+         Color shadowInner = new Color(184, 207, 229);
+         Color shadowOuter = new Color(122, 138, 153);
+         Border outer = BorderFactory.createBevelBorder(BevelBorder.RAISED,
+                                                        Color.WHITE,
+                                                        Color.WHITE,
+                                                        shadowOuter,
+                                                        shadowInner);
+         Border border = new BorderUIResource.CompoundBorderUIResource(outer,
+                                                                       inner);
+         return border;
+       }
+      },
       "InternalFrame.borderColor", new ColorUIResource(light),
       "InternalFrame.borderDarkShadow", new ColorUIResource(Color.BLACK),
       "InternalFrame.borderHighlight", new ColorUIResource(Color.WHITE),
Index: javax/swing/plaf/basic/BasicInternalFrameUI.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java,v
retrieving revision 1.12
diff -u -r1.12 BasicInternalFrameUI.java
--- javax/swing/plaf/basic/BasicInternalFrameUI.java    11 Jul 2005 11:57:23 
-0000      1.12
+++ javax/swing/plaf/basic/BasicInternalFrameUI.java    12 Jul 2005 19:09:51 
-0000
@@ -1184,15 +1184,19 @@
       // BasicLookAndFeel's defaults, but obviously they differ
       // from the colors that are actually used by the JDK.
       UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-      Color lineColor = new Color(238, 238, 238);
-      Border inner = BorderFactory.createLineBorder(lineColor, 1);
-      Color shadowInner = new Color(184, 207, 229);
-      Color shadowOuter = new Color(122, 138, 153);
+      Color borderColor = defaults.getColor("InternalFrame.borderColor");
+      Border inner = BorderFactory.createLineBorder(borderColor, 1);
+      Color borderDarkShadow = defaults.getColor
+         ("InternalFrame.borderDarkShadow");
+      Color borderHighlight = defaults.getColor
+         ("InternalFrame.borderHighlight");
+      Color borderShadow = defaults.getColor("InternalFrame.borderShadow");
+      Color borderLight = defaults.getColor("InternalFrame.borderLight");
       Border outer = BorderFactory.createBevelBorder(BevelBorder.RAISED,
-                                                    Color.WHITE,
-                                                    Color.WHITE,
-                                                    shadowOuter,
-                                                    shadowInner);
+                                                    borderShadow,
+                                                    borderHighlight,
+                                                    borderDarkShadow,
+                                                    borderShadow);
       Border border = new BorderUIResource.CompoundBorderUIResource(outer,
                                                                    inner);
       frame.setBorder(border);