X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Futils%2FComponentUtils.java;h=2644ab0f33003ba9580c6d1b26ad9b9cfb75734d;hb=676ff0ba1dd085f94377675f77f2af2566ab56b8;hp=af64f180b5d1fde1fb14a70cd02f76ccce91f8b0;hpb=a460e609147d064dd3da464bcf1626845e0f93b4;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java b/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java
index af64f180..2644ab0f 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java
@@ -10,8 +10,8 @@ import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.common.request.ReadRequest;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.g3d.scenegraph.GeometryProvider;
 import org.simantics.layer0.Layer0;
-import org.simantics.opencascade.SolidModelProvider;
 import org.simantics.plant3d.ontology.Plant3D;
 import org.simantics.plant3d.scenegraph.EndComponent;
 import org.simantics.plant3d.scenegraph.InlineComponent;
@@ -24,7 +24,7 @@ public class ComponentUtils {
 
 	
 	private static Map<String,Class<? extends PipelineComponent>> clazzes = new HashMap<String, Class<? extends PipelineComponent>>();
-	private static Map<String,SolidModelProvider> providers = new HashMap<String,SolidModelProvider>();
+	private static Map<String,GeometryProvider> providers = new HashMap<String,GeometryProvider>();
 	
 	public static void preloadCache() {
 		Simantics.getSession().asyncRequest(new ReadRequest() {
@@ -36,7 +36,7 @@ public class ComponentUtils {
 				types.add(Plant3D.URIs.Builtin_Elbow);
 				types.add(Plant3D.URIs.Builtin_ConcentricReducer);
 				types.add(Plant3D.URIs.Builtin_BranchSplitComponent);
-//				types.add(Plant3D.URIs.Builtin_EccentricReducer);
+				types.add(Plant3D.URIs.Builtin_EccentricReducer);
 				
 				for (String typeURI : types) {
 					load(graph, typeURI);
@@ -45,7 +45,7 @@ public class ComponentUtils {
 		});
 	}
 	
-	private static SolidModelProvider getProvider(ReadGraph graph, Resource type) throws DatabaseException {
+	private static GeometryProvider getProvider(ReadGraph graph, Resource type) throws DatabaseException {
 		
 		Layer0 l0 = Layer0.getInstance(graph);
 		Plant3D p3d = Plant3D.getInstance(graph);
@@ -59,7 +59,7 @@ public class ComponentUtils {
 			}
 		}
 		if (geom != null) {
-			SolidModelProvider provider = graph.adapt(geom, SolidModelProvider.class);
+			GeometryProvider provider = graph.adapt(geom, GeometryProvider.class);
 			return provider;
 		}
 		return null;
@@ -82,7 +82,7 @@ public class ComponentUtils {
 		Plant3D p3d = Plant3D.getInstance(graph);
 		Resource type = graph.getResource(typeURI);
 		
-		SolidModelProvider provider = getProvider(graph, type);
+		GeometryProvider provider = getProvider(graph, type);
 		if (provider != null || graph.hasStatement(type,p3d.NonVisibleComponent)) {
 			providers.put(typeURI, provider);
 			ComponentUtils.clazzes.put(typeURI,getClazz(graph, type));
@@ -103,7 +103,7 @@ public class ComponentUtils {
 	
 	public static PipelineComponent createComponent(P3DRootNode root, String typeURI) throws Exception {
 		Class<? extends PipelineComponent> type = clazzes.get(typeURI);
-		SolidModelProvider provider = providers.get(typeURI);
+		GeometryProvider provider = providers.get(typeURI);
 		if (type == null || provider == null) {
 			load(typeURI);
 			type = clazzes.get(typeURI);