Hey,
This patch fixes a bug that was exposed by Harmony's testsuites. I have
also committed a mauve test. The bugs were in the minimizeSize(int) and
preferredSize(int) methods.
Cheers,
Tania
2006-11-06 Tania Bento <[EMAIL PROTECTED]>
* java/awt/TextField.java
(minimumSize(int)): Check if minimum size has been previously
set and changed values of Dimension returned if peer == null.
(preferredSize(int)): Check if preferred size has been
previously
set and changed values of Dimension returned if peer == null.
Index: java/awt/TextField.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/TextField.java,v
retrieving revision 1.20
diff -u -r1.20 TextField.java
--- java/awt/TextField.java 13 Jul 2006 17:30:24 -0000 1.20
+++ java/awt/TextField.java 6 Nov 2006 18:05:51 -0000
@@ -264,9 +264,12 @@
*/
public Dimension minimumSize(int columns)
{
+ if (isMinimumSizeSet())
+ return new Dimension(minSize);
+
TextFieldPeer peer = (TextFieldPeer) getPeer ();
if (peer == null)
- return null; // FIXME: What do we do if there is no peer?
+ return new Dimension(getWidth(), getHeight());
return peer.getMinimumSize (columns);
}
@@ -316,10 +319,13 @@
*/
public Dimension preferredSize(int columns)
{
+ if (isPreferredSizeSet())
+ return new Dimension(prefSize);
+
TextFieldPeer peer = (TextFieldPeer) getPeer ();
if (peer == null)
- return new Dimension (0, 0);
-
+ return new Dimension (getWidth(), getHeight());
+
return peer.getPreferredSize (columns);
}
