harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r502540 - in /harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common: javax/swing/plaf/basic/BasicComboBoxUI.java org/apache/harmony/x/swing/internal/nls/messages.properties
Date Fri, 02 Feb 2007 08:55:32 GMT
Author: apetrenko
Date: Fri Feb  2 00:55:31 2007
New Revision: 502540

URL: http://svn.apache.org/viewvc?view=rev&rev=502540
Log:
Additional patch for HARMONY-2896 "[classlib][swing] Compatibility: javax.swing.plaf.basic.BasicComboBoxUI.
getAccessibleChildrenCount(null) does not throw unspecified NPE"
Exception message has been internationalized

Modified:
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicComboBoxUI.java
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicComboBoxUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicComboBoxUI.java?view=diff&rev=502540&r1=502539&r2=502540
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicComboBoxUI.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicComboBoxUI.java
Fri Feb  2 00:55:31 2007
@@ -67,6 +67,8 @@
 import org.apache.harmony.x.swing.StringConstants;
 import org.apache.harmony.x.swing.Utilities;
 
+import org.apache.harmony.x.swing.internal.nls.Messages;
+
 
 public class BasicComboBoxUI extends ComboBoxUI {
 
@@ -485,7 +487,7 @@
 
     public int getAccessibleChildrenCount(final JComponent c) {
         if (comboBox == null) {
-            throw new NullPointerException("comboBox is null");
+            throw new NullPointerException(Messages.getString("swing.04"));
         }
         return 0;
     }

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties?view=diff&rev=502540&r1=502539&r2=502540
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties
Fri Feb  2 00:55:31 2007
@@ -17,6 +17,7 @@
 # messages for EN locale
 swing.00=Invalid axis: {0}
 swing.01=fromIndex must be <= toIndex
-swing.02=invalid verticalScrollBarPolicy
-swing.03=invalid horizontalScrollBarPolicy
+swing.02=Invalid verticalScrollBarPolicy
+swing.03=Invalid horizontalScrollBarPolicy
+swing.04=ComboBox is null
 



Mime
View raw message