X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.g3d.csg%2Fsrc%2Forg%2Fsimantics%2Fg3d%2Fcsg%2Fadapters%2FCSGSolidModelAdapter.java;h=2bfde870f6c2680810e2ff3e1b55b1acc646478a;hb=refs%2Fchanges%2F60%2F3460%2F1;hp=e1000c1692bc6ef063ccb3ab5fa13ed872809a4f;hpb=289aaab900078ef56efc8779e4b15830e472149e;p=simantics%2F3d.git

diff --git a/org.simantics.g3d.csg/src/org/simantics/g3d/csg/adapters/CSGSolidModelAdapter.java b/org.simantics.g3d.csg/src/org/simantics/g3d/csg/adapters/CSGSolidModelAdapter.java
index e1000c16..2bfde870 100644
--- a/org.simantics.g3d.csg/src/org/simantics/g3d/csg/adapters/CSGSolidModelAdapter.java
+++ b/org.simantics.g3d.csg/src/org/simantics/g3d/csg/adapters/CSGSolidModelAdapter.java
@@ -30,7 +30,7 @@ import org.simantics.objmap.graph.Mappings;
 import org.simantics.objmap.graph.schema.IMappingSchema;
 import org.simantics.objmap.structural.IStructuralObject;
 import org.simantics.opencascade.SolidModelProvider;
-import org.simantics.ui.SimanticsUI;
+import org.simantics.Simantics;
 
 public class CSGSolidModelAdapter implements SolidModelProvider, IAdaptable, IStructuralObject {
 	
@@ -42,7 +42,7 @@ public class CSGSolidModelAdapter implements SolidModelProvider, IAdaptable, ISt
 	
 	@Override
 	public Collection<TopoDS_Shape> getModel() throws Exception {
-		return SimanticsUI.getSession().syncRequest(new Read<Collection<TopoDS_Shape>>() {
+		return Simantics.getSession().syncRequest(new Read<Collection<TopoDS_Shape>>() {
 			@Override
 			public Collection<TopoDS_Shape> perform(ReadGraph graph)
 					throws DatabaseException {
@@ -62,11 +62,10 @@ public class CSGSolidModelAdapter implements SolidModelProvider, IAdaptable, ISt
 	
 	}
 	
-	@SuppressWarnings("rawtypes")
 	@Override
-	public Object getAdapter(Class adapter) {
-		if (Resource.class.equals(adapter))
-			return model;
+	public <C> C getAdapter(Class<C> adapter) {
+		if (adapter.isAssignableFrom(Resource.class))
+			return adapter.cast(model);
 		return null;
 	}