X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2FSchemaBuilder.java;h=a57a07e76547b56e19ee9a040f7be86ee4fa46d1;hb=HEAD;hp=761e1707da40e865be635af5b22ee23ed0c13324;hpb=22bb24d2a7e26c70b0dd4c57080f2c25ac3d40a8;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/SchemaBuilder.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/SchemaBuilder.java
index 761e1707..a57a07e7 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/SchemaBuilder.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/SchemaBuilder.java
@@ -5,24 +5,26 @@ import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.request.Read;
+import org.simantics.g3d.scenegraph.GeometryProvider;
+import org.simantics.g3d.scenegraph.base.INode;
 import org.simantics.objmap.graph.schema.IMappingSchema;
 import org.simantics.objmap.graph.schema.MappingSchemas;
 import org.simantics.objmap.graph.schema.SimpleSchema;
-import org.simantics.opencascade.SolidModelProvider;
 import org.simantics.plant3d.ontology.Plant3D;
 
 public class SchemaBuilder {
-	public static IMappingSchema<Resource,Object> getSchema() throws DatabaseException{
-		return Simantics.getSession().syncRequest(new Read<IMappingSchema<Resource,Object>>() {
+	public static IMappingSchema<Resource,INode> getSchema() throws DatabaseException{
+		return Simantics.getSession().syncRequest(new Read<IMappingSchema<Resource,INode>>() {
 			@Override
-			public IMappingSchema<Resource,Object> perform(ReadGraph g)
+			public IMappingSchema<Resource,INode> perform(ReadGraph g)
 					throws DatabaseException {
 				return getSchema(g);
 			}
 		});
 	}
 	
-	public static IMappingSchema<Resource,Object> getSchema(ReadGraph g) throws DatabaseException{
+	@SuppressWarnings("unchecked")
+	public static IMappingSchema<Resource,INode> getSchema(ReadGraph g) throws DatabaseException{
 		try {
 			SimpleSchema schema = new SimpleSchema();
 			schema.addLinkType(MappingSchemas.fromAnnotations(g, Equipment.class));
@@ -33,8 +35,8 @@ public class SchemaBuilder {
 			schema.addLinkType(MappingSchemas.fromAnnotations(g, P3DRootNode.class));
 			schema.addLinkType(MappingSchemas.fromAnnotations(g, PipeRun.class));
 			
-			schema.addLinkType(MappingSchemas.fromAdaptable(g, Plant3D.URIs.Builtin_GeometryProvider, SolidModelProvider.class));
-			return schema;
+			schema.addLinkType(MappingSchemas.fromAdaptable(g, Plant3D.URIs.GeometryProvider, GeometryProvider.class));
+			return (IMappingSchema<Resource, INode>)(IMappingSchema<Resource, ?>)schema;
 		} catch (IllegalAccessException e) {
 			throw new DatabaseException(e);
 		} catch (InstantiationException e) {