Hi all,

I committed the attached patch which makes the new JComponent Mauve test
pass.

2005-12-12  Roman Kennke  <[EMAIL PROTECTED]>

        * javax/swing/JComponent.java
        (getPreferredSize): Don't check for the minimumSize. According to
        a mauve test, this is not necessary.

/Roman
Index: javax/swing/JComponent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JComponent.java,v
retrieving revision 1.92
diff -u -r1.92 JComponent.java
--- javax/swing/JComponent.java	8 Dec 2005 10:56:35 -0000	1.92
+++ javax/swing/JComponent.java	12 Dec 2005 13:19:48 -0000
@@ -1305,12 +1305,7 @@
 
     if (prefSize == null)
       prefSize = super.getPreferredSize();
-    // make sure that prefSize is not smaller than minSize
-    if (minimumSize != null && prefSize != null
-        && (minimumSize.width > prefSize.width
-            || minimumSize.height > prefSize.height))
-        prefSize = new Dimension(Math.max(minimumSize.width, prefSize.width),
-                                 Math.max(minimumSize.height, prefSize.height));
+
     return prefSize;
   }
 
_______________________________________________
Classpath-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/classpath-patches

Reply via email to