Compiler warning elimination

[simantics/3d.git] / org.simantics.g3d.csg / src / org / simantics / g3d / csg / adapters / CSGSolidModelAdapter.java

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 e1000c1692bc6ef063ccb3ab5fa13ed872809a4f..2bfde870f6c2680810e2ff3e1b55b1acc646478a 100644 (file)
--- 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;\r
 import org.simantics.objmap.structural.IStructuralObject;\r
 import org.simantics.opencascade.SolidModelProvider;\r
-import org.simantics.ui.SimanticsUI;\r
+import org.simantics.Simantics;\r
 \r
 public class CSGSolidModelAdapter implements SolidModelProvider, IAdaptable, IStructuralObject {\r
        \r
@@ -42,7 +42,7 @@ public class CSGSolidModelAdapter implements SolidModelProvider, IAdaptable, ISt
        \r
        @Override\r
        public Collection<TopoDS_Shape> getModel() throws Exception {\r
-               return SimanticsUI.getSession().syncRequest(new Read<Collection<TopoDS_Shape>>() {\r
+               return Simantics.getSession().syncRequest(new Read<Collection<TopoDS_Shape>>() {\r
                        @Override\r
                        public Collection<TopoDS_Shape> perform(ReadGraph graph)\r
                                        throws DatabaseException {\r
@@ -62,11 +62,10 @@ public class CSGSolidModelAdapter implements SolidModelProvider, IAdaptable, ISt
        \r
        }\r
        \r
-       @SuppressWarnings("rawtypes")\r
        @Override\r
-       public Object getAdapter(Class adapter) {\r
-               if (Resource.class.equals(adapter))\r
-                       return model;\r
+       public <C> C getAdapter(Class<C> adapter) {\r
+               if (adapter.isAssignableFrom(Resource.class))\r
+                       return adapter.cast(model);\r
                return null;\r
        }\r
        \r