Merge changes I2aa561cb,I9eb9be8a

* changes:
  Avoid unnecessary ElementClass validation work
  Switch MapList to use Java HashMap

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/adapter/GraphToDiagramSynchronizer.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/adapter/GraphToDiagramSynchronizer.java
index 9be80c34e9c1d8c611a762e851a866dea62e0c3d..2b72b3e0f9a8ee1133ea853484c94a60d89f3dc4 100644 (file)
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/adapter/GraphToDiagramSynchronizer.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/adapter/GraphToDiagramSynchronizer.java
@@ -762,7 +762,7 @@ public class GraphToDiagramSynchronizer extends AbstractDisposable implements ID
                 else
                     result.add(eh);
             }
-            return ElementClass.compile(result).setId(ec.getId());
+            return ElementClass.compile(result, false).setId(ec.getId());
         }
     }
 

diff --git a/bundles/org.simantics.g2d/src/org/simantics/g2d/element/ElementClass.java b/bundles/org.simantics.g2d/src/org/simantics/g2d/element/ElementClass.java
index aaea7654d6874d0f03b7b0db01f990ca8e1e83d8..5d689760143772252b0407340e48620c6bb55e4f 100644 (file)
--- a/bundles/org.simantics.g2d/src/org/simantics/g2d/element/ElementClass.java
+++ b/bundles/org.simantics.g2d/src/org/simantics/g2d/element/ElementClass.java
@@ -93,13 +93,11 @@ public final class ElementClass extends AbstractHandlerClass<ElementHandler> {
      */
     public static ElementClass compile(Collection<ElementHandler> contributions)
     {
-        assertClassValid(contributions);
         return new ElementClass(contributions);
     }
 
     public static ElementClass compile(Collection<ElementHandler> contributions, boolean check)
     {
-        if(check) assertClassValid(contributions);
         return new ElementClass(contributions, check);
     }
 

diff --git a/bundles/org.simantics.utils.datastructures/src/org/simantics/utils/datastructures/MapList.java b/bundles/org.simantics.utils.datastructures/src/org/simantics/utils/datastructures/MapList.java
index 900c4b7015dcf6a84b1346939f5902fffffc94e6..cdfa9f7829ddbfb4065d95f9c4ef27cf774e306d 100644 (file)
--- a/bundles/org.simantics.utils.datastructures/src/org/simantics/utils/datastructures/MapList.java
+++ b/bundles/org.simantics.utils.datastructures/src/org/simantics/utils/datastructures/MapList.java
@@ -14,11 +14,10 @@
  */
 package org.simantics.utils.datastructures;
 
-import gnu.trove.map.hash.THashMap;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -73,7 +72,7 @@ public class MapList<L, R> {
     protected Map<L, List<R>> lists;
 
     public MapList() {
-       lists = new THashMap<L, List<R>>();
+       lists = new HashMap<L, List<R>>();
     }
     
     @SuppressWarnings("unchecked")