X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.g3d%2Fsrc%2Forg%2Fsimantics%2Fg3d%2Fscenegraph%2Fstructural%2FG3DComponentNode.java;h=692913656bde8c3e9c05ea547803dc6c9e2c7736;hb=refs%2Fchanges%2F60%2F3460%2F1;hp=d9a6777f863fb4f1cebe52ad4c73cb7b3437d2a4;hpb=87b3241ec277ba3d8e414b26186a032c9cdcaeed;p=simantics%2F3d.git

diff --git a/org.simantics.g3d/src/org/simantics/g3d/scenegraph/structural/G3DComponentNode.java b/org.simantics.g3d/src/org/simantics/g3d/scenegraph/structural/G3DComponentNode.java
index d9a6777f..69291365 100644
--- a/org.simantics.g3d/src/org/simantics/g3d/scenegraph/structural/G3DComponentNode.java
+++ b/org.simantics.g3d/src/org/simantics/g3d/scenegraph/structural/G3DComponentNode.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 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.g3d.scenegraph.structural;
 
 import java.util.ArrayList;
@@ -15,7 +26,7 @@ import org.simantics.objmap.graph.annotations.RelatedSetValue;
 import org.simantics.objmap.structural.IStructuralObject;
 import org.simantics.utils.datastructures.MapList;
 
-public abstract class G3DComponentNode<T extends Connection, T2 extends IComponentNode> extends G3DNode implements IComponentNode<T, T2>{
+public abstract class G3DComponentNode<T extends Connection<T,T2>, T2 extends IComponentNode<T,T2>> extends G3DNode implements IComponentNode<T, T2>{
 
 	
 	private String name;
@@ -119,40 +130,41 @@ public abstract class G3DComponentNode<T extends Connection, T2 extends ICompone
 		return list;
 	}
 	
-    
-    @Override
-    public void addConnection(String id, T c) {
-    	assert(isValidConnectionId(id));
-    	if (!isPartOfInstantiatedModel())
-    		_addConnection(id, c);
-    	else
-    		_addConnection(id+"/str", c);
-    }
-    
-    @Override
-    public void removeConnection(String id, T c) {
-    	assert(isValidConnectionId(id));
-    	if (!isPartOfInstantiatedModel())
-    		_removeConnection(id, c);
-    	else
-    		_removeConnection(id+"/str", c);
-    }
-    
-    @Override
-    public void removeConnection(String id) {
-    	assert(isValidConnectionId(id));
-    	if (!isPartOfInstantiatedModel())
-    		_removeConnection(id);
-    	else
-    		_removeConnection(id+"/str");
-    }
+	
+	@Override
+	public void addConnection(String id, T c) {
+		assert(isValidConnectionId(id));
+		if (!isPartOfInstantiatedModel())
+			_addConnection(id, c);
+		else
+			_addConnection(id+"/str", c);
+	}
+	
+	@Override
+	public void removeConnection(String id, T c) {
+		assert(isValidConnectionId(id));
+		if (!isPartOfInstantiatedModel())
+			_removeConnection(id, c);
+		else
+			_removeConnection(id+"/str", c);
+	}
+	
+	@Override
+	public void removeConnection(String id) {
+		assert(isValidConnectionId(id));
+		if (!isPartOfInstantiatedModel())
+			_removeConnection(id);
+		else
+			_removeConnection(id+"/str");
+	}
 	
 	private MapList<String, T> connections = new MapList<String, T>();
 	
 	
+	@SuppressWarnings("unchecked")
 	protected void _addConnection(String id, T c) {
 		connections.add(id, c);
-		c.addConnect(this);
+		c.addConnect((T2) this);
 		firePropertyChanged(id);
 	}