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=da945733caf267fed4cf28206cc99f4f57fbd1e9;hp=714e7a5bc4d2a6fdbf33e4826bab47e7f9fceac5;hpb=87b3241ec277ba3d8e414b26186a032c9cdcaeed;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 714e7a5b..c955dc6a 100644
--- a/org.simantics.g3d/src/org/simantics/g3d/scenegraph/G3DNode.java
+++ b/org.simantics.g3d/src/org/simantics/g3d/scenegraph/G3DNode.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2013 Association for Decentralized Information Management in
+ * Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
 package org.simantics.g3d.scenegraph;
 
 import javax.vecmath.Quat4d;
@@ -7,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;
@@ -138,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;
 	}