From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Mon, 7 Jan 2019 07:40:42 +0000 (+0000)
Subject: Merge "Remove unnecessary getComparableKey from HashMapBinding"
X-Git-Tag: v1.43.0~136^2~210
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=1dfc44ff89362fb4500ee9427432541b92d1953f;hp=c69064f9e740eb4abe8448a63d306a085e036e1c

Merge "Remove unnecessary getComparableKey from HashMapBinding"
---

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 3eb17213b..e8047450e 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
@@ -75,7 +75,6 @@ public class TroveBindingsProvider implements BindingProvider {
 			
 			for (int i=0; i<len; i++) {
 				Object key = keys[i];
-				key = getComparableKey(result, key);			
 				Object value = values[i];
 				result.put(key, value);
 			}
@@ -93,7 +92,6 @@ public class TroveBindingsProvider implements BindingProvider {
 			
 			for (int i=0; i<len; i++) {
 				Object key = keys.get(i);
-				key = getComparableKey(result, key);
 				Object value = values.get(i);
 				result.put(key, value);
 			}
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 d8c63e34d..97eb55ac1 100644
--- 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
@@ -68,7 +68,6 @@ public class HashMapBinding extends MapBinding {
 		
 		for (int i=0; i<len; i++) {
 			Object key = keys[i];
-			key = getComparableKey(result, key);			
 			Object value = values[i];
 			result.put(key, value);
 		}
@@ -86,7 +85,6 @@ public class HashMapBinding extends MapBinding {
 		
 		for (int i=0; i<len; i++) {
 			Object key = keys.get(i);
-			key = getComparableKey(result, key);
 			Object value = values.get(i);
 			result.put(key, value);
 		}
@@ -225,27 +223,11 @@ public class HashMapBinding extends MapBinding {
 		}
 		return values;
 	}
-
-	@SuppressWarnings("unchecked")
-	protected Object getComparableKey(Object map, Object key) {
-		// if (keyIsComparable) return key;
-		
-		Map<Object, Object> m = ((Map<Object, Object>)map);
-		Binding kb = getKeyBinding();
-		for (Object k : m.keySet())
-		{
-			if (kb.equals(k, key))
-				return k;
-		}
-		return key;
-	}
 	
 	@SuppressWarnings("unchecked")
 	@Override
 	public void put(Object map, Object key, Object value) {
 		Map<Object, Object> m = ((Map<Object, Object>)map);
-		Object ck = getComparableKey(m, key);
-		m.remove(ck);
 		m.put(key, value);
 	}
 
@@ -254,8 +236,6 @@ public class HashMapBinding extends MapBinding {
 	public <K, V> void putAll(Object map, Map<K, V>  src) throws BindingException {
 		Map<K, V>  m = ((Map<K, V> )map);
 		for (Entry<K, V>  e : (Set<Entry<K, V> >) src.entrySet()) {
-			Object ck = getComparableKey(map, e.getKey());
-			m.remove(ck);
 			m.put(e.getKey(), e.getValue());
 		}
 	}