Compiler warning elimination

[simantics/3d.git] / org.simantics.g3d / src / org / simantics / g3d / scenegraph / structural / G3DComponentNode.java

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 d9a6777f863fb4f1cebe52ad4c73cb7b3437d2a4..692913656bde8c3e9c05ea547803dc6c9e2c7736 100644 (file)
--- 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 @@
+/*******************************************************************************\r
+ * Copyright (c) 2012, 2013 Association for Decentralized Information Management in\r
+ * Industry THTH ry.\r
+ * All rights reserved. This program and the accompanying materials\r
+ * are made available under the terms of the Eclipse Public License v1.0\r
+ * which accompanies this distribution, and is available at\r
+ * http://www.eclipse.org/legal/epl-v10.html\r
+ *\r
+ * Contributors:\r
+ *     VTT Technical Research Centre of Finland - initial API and implementation\r
+ *******************************************************************************/\r
 package org.simantics.g3d.scenegraph.structural;\r
 \r
 import java.util.ArrayList;\r
@@ -15,7 +26,7 @@ import org.simantics.objmap.graph.annotations.RelatedSetValue;
 import org.simantics.objmap.structural.IStructuralObject;\r
 import org.simantics.utils.datastructures.MapList;\r
 \r
-public abstract class G3DComponentNode<T extends Connection, T2 extends IComponentNode> extends G3DNode implements IComponentNode<T, T2>{\r
+public abstract class G3DComponentNode<T extends Connection<T,T2>, T2 extends IComponentNode<T,T2>> extends G3DNode implements IComponentNode<T, T2>{\r
 \r
        \r
        private String name;\r
@@ -119,40 +130,41 @@ public abstract class G3DComponentNode<T extends Connection, T2 extends ICompone
                return list;\r
        }\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
+       \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
        private MapList<String, T> connections = new MapList<String, T>();\r
        \r
        \r
+       @SuppressWarnings("unchecked")\r
        protected void _addConnection(String id, T c) {\r
                connections.add(id, c);\r
-               c.addConnect(this);\r
+               c.addConnect((T2) this);\r
                firePropertyChanged(id);\r
        }\r
        \r