X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.g3d.vtk%2Fsrc%2Forg%2Fsimantics%2Fg3d%2Fvtk%2Fcommon%2FSelectionHighlighter.java;h=7aa2ad4d6ff5587fbd46ce825855cda10362d39d;hb=9077bfb55726c21bbaa09b5d2b6e11310b677c67;hp=dec7421152fd683ed4da8fccfc1f8b2b1b45d0f0;hpb=84132a1d750c45f9161afbd58b78572964e50d26;p=simantics%2F3d.git

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 dec74211..7aa2ad4d 100644
--- 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<E extends IG3DNode> implements ISelectionChangedListener{
+public class SelectionHighlighter<DBObject> implements ISelectionChangedListener {
 
+	protected VtkView panel;
+	protected VTKNodeMap<DBObject,?> nodeMap;
 	
+	protected List<IG3DNode> selectedNodes = new ArrayList<IG3DNode>();
+	protected List<vtkActor> selectedActors = new ArrayList<vtkActor>();
 	
-	VtkView panel;
-	VTKNodeMap<E> nodeMap;
+	protected HighlightObjectType type = HighlightObjectType.Node;
 	
-	List<IG3DNode> selectedNodes = new ArrayList<IG3DNode>();
-	List<vtkActor> selectedActors = new ArrayList<vtkActor>();
-	
-	HighlightObjectType type = HighlightObjectType.Node;
-	
-	public SelectionHighlighter(VtkView panel, VTKNodeMap<E> nodeMap) {
+	public SelectionHighlighter(VtkView panel, VTKNodeMap<DBObject,?> nodeMap) {
 		this.panel = panel;
 		this.nodeMap = nodeMap;
 	}
@@ -72,7 +70,7 @@ public class SelectionHighlighter<E extends IG3DNode> implements ISelectionChang
 			
 	}
 	
-	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<E extends IG3DNode> implements ISelectionChang
 			}
 			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<E extends IG3DNode> implements ISelectionChang
 		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);
 	}
 	
-	
-	protected 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;