Merge "Fixed escaping in semiautomatic linking of shared libraries dialog"

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 3eb17213be03a74d8a6ac00da6dde81ea48dc7d1..e8047450e331f59a1ce5900a7cd8c4d62eb43591 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
@@ -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 d8c63e34d15b8b72e03b9c216dc63877a06cd8fa..97eb55ac17d63a8bf93debb6188b6288a40425da 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
@@ -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());
                }
        }

diff --git a/bundles/org.simantics.scl.db/scl/Simantics/DB.md b/bundles/org.simantics.scl.db/scl/Simantics/DB.md
index e9aadef96cba37f4b3d96e61e3b52102634b564f..81ee3b6d862d5138ef983adb5505210ee7254bc4 100644 (file)
--- a/bundles/org.simantics.scl.db/scl/Simantics/DB.md
+++ b/bundles/org.simantics.scl.db/scl/Simantics/DB.md
@@ -64,7 +64,8 @@
 
 ## Ordered sets
 
-::value[addToOrderedSet]
+::value[addToOrderedSet,addFirstToOrderedSet,addAfterToOrderedSet,addBeforeToOrderedSet]
+::value[removeFromOrderedSet]
 ::value[setOrderedSet]
 ::value[elementsOfOrderedSet]
 ::value[parentOrderedSet]

diff --git a/bundles/org.simantics.scl.db/scl/Simantics/DB.scl b/bundles/org.simantics.scl.db/scl/Simantics/DB.scl
index 2ff2f51acb11f455459bc64a8663e06961547129..adc72bb943e1cd0a788eaa4369be8deb10b36861 100644 (file)
--- a/bundles/org.simantics.scl.db/scl/Simantics/DB.scl
+++ b/bundles/org.simantics.scl.db/scl/Simantics/DB.scl
@@ -275,9 +275,26 @@ resourceChildrenOf :: Resource -> <ReadGraph> [Resource]
 resourceChildrenOf r = r # L0.ConsistsOf
 
 importJava "org.simantics.db.common.utils.OrderedSetUtils" where
+    "`addToOrderedSet s e` adds element `e` to ordered set `s`"
     @JavaName add
     addToOrderedSet :: Resource -> Resource -> <WriteGraph> Boolean
     
+    "`addFirstToOrderedSet s e` adds element `e` to ordered set `s` as the first element"
+    @JavaName addFirst
+    addFirstToOrderedSet :: Resource -> Resource -> <WriteGraph> Boolean
+    
+    "`addAfterToOrderedSet s p e` adds element `e` to ordered set `s` after element `p`"
+    @JavaName addAfter
+    addAfterToOrderedSet :: Resource -> Resource -> Resource -> <WriteGraph> Boolean
+    
+    "`addBeforeToOrderedSet s p e` adds element `e` to ordered set `s` before element `p`"
+    @JavaName addBefore
+    addBeforeToOrderedSet :: Resource -> Resource -> Resource -> <WriteGraph> Boolean
+    
+    "`removeFromOrderedSet s e` removes element `e` from ordered set `s`"
+    @JavaName remove
+    removeFromOrderedSet :: Resource -> Resource -> <WriteGraph> Boolean
+    
     @JavaName set
     setOrderedSet :: Resource -> [Resource] -> <WriteGraph> Boolean