fixes #4427

[simantics/interop.git] / org.simantics.interop.mapping / src / org / simantics / interop / mapping / Mapper.java

diff --git a/org.simantics.interop.mapping/src/org/simantics/interop/mapping/Mapper.java b/org.simantics.interop.mapping/src/org/simantics/interop/mapping/Mapper.java
index 2a965b8fab64bd80a752ce8e6039c185d9ff8b1a..3414d4d05f17aafada5b733579783ae245974865 100644 (file)
--- a/org.simantics.interop.mapping/src/org/simantics/interop/mapping/Mapper.java
+++ b/org.simantics.interop.mapping/src/org/simantics/interop/mapping/Mapper.java
@@ -80,6 +80,11 @@ public class Mapper {
                addRule(0,idRule,mappingRule);\r
        }\r
        \r
+       public void addRule(IdentificationRule idRule, MappingRule... mappingRules) {\r
+               for (MappingRule mappingRule : mappingRules)\r
+                       addRule(0,idRule,mappingRule);\r
+       }\r
+       \r
        public void addRule(int pass, IdentificationRule idRule, MappingRule mappingRule) {\r
                if (idRule == null || mappingRule == null) throw new NullPointerException();\r
                if (mappingRule instanceof ModificationRule) {\r
@@ -95,6 +100,11 @@ public class Mapper {
                        initializedRules.add((InitializedRule)mappingRule);\r
        }\r
        \r
+       public void addRule(int pass, IdentificationRule idRule, MappingRule... mappingRules) {\r
+               for (MappingRule mappingRule : mappingRules)\r
+                       addRule(pass,idRule,mappingRule);\r
+       }\r
+       \r
        public void addRule(IdentificationRule idRule, ModificationRule... modRules) {\r
                addRule(0, idRule, modRules);\r
        }\r
@@ -384,39 +394,7 @@ public class Mapper {
                        return res.toString();\r
        }\r
        \r
-       public class WriteWrapper extends WriteGraphProxy {\r
-               \r
-               \r
-               private Collection<Resource> createdResources = new ArrayList<Resource>();\r
-               \r
-               public WriteWrapper(WriteGraph graph) {\r
-                       super(graph);\r
-               }\r
-               \r
-               public Collection<Resource> getCreatedResources() {\r
-                       return createdResources;\r
-               }\r
-               \r
-               public void clearCreated() {\r
-                       createdResources = new ArrayList<Resource>();\r
-               }\r
-               \r
-               @Override\r
-               public Resource newResource() throws ServiceException {\r
-                       Resource res = graph.newResource();\r
-                       createdResources.add(res);\r
-                       return res;\r
-               }\r
-               \r
-               @Override\r
-               public Resource newResource(long clusterId) throws ServiceException {\r
-                       Resource res = graph.newResource(clusterId);\r
-                       createdResources.add(res);\r
-                       return res;\r
-               }\r
-               \r
-               \r
-       }\r
+\r
        \r
        private void initializeRules(Session session, VirtualGraph vg, final Resource model ) throws DatabaseException{\r
                session.syncRequest(new WriteRequest(vg) {\r