Thread safety changes in objmap2

[simantics/platform.git] / bundles / org.simantics.objmap2 / src / org / simantics / objmap / structural / annotations / factories / UpdateMethodFactory.java

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/annotations/factories/UpdateMethodFactory.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/annotations/factories/UpdateMethodFactory.java
index b7f1fc237cc3beab8e0ab7d3e6834ff750ffe6f3..c0fee3da6e53c27ed6042c23e58ed881c5fa5564 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/annotations/factories/UpdateMethodFactory.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/annotations/factories/UpdateMethodFactory.java
@@ -1,70 +1,77 @@
-/*******************************************************************************\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.structural.annotations.factories;\r
-\r
-import java.lang.annotation.Annotation;\r
-import java.lang.reflect.Method;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.exception.DatabaseException;\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.factory.IMethodRuleFactory;\r
-\r
-public class UpdateMethodFactory<Domain, Range> implements IMethodRuleFactory<Domain, Range> {\r
-\r
-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");\r
-    \r
-    @Override\r
-    public IBidirectionalMappingRule<Domain, Range> create(ReadGraph g, \r
-            Annotation annotation, \r
-            final Method method)\r
-            throws DatabaseException {\r
-        method.setAccessible(true);\r
-        return new IBidirectionalMappingRule<Domain,Range>() {\r
-            \r
-            @Override\r
-            public boolean updateRange(ReadGraph g, IForwardMapping<Domain, Range> map,\r
-                    Domain domainElement, Range rangeElement)\r
-                    throws MappingException {\r
-                LOGGER.info("    UpdateMethodFactory.updateRange");      \r
-                try {\r
-                    return (Boolean)method.invoke(rangeElement, g, domainElement);\r
-                } catch (Exception e) {\r
-                    // TODO Auto-generated catch block\r
-                    e.printStackTrace();\r
-                }\r
-                return false;\r
-            }\r
-            \r
-            @Override\r
-            public boolean updateDomain(WriteGraph g, IBackwardMapping<Domain,Range> map,\r
-                    Domain domainElement, Range rangeElement)\r
-                    throws MappingException {\r
-                return false;\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
-    }\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.structural.annotations.factories;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.simantics.db.ReadGraph;
+import org.simantics.db.WriteGraph;
+import org.simantics.db.exception.DatabaseException;
+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.factory.IMethodRuleFactory;
+
+public class UpdateMethodFactory<Domain, Range> implements IMethodRuleFactory<Domain, Range> {
+
+    static Logger LOGGER = LoggerFactory.getLogger(UpdateMethodFactory.class);
+    
+    @Override
+    public IBidirectionalMappingRule<Domain, Range> create(ReadGraph g, 
+            Annotation annotation, 
+            final Method method)
+            throws DatabaseException {
+        method.setAccessible(true);
+        return new IBidirectionalMappingRule<Domain,Range>() {
+            
+            @Override
+            public boolean updateRange(ReadGraph g, IForwardMapping<Domain, Range> map,
+                    Domain domainElement, Range rangeElement)
+                    throws MappingException {
+                LOGGER.trace("    UpdateMethodFactory.updateRange");      
+                try {
+                    return (Boolean)method.invoke(rangeElement, g, domainElement);
+                } catch (Exception e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+                return false;
+            }
+            
+            @Override
+            public boolean updateDomain(WriteGraph g, IBackwardMapping<Domain,Range> map,
+                    Domain domainElement, Range rangeElement)
+                    throws MappingException {
+                return false;
+            }
+            
+            @Override
+            public boolean checkChanges(ReadGraph g, IForwardMapping<Domain, Range> map, Domain domainElement,
+                    Range rangeElement) throws MappingException {
+                return false;
+            }
+            
+            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);
+            };
+        };
+    }
+
+}