--- /home/cpdev/src/classpath/javax/swing/plaf/metal/MetalBorders.java	2005-07-15 17:32:40.000000000 +0000
+++ javax/swing/plaf/metal/MetalBorders.java	2005-06-30 05:35:19.000000000 +0000
@@ -78,7 +78,7 @@
   /**
    * The border that is drawn around Swing buttons.
    */
-  public static class ButtonBorder
+  public static class MetalButtonBorder
     extends AbstractBorder
     implements UIResource
   {
@@ -88,7 +88,7 @@
     /**
      * Creates a new instance of ButtonBorder.
      */
-    public ButtonBorder()
+    public MetalButtonBorder()
     {
     }
 
@@ -404,7 +404,7 @@
   {
     if (buttonBorder == null)
       {
-        Border outer = new ButtonBorder();
+        Border outer = new MetalButtonBorder();
         Border inner = getMarginBorder();
         buttonBorder = new BorderUIResource.CompoundBorderUIResource
             (outer, inner);
@@ -421,7 +421,7 @@
   {
     if (toolbarButtonBorder == null)
       {
-        Border outer = new ButtonBorder();
+        Border outer = new MetalButtonBorder();
         Border inner = new RolloverMarginBorder();
         toolbarButtonBorder = new BorderUIResource.CompoundBorderUIResource
           (outer, inner);