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

	* javax/swing/border/BevelBorder.java
	(BevelBorder): Removed.
	* javax/swing/border/EmptyBorder.java:
	Reformatted.
	(EmptyBorder): Removed.
	(getBorderInsets): Dont use l, r, t and b.
	* javax/swing/border/EtchedBorder.java
	(EtchedBorder): Removed.
	* javax/swing/border/LineBorder.java
	(LineBorder): Removed.
	* javax/swing/border/MatteBorder.java
	(MatteBorder): Removed.
	* javax/swing/border/TitledBorder.java
	(defaultBorder): Use other default for now.
	(defaultFont): Likewise.
	(defaultColor): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@67511 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9a029bd..4163d4d 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,24 @@
 2003-06-05  Michael Koch  <konqueror@gmx.de>
 
+       * javax/swing/border/BevelBorder.java
+       (BevelBorder): Removed.
+       * javax/swing/border/EmptyBorder.java:
+       Reformatted.
+       (EmptyBorder): Removed.
+       (getBorderInsets): Dont use l, r, t and b.
+       * javax/swing/border/EtchedBorder.java
+       (EtchedBorder): Removed.
+       * javax/swing/border/LineBorder.java
+       (LineBorder): Removed.
+       * javax/swing/border/MatteBorder.java
+       (MatteBorder): Removed.
+       * javax/swing/border/TitledBorder.java
+       (defaultBorder): Use other default for now.
+       (defaultFont): Likewise.
+       (defaultColor): Likewise.
+
+2003-06-05  Michael Koch  <konqueror@gmx.de>
+
        * javax/swing/border/Border.java:
        New version from classpath.
 

diff --git a/libjava/javax/swing/border/BevelBorder.java b/libjava/javax/swing/border/BevelBorder.java
index 44da5b4..a681b16 100644 (file)
--- a/libjava/javax/swing/border/BevelBorder.java
+++ b/libjava/javax/swing/border/BevelBorder.java
@@ -73,16 +73,6 @@ public class BevelBorder extends AbstractBorder
     this.shadowInner = shadowInner;
   }
 
-    public BevelBorder(int top,
-               int left,
-               int bottom, 
-               int right,
-               Color color)
-    {
-        super(top, left, bottom, right);
-        this.c = color;
-    }
-
     public boolean isBorderOpaque()
     {
        return false;

diff --git a/libjava/javax/swing/border/EmptyBorder.java b/libjava/javax/swing/border/EmptyBorder.java
index 679c56f..16cb793 100644 (file)
--- a/libjava/javax/swing/border/EmptyBorder.java
+++ b/libjava/javax/swing/border/EmptyBorder.java
@@ -62,49 +62,27 @@ public class EmptyBorder extends AbstractBorder
     this.top = top;
     this.bottom = bottom;
   }
-    
-    protected int l,r,b,t;
-
-    public EmptyBorder()
-    {
-    }
-
-    public EmptyBorder(int left,
-               int right,
-               int top, 
-               int bottom)
-    {
-       this.l = left;
-       this.r = r;
-       this.t = t;
-       this.b = b;
-    }
-
-
-    public Insets getBorderInsets(Component  c,
-                                 Insets s)
-    {
-       if (s == null)
-           s = new Insets(0,0,0,0);
-
-       s.left = l;
-       s.right = r;
-       s.top = t;
-       s.bottom = b;
-       
-       return s;
-    }
-    
-    public boolean isBorderOpaque()
-    {
-       return false;
-    }
 
+  public Insets getBorderInsets (Component c, Insets s)
+  {
+    if (s == null)
+      s = new Insets (0,0,0,0);
+
+    s.left = left;
+    s.right = right;
+    s.top = top;
+    s.bottom = bottom;
+    return s;
+  }
     
-    public void paintBorder(Component  c, 
-                           Graphics  g,
-                           int  x, int  y, int  width, int  height)
-    {
-    }
+  public boolean isBorderOpaque ()
+  {
+    return false;
+  }
+
+  public void paintBorder (Component c, Graphics g, int x, int y,
+                           int width, int height)
+  {
+  }
 }
 

diff --git a/libjava/javax/swing/border/EtchedBorder.java b/libjava/javax/swing/border/EtchedBorder.java
index 33c5073..11421b5 100644 (file)
--- a/libjava/javax/swing/border/EtchedBorder.java
+++ b/libjava/javax/swing/border/EtchedBorder.java
@@ -73,16 +73,6 @@ public class EtchedBorder extends AbstractBorder
     this.shadow = shadow;
   }
     
-    public EtchedBorder(int top,
-               int left,
-               int bottom, 
-               int right,
-               Color color)
-    {
-        super(top, left, bottom, right);
-        this.c = color;
-    }
-
     public boolean isBorderOpaque()
     {
        return false;

diff --git a/libjava/javax/swing/border/LineBorder.java b/libjava/javax/swing/border/LineBorder.java
index ba6c060..b42bdf7 100644 (file)
--- a/libjava/javax/swing/border/LineBorder.java
+++ b/libjava/javax/swing/border/LineBorder.java
@@ -68,16 +68,6 @@ public class LineBorder extends AbstractBorder
     this.roundedCorners = roundedCorners;
   }
     
-    public LineBorder(int top,
-               int left,
-               int bottom, 
-               int right,
-               Color color)
-    {
-        super(top, left, bottom, right);
-        this.c = color;
-    }
-
     public boolean isBorderOpaque()
     {
        return false;

diff --git a/libjava/javax/swing/border/MatteBorder.java b/libjava/javax/swing/border/MatteBorder.java
index 9f1ed93..d3adfea 100644 (file)
--- a/libjava/javax/swing/border/MatteBorder.java
+++ b/libjava/javax/swing/border/MatteBorder.java
@@ -79,16 +79,6 @@ public class MatteBorder extends EmptyBorder
     this.color = color;
   }
     
-    public MatteBorder(int top,
-               int left,
-               int bottom, 
-               int right,
-               Color color)
-    {
-        super(top, left, bottom, right);
-        this.c = color;
-    }
-
     public boolean isBorderOpaque()
     {
        return false;

diff --git a/libjava/javax/swing/border/TitledBorder.java b/libjava/javax/swing/border/TitledBorder.java
index 8a16c1a..2679ee6 100644 (file)
--- a/libjava/javax/swing/border/TitledBorder.java
+++ b/libjava/javax/swing/border/TitledBorder.java
@@ -72,9 +72,9 @@ public class TitledBorder extends AbstractBorder
   protected int titleJustification;
   protected int titlePosition;
 
-  private static Border defaultBorder = new BorderUIRessource ();
-  private static Font defaultFont = new FontUIRessource ("Dialog", BOLD, 12);
-  private static Color defaultColor = new ColorUIRessource (Color.black);
+  private static Border defaultBorder = new LineBorder (Color.black);
+  private static Font defaultFont = null;
+  private static Color defaultColor = Color.black;
   
   public TitledBorder (String title)
   {