X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scenegraph.loader%2Fsrc%2Forg%2Fsimantics%2Fscenegraph%2Floader%2FScenegraphLoaderUtils.java;h=b4b68a002ff4f360b0f30a1f9b7acbe366813aba;hb=c4f4133d961fb96ae7a99c86678cb09fb9aff1f5;hp=acf585dcc91ccb131cb111afeb42d074ffee9e29;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.scenegraph.loader/src/org/simantics/scenegraph/loader/ScenegraphLoaderUtils.java b/bundles/org.simantics.scenegraph.loader/src/org/simantics/scenegraph/loader/ScenegraphLoaderUtils.java
index acf585dcc..b4b68a002 100644
--- a/bundles/org.simantics.scenegraph.loader/src/org/simantics/scenegraph/loader/ScenegraphLoaderUtils.java
+++ b/bundles/org.simantics.scenegraph.loader/src/org/simantics/scenegraph/loader/ScenegraphLoaderUtils.java
@@ -15,7 +15,7 @@ import org.simantics.db.ReadGraph;
 import org.simantics.db.RequestProcessor;
 import org.simantics.db.Resource;
 import org.simantics.db.common.NamedResource;
-import org.simantics.db.common.procedure.adapter.ListenerAdapter;
+import org.simantics.db.common.procedure.adapter.ProcedureAdapter;
 import org.simantics.db.common.request.BinaryRead;
 import org.simantics.db.common.request.ParametrizedPrimitiveRead;
 import org.simantics.db.common.request.ResourceRead;
@@ -29,6 +29,7 @@ import org.simantics.db.layer0.variable.Variable;
 import org.simantics.db.layer0.variable.VariableBuilder;
 import org.simantics.db.layer0.variable.Variables;
 import org.simantics.db.procedure.Listener;
+import org.simantics.db.procedure.Procedure;
 import org.simantics.layer0.Layer0;
 import org.simantics.scenegraph.INode;
 import org.simantics.scenegraph.LoaderNode;
@@ -41,10 +42,13 @@ import org.simantics.utils.DataContainer;
 import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.threads.IThreadWorkQueue;
 import org.simantics.utils.threads.ThreadUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ScenegraphLoaderUtils {
-	
-	static Map<Pair<Variable, String>, Collection<Listener<Object>>> externalMap = new HashMap<Pair<Variable, String>, Collection<Listener<Object>>>(); 
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ScenegraphLoaderUtils.class);
+	static Map<Pair<Variable, String>, Collection<Procedure<Object>>> externalMap = new HashMap<Pair<Variable, String>, Collection<Procedure<Object>>>(); 
 	static Map<Pair<Variable, String>, Object> externalValueMap = new HashMap<Pair<Variable, String>, Object>(); 
 
 	final public static class ScenegraphPropertyReference<T> {
@@ -59,12 +63,12 @@ public class ScenegraphLoaderUtils {
 			public void register(ReadGraph graph, final Listener<T> procedure) {
 				Object value = externalValueMap.get(parameter);
 				procedure.execute((T)value);
-				Collection<Listener<Object>> listeners = externalMap.get(parameter);
+				Collection<Procedure<Object>> listeners = externalMap.get(parameter);
 				if(listeners == null) {
-					listeners = new ArrayList<Listener<Object>>();
+					listeners = new ArrayList<Procedure<Object>>();
 					externalMap.put(parameter, listeners);
 				}
-				listeners.add(new ListenerAdapter<Object>() {
+				listeners.add(new ProcedureAdapter<Object>() {
 					
 					@Override
 					public void execute(Object result) {
@@ -353,9 +357,9 @@ public class ScenegraphLoaderUtils {
     		public Boolean apply(String property, Object value) {
     			Pair<Variable, String> key = Pair.make(reference.first, reference.second + "#" + property);
     			externalValueMap.put(key, value);
-    			Collection<Listener<Object>> listeners = externalMap.get(key);
+    			Collection<Procedure<Object>> listeners = externalMap.get(key);
     			if(listeners != null) {
-    				for(Listener<Object> listener : listeners) listener.execute(value);
+    				for(Procedure<Object> listener : listeners) listener.execute(value);
     			}
     			return true;
     		}
@@ -505,10 +509,9 @@ public class ScenegraphLoaderUtils {
 		try {
 			return node.getClass().getField(propertyName);
 		} catch (SecurityException e) {
-			e.printStackTrace();
+			LOGGER.error("node: " + node, e);
 		} catch (NoSuchFieldException e) {
-			System.err.println("node:" + node);
-			e.printStackTrace();
+			LOGGER.error("node: " + node, e);
 		}
 		return null;
 	}