X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop%2Fsrc%2Forg%2Fsimantics%2Finterop%2Fbrowsing%2FImportNode.java;h=af39f8936e228778d3b5f31e7f5da7d8418e9f0b;hb=68c3d5a59d0543b3583e590f5a8d00716216dee0;hp=6af1cad963c76320c1812bc901f3ea253ba235aa;hpb=addef29765d6f72760c2d6b3ae4f6fe7123323cc;p=simantics%2Finterop.git

diff --git a/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode.java b/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode.java
index 6af1cad..af39f89 100644
--- a/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode.java
+++ b/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode.java
@@ -7,7 +7,6 @@ import java.util.List;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ISelection;
 import org.simantics.browsing.ui.content.Labeler.Modifier;
-import org.simantics.db.Builtins;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.Session;
@@ -15,16 +14,17 @@ import org.simantics.db.WriteGraph;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.interop.Activator;
 import org.simantics.interop.stubs.InteropResource;
-import org.simantics.modeling.ui.modelBrowser.model.INode;
 
 public class ImportNode implements INode {
 	
-	private Resource project;
+	//private Resource project;
+	private Resource model;
 	
 	public ImportNode(Resource project) {
-		this.project = project;
+		this.model = project;
 	}
 	
+	@SuppressWarnings("rawtypes")
 	@Override
 	public Object getAdapter(Class adapter) {
 		return null;
@@ -72,36 +72,17 @@ public class ImportNode implements INode {
 	@Override
 	public Collection<?> getChildren(ReadGraph graph) throws DatabaseException {
 		List<INode> nodes = new ArrayList<INode>();
-		Builtins b = graph.getBuiltins();
 		InteropResource i = InteropResource.getInstance(graph);
-		Collection<Resource> models = graph.getObjects(project, b.ConsistsOf);
-		for (Resource m : models) {
-			Collection<Resource> objs = graph.getObjects(m, b.ConsistsOf);
-			for (Resource o : objs) {
-				if (graph.isInstanceOf(o, i.ImportLibrary)) {
-					INode node = graph.adapt(o, INode.class);
-					nodes.add(node);
-				}
+		
+		Collection<Resource> objs = graph.getObjects(model, i.HasImportData);
+		for (Resource o : objs) {
+			if (graph.isInstanceOf(o, i.ImportLibrary)) {
+				INode node = graph.adapt(o, INode.class);
+				nodes.add(node);
 			}
 		}
 		return nodes;
 		
-//		ComosResource c = ComosResource.getInstance(graph);
-//		Collection<Resource> models = graph.getObjects(project, b.ConsistsOf);
-//		Collection<ComosGraphNode> comosImports = new ArrayList<ComosGraphNode>();
-//		for (Resource m : models) {
-//			Collection<Resource> objs = graph.getObjects(m, b.ConsistsOf);
-//			for (Resource o : objs) {
-//				if (graph.isInstanceOf(o, c.ComosImportLibrary)) {
-//					String icon_db_path = ComosGraphTools.getIconPath(o, graph);
-//					if (icon_db_path == null)
-//						continue;
-//					ComosIconReader iconReader = new ComosIconReader(icon_db_path);
-//					comosImports.add(new ComosGraphNode(o, iconReader));
-//				}
-//			}
-//		}
-//		return comosImports;
 	}