You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@harmony.apache.org by ay...@apache.org on 2007/01/25 11:34:21 UTC

svn commit: r499721 - /harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/TextArea.java

Author: ayza
Date: Thu Jan 25 02:34:20 2007
New Revision: 499721

URL: http://svn.apache.org/viewvc?view=rev&rev=499721
Log:
Applying the patch from HARMONY-1964 ([classlib][awt]Junit AWT TestRunner throws NPE in "Errors and Failures" text area)

Modified:
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/TextArea.java

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/TextArea.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/TextArea.java?view=diff&rev=499721&r1=499720&r2=499721
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/TextArea.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/TextArea.java Thu Jan 25 02:34:20 2007
@@ -804,7 +804,9 @@
             return mRect;
         }
         int xSpan = (int) rootViewContext.getView().getPreferredSpan(View.X_AXIS);
-        mRect.width = xSpan;
+        
+        mRect.width = Math.max(xSpan, mRect.width);
+        
         return mRect;
     }