Merge commit 'd186091'

[simantics/platform.git] / bundles / org.simantics.databoard / src / org / simantics / databoard / binding / impl / HashMapBinding.java

diff --git a/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/impl/HashMapBinding.java b/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/impl/HashMapBinding.java
index d3a9d8c75c46cbb6b060c373c812aeebd0543282..76241a0c7f3eaebd2e7f51d699c5e983d43cbb3b 100644 (file)
--- a/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/impl/HashMapBinding.java
+++ b/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/impl/HashMapBinding.java
@@ -53,13 +53,11 @@ public class HashMapBinding extends MapBinding {
                super(mapType, keyBinding, valueBinding);
        }
        
-       public void postConstruction() {}\r
-       \r
-       @Override
-       public Object create() {                
-               return new HashMap<Object, Object>();
-       }
-       
+    @Override\r
+    public Object create() {        \r
+        return new HashMap<Object, Object>();\r
+    }\r
+    \r
        @Override
        public Object create(Object[] keys, Object[] values) {
                if (keys.length!=values.length)
@@ -97,7 +95,10 @@ public class HashMapBinding extends MapBinding {
        }
        
        @Override
-       public Object create(Map<?, ?> initialMap) throws BindingException {
+       public Object create(Map<?, ?> initialMap) throws BindingException {\r
+           if (initialMap instanceof HashMap)\r
+               return initialMap;\r
+           
                // Replace with TreeMap. Create comparator from binding.
                HashMap<Object, Object> result = new HashMap<Object, Object>();
                putAll(result, initialMap);