Compiler warning elimination

[simantics/3d.git] / org.simantics.g3d.vtk / src / org / simantics / g3d / vtk / common / NodeSelectionProvider2.java

diff --git a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/NodeSelectionProvider2.java b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/NodeSelectionProvider2.java
index b9e3a0e8fc222f330e1e05e91156d945f7180ac3..db4710ed78933fac3883deaac6e6fdb0989f9a2b 100644 (file)
--- a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/NodeSelectionProvider2.java
+++ b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/NodeSelectionProvider2.java
@@ -43,9 +43,9 @@ public class NodeSelectionProvider2<DBObject,JavaObject> implements ISelectionPr
        
        protected IEditorPart part;
        protected IMapping<DBObject,JavaObject> mapping;
-       protected VTKNodeMap nodeMap;
+       protected VTKNodeMap<DBObject, ? extends INode> nodeMap;
        
-       public NodeSelectionProvider2(IEditorPart part, IMapping<DBObject,JavaObject> mapping, VTKNodeMap nodeMap) {
+       public NodeSelectionProvider2(IEditorPart part, IMapping<DBObject,JavaObject> mapping, VTKNodeMap<DBObject, ? extends INode> nodeMap) {
                this.part = part;
                this.mapping = mapping;
                this.nodeMap = nodeMap;
@@ -78,6 +78,7 @@ public class NodeSelectionProvider2<DBObject,JavaObject> implements ISelectionPr
            } else if (resources.size() > 0) {
                nodes = new ArrayList<IG3DNode>();
                for (Resource r : resources) {
+                   @SuppressWarnings("unchecked")
                    JavaObject n  = mapping.get((DBObject)r);
                    if (n instanceof IG3DNode) {
                        nodes.add((IG3DNode)n);
@@ -101,7 +102,6 @@ public class NodeSelectionProvider2<DBObject,JavaObject> implements ISelectionPr
                fireSelectionChanged(event.getSource());
        }
        
-       @SuppressWarnings("unchecked")
        protected void processSelection(ISelection s) {
                selectedNodes.clear();
                selectedItems.clear();
@@ -112,11 +112,12 @@ public class NodeSelectionProvider2<DBObject,JavaObject> implements ISelectionPr
            Collection<vtkProp> selectedActors = AdaptationUtils.adaptToCollection(s, vtkProp.class);
         if (selectedActors.size() > 0) {
             for (vtkProp a : selectedActors) {
-                IG3DNode node = (IG3DNode)nodeMap.getNode((vtkProp)a);
+                INode node = nodeMap.getNode(a);
                 if (node == null)
                     continue;
                 if (!selectedNodes.contains(node))
                     selectedNodes.add(node);
+                @SuppressWarnings("unchecked")
                 DBObject r = mapping.inverseGet((JavaObject)node);
                 selectedItems.add(new VTKSelectionItem<DBObject>(a, node,r));
             }
@@ -125,6 +126,7 @@ public class NodeSelectionProvider2<DBObject,JavaObject> implements ISelectionPr
             for (INode node : selectedNds) {
                 if (!selectedNodes.contains(node))
                     selectedNodes.add((IG3DNode)node);
+                @SuppressWarnings("unchecked")
                 DBObject r = mapping.inverseGet((JavaObject)node);
                 selectedItems.add(new VTKSelectionItem<DBObject>(null, (IG3DNode)node,r));
             }