X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.structural2%2Fsrc%2Forg%2Fsimantics%2Fstructural2%2Fvariables%2FStandardProceduralChildVariable.java;h=62d574633b8d948154b4804d997b9a6ef4da3b45;hb=1a8971ec56f21b4532e22d787c3f5a15df0b5f2b;hp=0db9d7033df415da9800f5924bd2d836f343274c;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.structural2/src/org/simantics/structural2/variables/StandardProceduralChildVariable.java b/bundles/org.simantics.structural2/src/org/simantics/structural2/variables/StandardProceduralChildVariable.java
index 0db9d7033..62d574633 100644
--- a/bundles/org.simantics.structural2/src/org/simantics/structural2/variables/StandardProceduralChildVariable.java
+++ b/bundles/org.simantics.structural2/src/org/simantics/structural2/variables/StandardProceduralChildVariable.java
@@ -37,9 +37,11 @@ import org.simantics.structural2.procedural.Interface;
 import org.simantics.structural2.procedural.Property;
 import org.simantics.structural2.procedural.Terminal;
 import org.simantics.utils.datastructures.Pair;
+import org.slf4j.LoggerFactory;
 
 public class StandardProceduralChildVariable extends AbstractChildVariable {
 
+    private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(StandardProceduralChildVariable.class);
 	/*
 	 * Extension points
 	 * 
@@ -73,7 +75,7 @@ public class StandardProceduralChildVariable extends AbstractChildVariable {
         }
         
         @Override
-        public Collection<Variable> getConnectionPoints(ReadGraph graph, Resource relationType) throws DatabaseException {
+        public Collection<Variable> getConnectionPoints(ReadGraph graph, Variable component_, Resource relationType) throws DatabaseException {
         	
         	Set<Variable> result = new THashSet<Variable>();
             for(Pair<String,Resource> cp : cps) {
@@ -84,14 +86,14 @@ public class StandardProceduralChildVariable extends AbstractChildVariable {
             			result.add(desc.getVariable(graph));
             		}
                 else
-                	System.err.println("no cp " + cp.first + " for " + component.getURI(graph));
+                	LOGGER.warn("no cp " + cp.first + " for " + component.getURI(graph));
             }
             return result;
             
         }
         
 		@Override
-		public Collection<String> getConnectionPointURIs(ReadGraph graph, Resource relationType) throws DatabaseException {
+		public Collection<String> getConnectionPointURIs(ReadGraph graph, Variable component_, Resource relationType) throws DatabaseException {
 			
         	Set<String> result = new THashSet<String>();
             for(Pair<String,Resource> cp : cps) {
@@ -102,14 +104,14 @@ public class StandardProceduralChildVariable extends AbstractChildVariable {
             			result.add(desc.getURI(graph));
             		}
                 else
-                	System.err.println("no cp " + cp.first + " for " + component.getURI(graph));
+                	LOGGER.warn("no cp " + cp.first + " for " + component.getURI(graph));
             }
             return result;
 			
 		}
 		
 		@Override
-		public Collection<VariableConnectionPointDescriptor> getConnectionPointDescriptors(ReadGraph graph, Resource relationType) throws DatabaseException {
+		public Collection<VariableConnectionPointDescriptor> getConnectionPointDescriptors(ReadGraph graph, Variable component_, Resource relationType) throws DatabaseException {
 			
         	Set<VariableConnectionPointDescriptor> result = new THashSet<VariableConnectionPointDescriptor>();
             for(Pair<String,Resource> cp : cps) {
@@ -118,7 +120,7 @@ public class StandardProceduralChildVariable extends AbstractChildVariable {
             	if(cp2 != null)
             		result.addAll(ConnectionBrowser.flatten(graph, component, cp.second, relationType));
                 else
-                	System.err.println("no cp " + cp.first + " for " + component.getURI(graph));
+                	LOGGER.warn("no cp " + cp.first + " for " + component.getURI(graph));
             }
             return result;
 			
@@ -269,7 +271,7 @@ public class StandardProceduralChildVariable extends AbstractChildVariable {
 	public Resource getType(ReadGraph graph, Resource baseType) throws DatabaseException {
 		if (graph.isInheritedFrom(type, baseType))
 			return type;
-		throw new NoSingleResultException("variable " + getPossibleURI(graph) + " has no type");
+		throw new NoSingleResultException("variable " + getPossibleURI(graph) + " has no type", -1);
 	}
 	
 	@Override