Index: javax/swing/BorderFactory.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/BorderFactory.java,v
retrieving revision 1.3.18.1
diff -u -r1.3.18.1 BorderFactory.java
--- javax/swing/BorderFactory.java	22 Oct 2004 12:41:10 -0000	1.3.18.1
+++ javax/swing/BorderFactory.java	21 Nov 2004 11:24:56 -0000
@@ -52,6 +52,11 @@
 
 public class BorderFactory
 {
+  private BorderFactory()
+  {
+    // Do nothing.
+  }
+  
   /**
    * Creates a line border withe the specified color.
    *
Index: javax/swing/SwingUtilities.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/SwingUtilities.java,v
retrieving revision 1.6.2.16
diff -u -r1.6.2.16 SwingUtilities.java
--- javax/swing/SwingUtilities.java	16 Nov 2004 10:09:45 -0000	1.6.2.16
+++ javax/swing/SwingUtilities.java	21 Nov 2004 11:24:57 -0000
@@ -76,6 +76,11 @@
    */
   private static OwnerFrame ownerFrame;
 
+  private SwingUtilities()
+  {
+    // Do nothing.
+  }
+  
   /**
    * Calculates the portion of the base rectangle which is inside the
    * insets.
@@ -1120,6 +1125,19 @@
 
     return new Rectangle(0, 0, 0, 0);
   }
+  
+  /**
+   * Calculates the width of a given string.
+   *
+   * @param fm the <code>FontMetrics</code> object to use
+   * @param str the string
+   * 
+   * @return the width of the the string.
+   */
+  public static int computeStringWidth(FontMetrics fm, String str)
+  {
+    return fm.stringWidth(str);
+  }
 
   /**
    * Calculates the union of two rectangles.