BorderUIResource.java, [...]: More compile fixes for latest Border commit.

2003-06-05  Michael Koch  <konqueror@gmx.de>

	* javax/swing/plaf/BorderUIResource.java,
	javax/swing/plaf/basic/BasicDefaults.java,
	javax/swing/plaf/basic/BasicOptionPaneUI.java:
	More compile fixes for latest Border commit. I should not commit
	something in this heat here ...

From-SVN: r67513

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4163d4da5b149053a070444748ce0a7c7d9c44f5..7c1c20d71fcd9162eb9f37f97483eab7cf75faee 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-05  Michael Koch  <konqueror@gmx.de>
+
+       * javax/swing/plaf/BorderUIResource.java,
+       javax/swing/plaf/basic/BasicDefaults.java,
+       javax/swing/plaf/basic/BasicOptionPaneUI.java:
+       More compile fixes for latest Border commit. I should not commit
+       something in this heat here ...
+
 2003-06-05  Michael Koch  <konqueror@gmx.de>
 
        * javax/swing/border/BevelBorder.java

diff --git a/libjava/javax/swing/plaf/BorderUIResource.java b/libjava/javax/swing/plaf/BorderUIResource.java
index 6e8a8291d748df946141afeb580589a1dd3e33c3..46c65faf3816c5bd7a4f2f02ca607d343a6d4020 100644 (file)
--- a/libjava/javax/swing/plaf/BorderUIResource.java
+++ b/libjava/javax/swing/plaf/BorderUIResource.java
@@ -67,6 +67,7 @@ public class BorderUIResource
      */
     public BorderUIResource(Border delegate)
     {
+       super ();
        this.delegate = delegate;
     }
 
@@ -120,14 +121,14 @@ public class BorderUIResource
     {
        public BevelBorderUIResource(int bevelType) 
        { 
-
+           super (bevelType);
        }
 
        public BevelBorderUIResource(int bevelType, 
                                     Color highlight, 
                                     Color shadow) 
        {
-           this(bevelType);
+           super (bevelType);
        }
        public BevelBorderUIResource(int bevelType,
                                     Color highlightOuter,
@@ -135,7 +136,7 @@ public class BorderUIResource
                                     Color shadowOuter,
                                     Color shadowInner) 
        {
-           this(bevelType);
+           super (bevelType);
        }
     }
 
@@ -149,7 +150,7 @@ public class BorderUIResource
        public CompoundBorderUIResource(Border outsideBorder,
                                        Border insideBorder)
        {
-
+         super (outsideBorder, insideBorder);
        }
     }
 
@@ -167,7 +168,7 @@ public class BorderUIResource
        
        public EmptyBorderUIResource(Insets insets)
        {
-
+         super (insets);
        }
     }
 
@@ -181,16 +182,16 @@ public class BorderUIResource
        public EtchedBorderUIResource() { }
        public EtchedBorderUIResource(int etchType) 
        {
-
+         super (etchType);
        }
        public EtchedBorderUIResource(Color highlight, Color shadow)
        {
-
+         super (highlight, shadow);
        }
        public EtchedBorderUIResource(int etchType, Color highlight, 
                                      Color shadow)
        {
-
+         super (etchType);
        }
 
     }
@@ -204,12 +205,12 @@ public class BorderUIResource
     {
        public LineBorderUIResource(Color color)
        {
-           
+          super (color); 
        }
        public LineBorderUIResource(Color color,
                                    int thickness)
        {
-
+          super (color); 
        }
     }
 
@@ -223,16 +224,16 @@ public class BorderUIResource
        public MatteBorderUIResource(int top, int left, int bottom, 
                                     int right, Color color)
        {
-
+         super (top, left, bottom, right, color);
        }
        public MatteBorderUIResource(int top, int left, int bottom,
                                     int right, Icon tileIcon)
        {
-
+         super (top, left, bottom, right, tileIcon);
        }
        public MatteBorderUIResource(Icon tileIcon)
        {
-
+         super (tileIcon);
        }
     }
 
@@ -245,32 +246,32 @@ public class BorderUIResource
     {
        TitledBorderUIResource(String title)
        {
-
+         super (title);
        }
        TitledBorderUIResource(Border border)
        {
-
+          super (border);
        }
        TitledBorderUIResource(Border border, String title)
        {
-
+          super (border);
        }
        TitledBorderUIResource(Border border, String title,
                               int titleJustification, int titlePosition)
        {
-
+          super (border);
        }
        TitledBorderUIResource(Border border, String title,
                               int titleJustification, int titlePosition,
                               Font titleFont)
        {
-
+          super (border);
        }
        TitledBorderUIResource(Border border, String title,
                               int titleJustification, int titlePosition,
                               Font titleFont, Color titleColor)
        {
-
+          super (border);
        }
     }
 }

diff --git a/libjava/javax/swing/plaf/basic/BasicDefaults.java b/libjava/javax/swing/plaf/basic/BasicDefaults.java
index 5bfb5d961067bc6517883fbc8d08d789ecb3d30c..1be8d5bdf84d0ff60c90db0dedf0cd6e5d58bbaa 100644 (file)
--- a/libjava/javax/swing/plaf/basic/BasicDefaults.java
+++ b/libjava/javax/swing/plaf/basic/BasicDefaults.java
@@ -48,7 +48,7 @@ class BasicBorder extends MatteBorder
 
        BasicBorder()
        {
-           super(5,5,5,5, null);
+               super(5,5,5,5, Color.black);
        }
        
        public void paintBorder(Component  c,
@@ -72,7 +72,7 @@ class PanelBorder extends MatteBorder
 {
     PanelBorder()
     {
-       super(5,5,5,5, null);
+       super(5,5,5,5, Color.black);
        }
        
        public void paintBorder(Component  c,

diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java
index e3023a85473b894a3a06f212c6e88affa667fed5..1e3a3ebbb7150ef8e388e52ee2f0714f3d517f39 100644 (file)
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java
+++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java
@@ -64,7 +64,7 @@ public class BasicOptionPaneUI extends OptionPaneUI
 
        System.out.println("     -------------: " + pane);
 
-       JLabel  message   = pane.msg != null ? new JLabel((String)pane.msg) : null;
+       JLabel  message   = pane.getMessage() != null ? new JLabel((String)pane.getMessage()) : null;
        JButton ok_button = new JButton("Ok");  
 
        ok_button.addActionListener(new ActionListener()
@@ -83,11 +83,11 @@ public class BasicOptionPaneUI extends OptionPaneUI
                }
            });
 
-       if (pane.args != null)
+       if (pane.getOptions() != null)
            {
-               for (int i=0; i<pane.args.length; i++)
+               for (int i=0; i<pane.getOptions().length; i++)
                    {
-                       Object o = pane.args[i];
+                       Object o = pane.getOptions()[i];
                        if (o != null)
                            {
                                if (o instanceof String)