You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by nd...@apache.org on 2006/10/25 05:33:39 UTC
svn commit: r467548 - in
/incubator/harmony/enhanced/classlib/trunk/modules/awt: build.xml
src/main/java/common/java/awt/datatransfer/SystemFlavorMap.java
Author: ndbeyer
Date: Tue Oct 24 20:33:38 2006
New Revision: 467548
URL: http://svn.apache.org/viewvc?view=rev&rev=467548
Log:
Apply patch for HARMONY-1948: [classlib][awt] unit test fails: j.awt.SystemFlavorMapTest
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/datatransfer/SystemFlavorMap.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml?view=diff&rev=467548&r1=467547&r2=467548
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml Tue Oct 24 20:33:38 2006
@@ -296,7 +296,6 @@
<exclude name="java/awt/geom/GeomTestCase.java"/>
<exclude name="java/awt/geom/PathIteratorTestCase.java"/>
<exclude name="org/apache/harmony/awt/gl/MultiRectAreaTestCase.java"/>
- <exclude name="java/awt/datatransfer/SystemFlavorMapTest.java"/>
<exclude name="java/awt/MenuTest.java"/>
<exclude name="java/awt/AccessibleAWTCanvasTest.java"/>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/datatransfer/SystemFlavorMap.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/datatransfer/SystemFlavorMap.java?view=diff&rev=467548&r1=467547&r2=467548
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/datatransfer/SystemFlavorMap.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/datatransfer/SystemFlavorMap.java Tue Oct 24 20:33:38 2006
@@ -93,7 +93,11 @@
public synchronized List<DataFlavor> getFlavorsForNative(String nat) {
if (nat == null) {
- return new ArrayList<DataFlavor>(flavor2Native.keySet());
+ ArrayList<DataFlavor> result = new ArrayList<DataFlavor>();
+ for (String key : native2Flavor.keySet()) {
+ result.addAll(native2Flavor.get(key));
+ }
+ return result;
}
List<DataFlavor> list = native2Flavor.get(nat);
@@ -110,7 +114,11 @@
public synchronized List<String> getNativesForFlavor(DataFlavor flav) {
if (flav == null) {
- return new ArrayList<String>(native2Flavor.keySet());
+ ArrayList<String> result = new ArrayList<String>();
+ for (DataFlavor key : flavor2Native.keySet()) {
+ result.addAll(flavor2Native.get(key));
+ }
+ return result;
}
List<String> list = flavor2Native.get(flav);