harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From qi...@apache.org
Subject svn commit: r756095 [3/3] - in /harmony/enhanced/classlib/branches/java6: depends/build/ depends/files/ depends/oss/ make/ make/freebsd.x86/ make/macosx.ppc32/ modules/archive/src/main/native/archive/shared/ modules/auth/ modules/auth/src/main/native/a...
Date Thu, 19 Mar 2009 17:10:53 GMT
Modified: harmony/enhanced/classlib/branches/java6/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/build.xml?rev=756095&r1=756094&r2=756095&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/build.xml Thu Mar 19 17:10:51
2009
@@ -80,7 +80,8 @@
     <available file="${hy.security.src.main.native}/security/${hy.os.family}" property="native.present"
/>
 
 
-    <target name="build-native" if="native.present" >
+    <target name="build-native" depends="build-native-all" />
+    <target name="build-native-all" if="native.present" >
         <make dir="${hy.security.src.main.native}/security/${hy.os.family}" />
 
         <!-- Copy the built shared libs over to the jre/bin dir -->

Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/JComboBox.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/JComboBox.java?rev=756095&r1=756094&r2=756095&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/JComboBox.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/JComboBox.java
Thu Mar 19 17:10:51 2009
@@ -336,6 +336,9 @@
                 dataModel.setSelectedItem(element);
             } else if (isEditable && element != null && !element.equals(getEditor().getItem()))
{
                 getEditor().setItem(element);
+            } else {
+                // fire action event even if selection is not changed
+                fireActionEvent();
             }
         }
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/JComboBoxTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/JComboBoxTest.java?rev=756095&r1=756094&r2=756095&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/JComboBoxTest.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/JComboBoxTest.java
Thu Mar 19 17:10:51 2009
@@ -202,11 +202,7 @@
         assertEquals("b", comboBox.getSelectedItem());
         comboBox.setSelectedItem("b");
         assertTrue(itemController.getEvents().isEmpty());
-        if (isHarmony()) {
-            assertNull(actionController.getEvent());
-        } else {
-            assertNotNull(actionController.getEvent());
-        }
+        assertNotNull(actionController.getEvent());
         actionController.reset();
         itemController.reset();
         comboBox.setEditable(false);
@@ -221,11 +217,7 @@
         assertEquals(1, comboBox.getSelectedIndex());
         comboBox.setSelectedItem("b");
         assertEquals(1, comboBox.getSelectedIndex());
-        if (isHarmony()) {
-            assertNull(actionController.getEvent());
-        } else {
-            assertNotNull(actionController.getEvent());
-        }
+        assertNotNull(actionController.getEvent());
         assertTrue(itemController.getEvents().isEmpty());
         comboBox.setSelectedItem("a");
         assertEquals("a", comboBox.getSelectedItem());



Mime
View raw message