Compiler warning elimination

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

diff --git a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/SelectionHighlighter.java b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/SelectionHighlighter.java
index 69ed83e2d2dea1857494b445e2635dc0e4ed127e..7aa2ad4d6ff5587fbd46ce825855cda10362d39d 100644 (file)
--- a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/SelectionHighlighter.java
+++ b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/SelectionHighlighter.java
@@ -35,19 +35,17 @@ import vtk.vtkMapper;
 import vtk.vtkProp;
 import vtk.vtkProperty;
 
-public class SelectionHighlighter<DBObject, E extends INode> implements ISelectionChangedListener{
+public class SelectionHighlighter<DBObject> implements ISelectionChangedListener {
 
-       
-       
        protected VtkView panel;
-       protected VTKNodeMap<DBObject,E> nodeMap;
+       protected VTKNodeMap<DBObject,?> nodeMap;
        
        protected List<IG3DNode> selectedNodes = new ArrayList<IG3DNode>();
        protected List<vtkActor> selectedActors = new ArrayList<vtkActor>();
        
        protected HighlightObjectType type = HighlightObjectType.Node;
        
-       public SelectionHighlighter(VtkView panel, VTKNodeMap<DBObject,E> nodeMap) {
+       public SelectionHighlighter(VtkView panel, VTKNodeMap<DBObject,?> nodeMap) {
                this.panel = panel;
                this.nodeMap = nodeMap;
        }
@@ -72,7 +70,7 @@ public class SelectionHighlighter<DBObject, E extends INode> implements ISelecti
                        
        }
        
-       protected void hilight(E node, HighlightEventType type) {
+       protected void hilight(INode node, HighlightEventType type) {
                if (node instanceof NodeHighlighter) {
                        ((NodeHighlighter)node).highlight(type);
                        return;
@@ -109,13 +107,13 @@ public class SelectionHighlighter<DBObject, E extends INode> implements ISelecti
                        }
                        for (IG3DNode node : selectedNodes) {
                                if (!currentSelectedNodes.contains(node)) {
-                                       hilight((E)node, clear);
+                                       hilight((INode)node, clear);
                                        changed = true;
                                }
                        }
                        for (IG3DNode node : currentSelectedNodes) {
                                if (!selectedNodes.contains(node)) {
-                                       hilight((E)node, apply);
+                                       hilight((INode)node, apply);
                                        changed = true;
                                }
                        }
@@ -160,18 +158,17 @@ public class SelectionHighlighter<DBObject, E extends INode> implements ISelecti
                return currentSelectedNodes;
        }
        
-       protected void setDefaultColor(E node) {
+       protected void setDefaultColor(INode node) {
                double color[] = new double[]{1,1,0};
                setColor(node, false, color);
        }
        
-       protected void setSelectedColor(E node) {
+       protected void setSelectedColor(INode node) {
                double color[] = new double[]{1,0,0};
                setColor(node, false, color);
        }
        
-       
-       public void setColor(E node, boolean edge, double color[]) {
+       public void setColor(INode node, boolean edge, double color[]) {
                for (vtkProp prop : nodeMap.getRenderObjects(node)) {
                        if (prop instanceof vtkActor) {
                                vtkActor act = (vtkActor)prop;