X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.objmap2%2Fsrc%2Forg%2Fsimantics%2Fobjmap%2Fgraph%2Fimpl%2FMapping.java;h=c2ecdf1b1679fe7f9fd5bd21ed9a0cef090ea63d;hb=993f8fda339c833e182a540bd4c10d3a91624966;hp=f105a2894c42866f6ccca0cf6d8650c2dc36b406;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/impl/Mapping.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/impl/Mapping.java
index f105a2894..c2ecdf1b1 100644
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/impl/Mapping.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/impl/Mapping.java
@@ -21,7 +21,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.exception.DatabaseException;
@@ -42,7 +43,7 @@ import org.simantics.objmap.graph.schema.IMappingSchema;
  */
 public class Mapping<Domain, Range> implements IMapping<Domain, Range> {
 
-	static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+	static final Logger LOGGER = LoggerFactory.getLogger(Mapping.class);
 	
 	
 	IMappingSchema<Domain, Range> schema;
@@ -72,7 +73,7 @@ public class Mapping<Domain, Range> implements IMapping<Domain, Range> {
 	}
 	
 	private void createDomain(WriteGraph g, Link<Domain,Range> link) throws MappingException {
-	    LOGGER.info("        createDomain for " + link.rangeElement);
+	    LOGGER.trace("        createDomain for " + link.rangeElement);
 		ILinkType<Domain,Range> type = schema.linkTypeOfRangeElement(link.rangeElement);
 		Domain domainElement = type.createDomainElement(g, link.rangeElement);
 		link.type = type;
@@ -263,11 +264,11 @@ public class Mapping<Domain, Range> implements IMapping<Domain, Range> {
 	
 	@Override
 	public synchronized Collection<Domain> updateDomain(WriteGraph g) throws MappingException {
-	    LOGGER.info("Mapping.updateDomain");
+	    LOGGER.trace("Mapping.updateDomain");
 		RangeToDomain map = new RangeToDomain(g);
 		ArrayList<Domain> updated = new ArrayList<Domain>();
 		while(!modifiedRangeLinks.isEmpty()) {
-		    LOGGER.info("    modifiedRangeLinks.size() = " + modifiedRangeLinks.size());
+		    LOGGER.trace("    modifiedRangeLinks.size() = " + modifiedRangeLinks.size());
 		    
 			Link<Domain,Range> link = modifiedRangeLinks.remove(modifiedRangeLinks.size()-1);
 			link.rangeModified = false;
@@ -279,9 +280,10 @@ public class Mapping<Domain, Range> implements IMapping<Domain, Range> {
 			if(link.type == null) {
 				createDomain(g, link);
 			}
-			
-			if(link.type.updateDomain(g, map, link.domainElement, link.rangeElement))
-				updated.add(link.domainElement);
+			else {
+				if(link.type.updateDomain(g, map, link.domainElement, link.rangeElement))
+					updated.add(link.domainElement);
+			}
 		}	
 		if (listensDomain)
 			updateRange(g); //FIXME: without this listening would stop. 
@@ -290,11 +292,11 @@ public class Mapping<Domain, Range> implements IMapping<Domain, Range> {
 	
 	@Override
 	public synchronized Collection<Range> updateRange(ReadGraph g) throws MappingException {
-	    LOGGER.info("Mapping.updateRange");
+	    LOGGER.trace("Mapping.updateRange");
 		DomainToRange map = new DomainToRange(g);
 		ArrayList<Range> updated = new ArrayList<Range>();
 		while(!modifiedDomainLinks.isEmpty()) {		    
-		    LOGGER.info("    modifiedDomainLinks.size() = " + modifiedDomainLinks.size());
+		    LOGGER.trace("    modifiedDomainLinks.size() = " + modifiedDomainLinks.size());
 		    
 			Link<Domain,Range> link = modifiedDomainLinks.remove(modifiedDomainLinks.size()-1);
 			link.domainModified = false;
@@ -357,7 +359,7 @@ public class Mapping<Domain, Range> implements IMapping<Domain, Range> {
 	void domainModified(Link<Domain,Range> link) {
 	    if(!link.domainModified) {	        
 	        synchronized(modifiedDomainLinks) {
-	            LOGGER.info("        domainModified for " + link.rangeElement);
+	            LOGGER.trace("        domainModified for " + link.rangeElement);
                 link.domainModified = true;
                 modifiedDomainLinks.add(link);
                 if(modifiedDomainLinks.size() == 1) {