Commit 7786a3e4 by Michael Koch Committed by Michael Koch

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
parent 640da953
2003-06-05 Michael Koch <konqueror@gmx.de> 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 * javax/swing/border/BevelBorder.java
(BevelBorder): Removed. (BevelBorder): Removed.
* javax/swing/border/EmptyBorder.java: * javax/swing/border/EmptyBorder.java:
......
...@@ -67,6 +67,7 @@ public class BorderUIResource ...@@ -67,6 +67,7 @@ public class BorderUIResource
*/ */
public BorderUIResource(Border delegate) public BorderUIResource(Border delegate)
{ {
super ();
this.delegate = delegate; this.delegate = delegate;
} }
...@@ -120,14 +121,14 @@ public class BorderUIResource ...@@ -120,14 +121,14 @@ public class BorderUIResource
{ {
public BevelBorderUIResource(int bevelType) public BevelBorderUIResource(int bevelType)
{ {
super (bevelType);
} }
public BevelBorderUIResource(int bevelType, public BevelBorderUIResource(int bevelType,
Color highlight, Color highlight,
Color shadow) Color shadow)
{ {
this(bevelType); super (bevelType);
} }
public BevelBorderUIResource(int bevelType, public BevelBorderUIResource(int bevelType,
Color highlightOuter, Color highlightOuter,
...@@ -135,7 +136,7 @@ public class BorderUIResource ...@@ -135,7 +136,7 @@ public class BorderUIResource
Color shadowOuter, Color shadowOuter,
Color shadowInner) Color shadowInner)
{ {
this(bevelType); super (bevelType);
} }
} }
...@@ -149,7 +150,7 @@ public class BorderUIResource ...@@ -149,7 +150,7 @@ public class BorderUIResource
public CompoundBorderUIResource(Border outsideBorder, public CompoundBorderUIResource(Border outsideBorder,
Border insideBorder) Border insideBorder)
{ {
super (outsideBorder, insideBorder);
} }
} }
...@@ -167,7 +168,7 @@ public class BorderUIResource ...@@ -167,7 +168,7 @@ public class BorderUIResource
public EmptyBorderUIResource(Insets insets) public EmptyBorderUIResource(Insets insets)
{ {
super (insets);
} }
} }
...@@ -181,16 +182,16 @@ public class BorderUIResource ...@@ -181,16 +182,16 @@ public class BorderUIResource
public EtchedBorderUIResource() { } public EtchedBorderUIResource() { }
public EtchedBorderUIResource(int etchType) public EtchedBorderUIResource(int etchType)
{ {
super (etchType);
} }
public EtchedBorderUIResource(Color highlight, Color shadow) public EtchedBorderUIResource(Color highlight, Color shadow)
{ {
super (highlight, shadow);
} }
public EtchedBorderUIResource(int etchType, Color highlight, public EtchedBorderUIResource(int etchType, Color highlight,
Color shadow) Color shadow)
{ {
super (etchType);
} }
} }
...@@ -204,12 +205,12 @@ public class BorderUIResource ...@@ -204,12 +205,12 @@ public class BorderUIResource
{ {
public LineBorderUIResource(Color color) public LineBorderUIResource(Color color)
{ {
super (color);
} }
public LineBorderUIResource(Color color, public LineBorderUIResource(Color color,
int thickness) int thickness)
{ {
super (color);
} }
} }
...@@ -223,16 +224,16 @@ public class BorderUIResource ...@@ -223,16 +224,16 @@ public class BorderUIResource
public MatteBorderUIResource(int top, int left, int bottom, public MatteBorderUIResource(int top, int left, int bottom,
int right, Color color) int right, Color color)
{ {
super (top, left, bottom, right, color);
} }
public MatteBorderUIResource(int top, int left, int bottom, public MatteBorderUIResource(int top, int left, int bottom,
int right, Icon tileIcon) int right, Icon tileIcon)
{ {
super (top, left, bottom, right, tileIcon);
} }
public MatteBorderUIResource(Icon tileIcon) public MatteBorderUIResource(Icon tileIcon)
{ {
super (tileIcon);
} }
} }
...@@ -245,32 +246,32 @@ public class BorderUIResource ...@@ -245,32 +246,32 @@ public class BorderUIResource
{ {
TitledBorderUIResource(String title) TitledBorderUIResource(String title)
{ {
super (title);
} }
TitledBorderUIResource(Border border) TitledBorderUIResource(Border border)
{ {
super (border);
} }
TitledBorderUIResource(Border border, String title) TitledBorderUIResource(Border border, String title)
{ {
super (border);
} }
TitledBorderUIResource(Border border, String title, TitledBorderUIResource(Border border, String title,
int titleJustification, int titlePosition) int titleJustification, int titlePosition)
{ {
super (border);
} }
TitledBorderUIResource(Border border, String title, TitledBorderUIResource(Border border, String title,
int titleJustification, int titlePosition, int titleJustification, int titlePosition,
Font titleFont) Font titleFont)
{ {
super (border);
} }
TitledBorderUIResource(Border border, String title, TitledBorderUIResource(Border border, String title,
int titleJustification, int titlePosition, int titleJustification, int titlePosition,
Font titleFont, Color titleColor) Font titleFont, Color titleColor)
{ {
super (border);
} }
} }
} }
......
...@@ -48,7 +48,7 @@ class BasicBorder extends MatteBorder ...@@ -48,7 +48,7 @@ class BasicBorder extends MatteBorder
BasicBorder() BasicBorder()
{ {
super(5,5,5,5, null); super(5,5,5,5, Color.black);
} }
public void paintBorder(Component c, public void paintBorder(Component c,
...@@ -72,7 +72,7 @@ class PanelBorder extends MatteBorder ...@@ -72,7 +72,7 @@ class PanelBorder extends MatteBorder
{ {
PanelBorder() PanelBorder()
{ {
super(5,5,5,5, null); super(5,5,5,5, Color.black);
} }
public void paintBorder(Component c, public void paintBorder(Component c,
......
...@@ -64,7 +64,7 @@ public class BasicOptionPaneUI extends OptionPaneUI ...@@ -64,7 +64,7 @@ public class BasicOptionPaneUI extends OptionPaneUI
System.out.println(" -------------: " + pane); 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"); JButton ok_button = new JButton("Ok");
ok_button.addActionListener(new ActionListener() ok_button.addActionListener(new ActionListener()
...@@ -83,11 +83,11 @@ public class BasicOptionPaneUI extends OptionPaneUI ...@@ -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 != null)
{ {
if (o instanceof String) if (o instanceof String)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment