import org.simantics.objmap.structural.IStructuralObject;\r
import org.simantics.utils.datastructures.MapList;\r
\r
import org.simantics.objmap.structural.IStructuralObject;\r
import org.simantics.utils.datastructures.MapList;\r
\r
-public abstract class ComponentNode<T extends Connection, T2 extends IComponentNode> extends Node implements IComponentNode<T, T2>{\r
+public abstract class ComponentNode<T extends Connection<T,T2>, T2 extends IComponentNode<T,T2>> extends Node implements IComponentNode<T, T2>{\r
public List<T2> getAllConnectedNodes() {\r
List<T2> list = new ArrayList<T2>();\r
for (T c : getAllConnections()) {\r
public List<T2> getAllConnectedNodes() {\r
List<T2> list = new ArrayList<T2>();\r
for (T c : getAllConnections()) {\r
- \r
- @Override\r
- public void addConnection(String id, T c) {\r
- assert(isValidConnectionId(id));\r
- if (!isPartOfInstantiatedModel())\r
- _addConnection(id, c);\r
- else\r
- _addConnection(id+"/str", c);\r
- }\r
- \r
- @Override\r
- public void removeConnection(String id, T c) {\r
- assert(isValidConnectionId(id));\r
- if (!isPartOfInstantiatedModel())\r
- _removeConnection(id, c);\r
- else\r
- _removeConnection(id+"/str", c);\r
- }\r
- \r
- @Override\r
- public void removeConnection(String id) {\r
- assert(isValidConnectionId(id));\r
- if (!isPartOfInstantiatedModel())\r
- _removeConnection(id);\r
- else\r
- _removeConnection(id+"/str");\r
- }\r
+ \r
+ @Override\r
+ public void addConnection(String id, T c) {\r
+ assert(isValidConnectionId(id));\r
+ if (!isPartOfInstantiatedModel())\r
+ _addConnection(id, c);\r
+ else\r
+ _addConnection(id+"/str", c);\r
+ }\r
+ \r
+ @Override\r
+ public void removeConnection(String id, T c) {\r
+ assert(isValidConnectionId(id));\r
+ if (!isPartOfInstantiatedModel())\r
+ _removeConnection(id, c);\r
+ else\r
+ _removeConnection(id+"/str", c);\r
+ }\r
+ \r
+ @Override\r
+ public void removeConnection(String id) {\r
+ assert(isValidConnectionId(id));\r
+ if (!isPartOfInstantiatedModel())\r
+ _removeConnection(id);\r
+ else\r
+ _removeConnection(id+"/str");\r
+ }\r
protected void _addConnection(String id, T c) {\r
connections.add(id, c);\r
protected void _addConnection(String id, T c) {\r
connections.add(id, c);\r
public List<T2> getConnectedNodes(String id) {\r
List<T2> list = new ArrayList<T2>();\r
for (T c : getConnections(id)) {\r
public List<T2> getConnectedNodes(String id) {\r
List<T2> list = new ArrayList<T2>();\r
for (T c : getConnections(id)) {\r