X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop%2Fsrc%2Forg%2Fsimantics%2Finterop%2Fbrowsing%2FImportNode2.java;h=54a8adaef71298bef19509f12e241ad7570b87c6;hb=043bd03f3df17a137451cf51e2f9f01b251737c2;hp=38fb562b540f2b601684590e8a6bf38b594e7e0b;hpb=23c438c2c5f4ceb6a2e72b13a8fa0d576722831c;p=simantics%2Finterop.git

diff --git a/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode2.java b/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode2.java
index 38fb562..54a8ada 100644
--- a/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode2.java
+++ b/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode2.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;
@@ -17,6 +16,7 @@ import org.simantics.interop.Activator;
 import org.simantics.interop.stubs.InteropResource;
 import org.simantics.modeling.ui.modelBrowser.model.INode;
 
+@SuppressWarnings("deprecation")
 public class ImportNode2 implements INode {
 	
 	private Resource project;
@@ -25,6 +25,7 @@ public class ImportNode2 implements INode {
 		this.project = project;
 	}
 	
+	@SuppressWarnings("rawtypes")
 	@Override
 	public Object getAdapter(Class adapter) {
 		return null;
@@ -72,19 +73,9 @@ public class ImportNode2 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(project, b.ConsistsOf);
+
+		Collection<Resource> objs = graph.getObjects(project, i.HasImportData);
 		for (Resource o : objs) {
 			if (graph.isInstanceOf(o, i.ImportLibrary)) {
 				INode node = graph.adapt(o, INode.class);
@@ -92,23 +83,7 @@ public class ImportNode2 implements INode {
 			}
 		}
 		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;
+
 	}