Thread safety changes in objmap2

[simantics/platform.git] / bundles / org.simantics.objmap2 / src / org / simantics / objmap / graph / schema / SimpleLinkType.java

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/schema/SimpleLinkType.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/schema/SimpleLinkType.java
index 1de0e31fab355321e8fd84f06d6822dc17778216..12dd4c9c03ed6bc5c8442fc5c15083fa893676e6 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/schema/SimpleLinkType.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/schema/SimpleLinkType.java
@@ -64,8 +64,8 @@ public class SimpleLinkType<Range> implements ILinkType<Resource,Range> {
     public Resource createDomainElement(WriteGraph g, Range rangeElement)
             throws MappingException {
         try {
-            if(LOGGER.isInfoEnabled())
-                LOGGER.info("SimpleLinkType.createDomainElement " +
+            if(LOGGER.isTraceEnabled())
+                LOGGER.trace("SimpleLinkType.createDomainElement " +
                         rangeElement.toString()
                 );
             Resource result = g.newResource();
@@ -80,9 +80,9 @@ public class SimpleLinkType<Range> implements ILinkType<Resource,Range> {
     public Range createRangeElement(ReadGraph g, Resource domainElement)
             throws MappingException {
         try {
-            if(LOGGER.isInfoEnabled())
+            if(LOGGER.isTraceEnabled())
                 try { 
-                    LOGGER.info("SimpleLinkType.createRangeElement " +
+                    LOGGER.trace("SimpleLinkType.createRangeElement " +
                                NameUtils.getSafeName(g, domainElement)
                             );
                 } catch(DatabaseException e) {
@@ -104,10 +104,19 @@ public class SimpleLinkType<Range> implements ILinkType<Resource,Range> {
        updateRange(graph, mapping, domainElement, rangeElement);
     };
     
+    @Override
+    public boolean checkChanges(ReadGraph g, IForwardMapping<Resource, Range> map, Resource domainElement,
+            Range rangeElement) throws MappingException {
+        boolean updated = false;
+        for(IBidirectionalMappingRule<Resource, Range> rule : rules)
+            updated |= rule.checkChanges(g, map, domainElement, rangeElement);
+        return updated;
+    }
+    
     public boolean updateDomain(WriteGraph g, IBackwardMapping<Resource,Range> map, Resource domainElement, Range rangeElement) throws MappingException {
-        if(LOGGER.isInfoEnabled())
+        if(LOGGER.isTraceEnabled())
             try { 
-                LOGGER.info("SimpleLinkType.updateDomain " +
+                LOGGER.trace("SimpleLinkType.updateDomain " +
                         NameUtils.getSafeName(g, domainElement) + " " +
                         rangeElement.toString()
                         );
@@ -123,11 +132,11 @@ public class SimpleLinkType<Range> implements ILinkType<Resource,Range> {
     
     public boolean updateRange(ReadGraph g, IForwardMapping<Resource,Range> map, Resource domainElement, Range rangeElement) throws MappingException {
     
-        if(LOGGER.isInfoEnabled())
+        if(LOGGER.isTraceEnabled())
             try { 
-                LOGGER.info("SimpleLinkType.updateRange " +
+                LOGGER.trace("SimpleLinkType.updateRange " +
                                NameUtils.getSafeName(g, domainElement) + " " +
-                        rangeElement.toString()
+                        (rangeElement.getClass().getName() + "@" + Integer.toHexString(rangeElement.hashCode()))
                         );
             } catch(DatabaseException e) {
                 throw new MappingException(e);