harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r496049 - in /harmony/enhanced/classlib/trunk/modules/swing/src: main/java/common/javax/swing/JOptionPane.java test/api/java/common/javax/swing/JOptionPaneTest.java
Date Sun, 14 Jan 2007 09:45:18 GMT
Author: hindessm
Date: Sun Jan 14 01:45:17 2007
New Revision: 496049

URL: http://svn.apache.org/viewvc?view=rev&rev=496049
Log:
Applying patches from "[#HARMONY-2690] [classlib][swing]
javax.swing.JOptionPane.getOptions() returns array of Objects on Harmony
while RI returns null".

Modified:
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JOptionPane.java
    harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JOptionPaneTest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JOptionPane.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JOptionPane.java?view=diff&rev=496049&r1=496048&r2=496049
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JOptionPane.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JOptionPane.java
Sun Jan 14 01:45:17 2007
@@ -487,7 +487,7 @@
     }
 
     public Object[] getOptions() {
-        return (options != null) ? (Object[])options.clone() : new Object[0];
+        return ((options != null) ? ((Object[]) options.clone()) : null);
     }
 
     public void setInitialValue(final Object newValue) {

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JOptionPaneTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JOptionPaneTest.java?view=diff&rev=496049&r1=496048&r2=496049
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JOptionPaneTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JOptionPaneTest.java
Sun Jan 14 01:45:17 2007
@@ -695,6 +695,8 @@
 
     public void testGetOptions() {
         assertTrue("options", pane.getOptions() == null || pane.getOptions().length == 0);
+
+        assertNull(new JOptionPane().getOptions());
     }
 
     public void testSetInitialValue() {



Mime
View raw message