X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.g3d%2Fsrc%2Forg%2Fsimantics%2Fg3d%2Fscenegraph%2FG3DNode.java;h=c955dc6a3d21642bc23b4ff5b3f4420f177b74bd;hb=d207cfa3235339e7d7b894494be400160b121bd5;hp=c05269924534685fc0ef1992e1863bd4997a5b4a;hpb=289aaab900078ef56efc8779e4b15830e472149e;p=simantics%2F3d.git

diff --git a/org.simantics.g3d/src/org/simantics/g3d/scenegraph/G3DNode.java b/org.simantics.g3d/src/org/simantics/g3d/scenegraph/G3DNode.java
index c0526992..c955dc6a 100644
--- a/org.simantics.g3d/src/org/simantics/g3d/scenegraph/G3DNode.java
+++ b/org.simantics.g3d/src/org/simantics/g3d/scenegraph/G3DNode.java
@@ -18,7 +18,6 @@ import org.simantics.g3d.ontology.G3D;
 import org.simantics.g3d.property.annotations.GetPropertyValue;
 import org.simantics.g3d.property.annotations.PropertyContributor;
 import org.simantics.g3d.property.annotations.SetPropertyValue;
-import org.simantics.g3d.scenegraph.base.INode;
 import org.simantics.g3d.scenegraph.base.Node;
 import org.simantics.g3d.tools.NodeTools;
 import org.simantics.objmap.graph.annotations.RelatedGetValue;
@@ -149,11 +148,9 @@ public class G3DNode extends Node implements IG3DNode {
 	}
 	
 	@Override
-	public Object getAdapter(Class adapter) {
-		if (INode.class == adapter)
-			return this;
-		if (IG3DNode.class == adapter)
-			return this;
+	public <C> C getAdapter(Class<C> adapter) {
+		if (adapter.isInstance(this))
+			return adapter.cast(this);
 		return null;
 	}