Fix change comparison expressions in mapping rules

[simantics/platform.git] / bundles / org.simantics.objmap2 / src / org / simantics / objmap / graph / rules / MappedElementRule.java

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