X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.g3d.csg%2Fsrc%2Forg%2Fsimantics%2Fg3d%2Fcsg%2Fscenegraph2%2FCSGrootNode.java;h=2f3a3cacd1ca527da125e26d7a027c995b9efcfe;hb=9f84331c9967c88e0e5550ce91f2b7e364a5cb6d;hp=d88b42ed66adbc77863f986c094c93315e3a7d6e;hpb=9c5be9fa9ff5fece5710b9f21bcafca58388899d;p=simantics%2F3d.git

diff --git a/org.simantics.g3d.csg/src/org/simantics/g3d/csg/scenegraph2/CSGrootNode.java b/org.simantics.g3d.csg/src/org/simantics/g3d/csg/scenegraph2/CSGrootNode.java
index d88b42ed..2f3a3cac 100644
--- a/org.simantics.g3d.csg/src/org/simantics/g3d/csg/scenegraph2/CSGrootNode.java
+++ b/org.simantics.g3d.csg/src/org/simantics/g3d/csg/scenegraph2/CSGrootNode.java
@@ -19,6 +19,7 @@ import java.util.Stack;
 import javax.vecmath.Quat4d;
 import javax.vecmath.Vector3d;
 
+import org.simantics.db.Resource;
 import org.simantics.g3d.csg.editor.CSGNodeMap;
 import org.simantics.g3d.csg.ontology.CSG;
 import org.simantics.g3d.math.MathTools;
@@ -36,7 +37,7 @@ import vtk.vtkProp;
 
 
 @GraphType(CSG.URIs.Model)
-public class CSGrootNode extends ParentNode<ICSGnode> implements IG3DNode, NodeMapProvider<vtkProp, ICSGnode> {
+public class CSGrootNode extends ParentNode<ICSGnode> implements IG3DNode, NodeMapProvider<Resource,vtkProp, ICSGnode> {
 	
 	
 	private CSGNodeMap nodeMap;
@@ -46,7 +47,7 @@ public class CSGrootNode extends ParentNode<ICSGnode> implements IG3DNode, NodeM
 	}
 	
 	@Override
-	public NodeMap<vtkProp, ICSGnode> getNodeMap() {
+	public NodeMap<Resource,vtkProp, ICSGnode> getNodeMap() {
 		return nodeMap;
 	}
 	
@@ -158,9 +159,9 @@ public class CSGrootNode extends ParentNode<ICSGnode> implements IG3DNode, NodeM
 	
 
 	@Override
-	public Object getAdapter(Class adapter) {
-		if (NodeMap.class == adapter)
-			return nodeMap;
+	public <C> C getAdapter(Class<C> adapter) {
+		if (adapter.isAssignableFrom(NodeMap.class))
+			return adapter.cast(nodeMap);
 		return null;
 	}