X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.g3d.vtk%2Fsrc%2Forg%2Fsimantics%2Fg3d%2Fvtk%2Fcommon%2FNodeSelectionProvider2.java;fp=org.simantics.g3d.vtk%2Fsrc%2Forg%2Fsimantics%2Fg3d%2Fvtk%2Fcommon%2FNodeSelectionProvider2.java;h=d5b8d70953db52e3dac044cbd224613537b24fa4;hb=6dd5b348d85e1b5d9dffa9422a01388701b061eb;hp=5de69f354b03b38142772ccb227bd339589f95c6;hpb=517b6a896ae890717bdc55931c05b00b3e578da4;p=simantics%2F3d.git

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 5de69f35..d5b8d709 100644
--- 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
@@ -29,6 +29,7 @@ import org.simantics.g3d.scenegraph.base.INode;
 import org.simantics.g3d.tools.AdaptationUtils;
 import org.simantics.objmap.graph.IMapping;
 import org.simantics.objmap.structural.StructuralResource;
+import org.simantics.utils.ui.AdaptionUtils;
 
 import vtk.vtkProp;
 
@@ -69,6 +70,22 @@ public class NodeSelectionProvider2<DBObject,JavaObject> implements ISelectionPr
 	
 	@Override
 	public void setSelection(ISelection selection) {
+	    Collection<IG3DNode> nodes = AdaptionUtils.adaptToCollection(selection, IG3DNode.class);
+	    Collection<Resource> resources= AdaptionUtils.adaptToCollection(selection, Resource.class);
+	    if (nodes.size() > 0) {
+	        processSelection(selection);
+	        fireSelectionChanged(this);
+	    } else if (resources.size() > 0) {
+	        nodes = new ArrayList<IG3DNode>();
+	        for (Resource r : resources) {
+	            JavaObject n  = mapping.get((DBObject)r);
+	            if (n instanceof IG3DNode) {
+	                nodes.add((IG3DNode)n);
+	            }
+	        }
+	        processSelection(new StructuredSelection(nodes.toArray()));
+	        fireSelectionChanged(this);
+	    }
 		
 	}