Merge commit 'a2a4242'

[simantics/platform.git] / bundles / org.simantics.databoard / src / org / simantics / databoard / binding / factory / TroveBindingsProvider.java

diff --git a/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/factory/TroveBindingsProvider.java b/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/factory/TroveBindingsProvider.java
index e635e12a03d27a70a5e37a19d8a63e1c692c6f52..0f9a4dc767b46a5e0ae02a22f75ea383da09f059 100644 (file)
--- a/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/factory/TroveBindingsProvider.java
+++ b/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/factory/TroveBindingsProvider.java
@@ -103,6 +103,9 @@ public class TroveBindingsProvider implements BindingProvider {
                \r
                @Override\r
                public Object create(Map<?, ?> initialMap) throws BindingException {\r
+                   if (initialMap instanceof THashMap)\r
+                       return initialMap;\r
+                   \r
                        // Replace with TreeMap. Create comparator from binding.\r
                        THashMap<Object, Object> result = new THashMap<Object, Object>();\r
                        putAll(result, initialMap);\r
@@ -134,10 +137,14 @@ public class TroveBindingsProvider implements BindingProvider {
                }\r
 \r
                public Object create(Set<?> initialSet) throws BindingException {\r
+                   if (initialSet instanceof THashSet)\r
+                       return initialSet;\r
+                   \r
                        return new THashSet<Object>(initialSet);\r
                }\r
 \r
-               @Override\r
+               @SuppressWarnings({ "unchecked", "rawtypes" })\r
+        @Override\r
                public Object create(Map initialMap) throws BindingException {\r
                        return new THashSet<Object>(initialMap.keySet());\r
                }\r