Merge commit 'a2a4242'

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

diff --git a/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/factory/DefaultBindingFactory.java b/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/factory/DefaultBindingFactory.java
index 54c1160c5169c2dd0ee334c7913d4c2406f291b1..73f2d2f16d167d34de11a541e097cadf78890378 100644 (file)
--- a/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/factory/DefaultBindingFactory.java
+++ b/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/factory/DefaultBindingFactory.java
@@ -20,6 +20,7 @@ import org.simantics.databoard.binding.impl.BooleanArrayBinding;
 import org.simantics.databoard.binding.impl.BooleanBindingDefault;\r
 import org.simantics.databoard.binding.impl.ByteArrayBinding;\r
 import org.simantics.databoard.binding.impl.ByteBindingDefault;\r
+import org.simantics.databoard.binding.impl.DefaultMapBinding;\r
 import org.simantics.databoard.binding.impl.DoubleArrayBinding;\r
 import org.simantics.databoard.binding.impl.DoubleBindingDefault;\r
 import org.simantics.databoard.binding.impl.FloatArrayBinding;\r
@@ -30,7 +31,6 @@ import org.simantics.databoard.binding.impl.LongArrayBinding;
 import org.simantics.databoard.binding.impl.LongBindingDefault;\r
 import org.simantics.databoard.binding.impl.ObjectArrayBinding;\r
 import org.simantics.databoard.binding.impl.StringBindingDefault;\r
-import org.simantics.databoard.binding.impl.TreeMapBinding;\r
 import org.simantics.databoard.binding.mutable.ContainerOptionalBinding;\r
 import org.simantics.databoard.binding.mutable.UnionTaggedObjectBinding;\r
 import org.simantics.databoard.type.ArrayType;\r
@@ -180,9 +180,9 @@ public class DefaultBindingFactory extends TypeBindingFactory {
                        return binding;\r
                }               
                
-               if (type instanceof MapType) {                  
+               if (type instanceof MapType) {
                        MapType mapType = (MapType) type;
-                       TreeMapBinding binding = new TreeMapBinding(mapType, null, null);
+                       DefaultMapBinding binding = new DefaultMapBinding(mapType, null, null);
                        inprogress.put(type, binding);\r
                        binding.setKeyBinding( construct(mapType.keyType) );\r
                        binding.setValueBinding( construct(mapType.valueType) );\r