X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop.mapping%2Fsrc%2Forg%2Fsimantics%2Finterop%2Fmapping%2FMapper.java;h=3414d4d05f17aafada5b733579783ae245974865;hb=45e54f2af73bfbe7c43e95c7fe7d8d3d8164a2cc;hp=2a965b8fab64bd80a752ce8e6039c185d9ff8b1a;hpb=da8fa473c2247427cf59f7007a235f556799caad;p=simantics%2Finterop.git 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 2a965b8..3414d4d 100644 --- 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); } + public void addRule(IdentificationRule idRule, MappingRule... mappingRules) { + for (MappingRule mappingRule : mappingRules) + addRule(0,idRule,mappingRule); + } + public void addRule(int pass, IdentificationRule idRule, MappingRule mappingRule) { if (idRule == null || mappingRule == null) throw new NullPointerException(); if (mappingRule instanceof ModificationRule) { @@ -95,6 +100,11 @@ public class Mapper { initializedRules.add((InitializedRule)mappingRule); } + public void addRule(int pass, IdentificationRule idRule, MappingRule... mappingRules) { + for (MappingRule mappingRule : mappingRules) + addRule(pass,idRule,mappingRule); + } + public void addRule(IdentificationRule idRule, ModificationRule... modRules) { addRule(0, idRule, modRules); } @@ -384,39 +394,7 @@ public class Mapper { return res.toString(); } - public class WriteWrapper extends WriteGraphProxy { - - - private Collection createdResources = new ArrayList(); - - public WriteWrapper(WriteGraph graph) { - super(graph); - } - - public Collection getCreatedResources() { - return createdResources; - } - - public void clearCreated() { - createdResources = new ArrayList(); - } - - @Override - public Resource newResource() throws ServiceException { - Resource res = graph.newResource(); - createdResources.add(res); - return res; - } - - @Override - public Resource newResource(long clusterId) throws ServiceException { - Resource res = graph.newResource(clusterId); - createdResources.add(res); - return res; - } - - - } + private void initializeRules(Session session, VirtualGraph vg, final Resource model ) throws DatabaseException{ session.syncRequest(new WriteRequest(vg) {