X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.databoard%2Fsrc%2Forg%2Fsimantics%2Fdataboard%2Fbinding%2Ffactory%2FTroveBindingsProvider.java;h=0f9a4dc767b46a5e0ae02a22f75ea383da09f059;hp=e635e12a03d27a70a5e37a19d8a63e1c692c6f52;hb=602614f4502aae85ecf3967abb7152d2d62903e3;hpb=969bd23cab98a79ca9101af33334000879fb60c5

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 e635e12a0..0f9a4dc76 100644
--- 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 {
 		
 		@Override
 		public Object create(Map<?, ?> initialMap) throws BindingException {
+		    if (initialMap instanceof THashMap)
+		        return initialMap;
+		    
 			// Replace with TreeMap. Create comparator from binding.
 			THashMap<Object, Object> result = new THashMap<Object, Object>();
 			putAll(result, initialMap);
@@ -134,10 +137,14 @@ public class TroveBindingsProvider implements BindingProvider {
 		}
 
 		public Object create(Set<?> initialSet) throws BindingException {
+		    if (initialSet instanceof THashSet)
+		        return initialSet;
+		    
 			return new THashSet<Object>(initialSet);
 		}
 
-		@Override
+		@SuppressWarnings({ "unchecked", "rawtypes" })
+        @Override
 		public Object create(Map initialMap) throws BindingException {
 			return new THashSet<Object>(initialMap.keySet());
 		}