Index: javax/swing/JTextField.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JTextField.java,v
retrieving revision 1.14
diff -u -r1.14 JTextField.java
--- javax/swing/JTextField.java	27 Sep 2004 07:48:47 -0000	1.14
+++ javax/swing/JTextField.java	22 Dec 2004 17:43:01 -0000
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing;
 
 import java.awt.Dimension;
@@ -50,7 +51,6 @@
 import javax.swing.text.JTextComponent;
 import javax.swing.text.PlainDocument;
 
-
 public class JTextField extends JTextComponent
   implements SwingConstants
 {
@@ -272,19 +272,10 @@
 
   public Dimension getPreferredSize()
   {
-    Dimension size;
-    FontMetrics fm = getFontMetrics(getFont());
-    int fontHeight = fm.getMaxAscent() + fm.getMaxDescent();
-    int columnWidth = fm.charWidth('m');
-    
+    Dimension size = super.getPreferredSize();
+
     if (columns != 0)
-      {
-	size = new Dimension(columns * columnWidth + 4, fontHeight + 4);
-      }
-    else
-      {
-	size = new Dimension(10, 10);
-      }
+      size.width = columns * getColumnWidth();
 
     return size;
   }