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=7454d738c1667ebdc90e9d097a93f61448152da7;hb=0cb9829cf7fbee31bbc952c6313b01e195e8d010;hpb=969bd23cab98a79ca9101af33334000879fb60c5

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 7454d738c..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
@@ -1,73 +1,82 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2013 Association for Decentralized Information Management
- * in Industry THTH ry.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.objmap.graph.rules;
-
-import org.apache.log4j.Logger;
-import org.simantics.db.ReadGraph;
-import org.simantics.db.WriteGraph;
-import org.simantics.objmap.backward.IBackwardMapping;
-import org.simantics.objmap.bidirectional.IBidirectionalMappingRule;
-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;
-
-
-
-
-/**
- * A rule that synchronizes collection of elements between
- * domain and range accessors. Elements are mapped from
- * between domain and range during the synchronization.
- * @author Hannu Niemistö
- */
-public class MappedElementRule<Domain, Range> implements IBidirectionalMappingRule<Domain, Range> {
-    
-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
-    
-	IDomainAccessor<Domain,Domain> domainAccessor;
-	IRangeAccessor<Range,Range> rangeAccessor;
-	
-	public MappedElementRule(IDomainAccessor<Domain,Domain> domainAccessor,
-            IRangeAccessor<Range,Range> rangeAccessor) {
-        this.domainAccessor = domainAccessor;
-        this.rangeAccessor = rangeAccessor;
-    }
-
-    @Override
-	public boolean updateDomain(WriteGraph g, IBackwardMapping<Domain, Range> map,
-			Domain domainElement, Range rangeElement)
-			throws MappingException {
-        LOGGER.info("    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);
-	}
-
-	@Override
-	public boolean updateRange(ReadGraph g, IForwardMapping<Domain, Range> map,
-			Domain domainElement, Range rangeElement)
-			throws MappingException {
-        LOGGER.info("    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);
-	}	
-	
-	public void createDomain(WriteGraph g, IBackwardMapping<Domain,Range> map, Domain domainElement, Range rangeElement) throws MappingException {
-		updateDomain(g, map, domainElement, rangeElement);
-	};
-	
-	public void createRange(ReadGraph g, IForwardMapping<Domain,Range> map, Domain domainElement, Range rangeElement) throws MappingException {
-		updateRange(g, map, domainElement, rangeElement);
-	};
-}
+/*******************************************************************************
+ * Copyright (c) 2007, 2013 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.objmap.graph.rules;
+
+import java.util.Objects;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.WriteGraph;
+import org.simantics.objmap.backward.IBackwardMapping;
+import org.simantics.objmap.bidirectional.IBidirectionalMappingRule;
+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
+ * domain and range accessors. Elements are mapped from
+ * between domain and range during the synchronization.
+ * @author Hannu Niemistö
+ */
+public class MappedElementRule<Domain, Range> implements IBidirectionalMappingRule<Domain, Range> {
+    
+    static final Logger LOGGER = LoggerFactory.getLogger(MappedElementRule.class);
+    
+	IDomainAccessor<Domain,Domain> domainAccessor;
+	IRangeAccessor<Range,Range> rangeAccessor;
+	
+	public MappedElementRule(IDomainAccessor<Domain,Domain> domainAccessor,
+            IRangeAccessor<Range,Range> rangeAccessor) {
+        this.domainAccessor = domainAccessor;
+        this.rangeAccessor = rangeAccessor;
+    }
+
+    @Override
+	public boolean updateDomain(WriteGraph g, IBackwardMapping<Domain, Range> map,
+			Domain domainElement, Range rangeElement)
+			throws MappingException {
+        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);
+	}
+
+	@Override
+	public boolean updateRange(ReadGraph g, IForwardMapping<Domain, Range> map,
+			Domain domainElement, Range rangeElement)
+			throws MappingException {
+        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);
+	};
+}