Index: modules/awt/src/main/java/common/java/awt/datatransfer/SystemFlavorMap.java =================================================================== --- modules/awt/src/main/java/common/java/awt/datatransfer/SystemFlavorMap.java (revision 467300) +++ modules/awt/src/main/java/common/java/awt/datatransfer/SystemFlavorMap.java (working copy) @@ -93,7 +93,11 @@ public synchronized List getFlavorsForNative(String nat) { if (nat == null) { - return new ArrayList(flavor2Native.keySet()); + ArrayList result = new ArrayList(); + for (String key : native2Flavor.keySet()) { + result.addAll(native2Flavor.get(key)); + } + return result; } List list = native2Flavor.get(nat); @@ -110,7 +114,11 @@ public synchronized List getNativesForFlavor(DataFlavor flav) { if (flav == null) { - return new ArrayList(native2Flavor.keySet()); + ArrayList result = new ArrayList(); + for (DataFlavor key : flavor2Native.keySet()) { + result.addAll(flavor2Native.get(key)); + } + return result; } List list = flavor2Native.get(flav);