X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.objmap2%2Fsrc%2Forg%2Fsimantics%2Fobjmap%2Fgraph%2Frules%2FMappedElementRule.java;h=251895ad72a1aedc7aac9966b5f51b5bc83aa08b;hp=3b6fac31d4299f9d75efb5d41a2f2391aa137b75;hb=0cb9829cf7fbee31bbc952c6313b01e195e8d010;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/MappedElementRule.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/MappedElementRule.java
index 3b6fac31d..251895ad7 100644
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/MappedElementRule.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/MappedElementRule.java
@@ -11,7 +11,8 @@
  *******************************************************************************/
 package org.simantics.objmap.graph.rules;
 
-import org.apache.log4j.Logger;
+import java.util.Objects;
+
 import org.simantics.db.ReadGraph;
 import org.simantics.db.WriteGraph;
 import org.simantics.objmap.backward.IBackwardMapping;
@@ -20,9 +21,8 @@ import org.simantics.objmap.exceptions.MappingException;
 import org.simantics.objmap.forward.IForwardMapping;
 import org.simantics.objmap.graph.rules.domain.IDomainAccessor;
 import org.simantics.objmap.graph.rules.range.IRangeAccessor;
-
-
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A rule that synchronizes collection of elements between
@@ -32,7 +32,7 @@ import org.simantics.objmap.graph.rules.range.IRangeAccessor;
  */
 public class MappedElementRule<Domain, Range> implements IBidirectionalMappingRule<Domain, Range> {
     
-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static final Logger LOGGER = LoggerFactory.getLogger(MappedElementRule.class);
     
 	IDomainAccessor<Domain,Domain> domainAccessor;
 	IRangeAccessor<Range,Range> rangeAccessor;
@@ -47,7 +47,7 @@ public class MappedElementRule<Domain, Range> implements IBidirectionalMappingRu
 	public boolean updateDomain(WriteGraph g, IBackwardMapping<Domain, Range> map,
 			Domain domainElement, Range rangeElement)
 			throws MappingException {
-        LOGGER.info("    MappedElementRule.updateDomain");
+        LOGGER.trace("    MappedElementRule.updateDomain");
 	    Range value = rangeAccessor.get(rangeElement);
 	    Domain mappedValue = value == null ? null : map.inverseMap(g, value);//map.inverseGet(value);
 		return domainAccessor.set(g, domainElement, mappedValue);
@@ -57,16 +57,25 @@ public class MappedElementRule<Domain, Range> implements IBidirectionalMappingRu
 	public boolean updateRange(ReadGraph g, IForwardMapping<Domain, Range> map,
 			Domain domainElement, Range rangeElement)
 			throws MappingException {
-        LOGGER.info("    MappedElementRule.updateRange");   
+        LOGGER.trace("    MappedElementRule.updateRange");   
 	    Domain value = domainAccessor.get(g, domainElement);
         Range mappedValue = value == null ? null : map.map(g, value);////map.get(value);
         return rangeAccessor.set(rangeElement, mappedValue);
 	}	
 	
+	@Override
+	public boolean checkChanges(ReadGraph g, IForwardMapping<Domain, Range> map, Domain domainElement, Range rangeElement) throws MappingException {
+	    Domain value = domainAccessor.get(g, domainElement);
+	    Range mappedValue = value == null ? null : map.map(g, value);
+	    return mappedValue != rangeAccessor.get(rangeElement);
+	}
+	
+    @Override
 	public void createDomain(WriteGraph g, IBackwardMapping<Domain,Range> map, Domain domainElement, Range rangeElement) throws MappingException {
 		updateDomain(g, map, domainElement, rangeElement);
 	};
 	
+    @Override
 	public void createRange(ReadGraph g, IForwardMapping<Domain,Range> map, Domain domainElement, Range rangeElement) throws MappingException {
 		updateRange(g, map, domainElement, rangeElement);
 	};