Removed extra modules OntologyModule imported to namespace

[simantics/platform.git] / bundles / org.simantics.modeling / src / org / simantics / modeling / scl / ontologymodule / OntologyModule.java

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/scl/ontologymodule/OntologyModule.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/scl/ontologymodule/OntologyModule.java
index 96ee4218236f1719a9888657c4a3b3ed5111b8a8..aa1cffe23508cc2d51b32cb9a9222ac09edded53 100644 (file)
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/scl/ontologymodule/OntologyModule.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/scl/ontologymodule/OntologyModule.java
@@ -1,5 +1,6 @@
 package org.simantics.modeling.scl.ontologymodule;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -15,7 +16,6 @@ import org.simantics.db.common.request.IndexRoot;
 import org.simantics.db.common.uri.UnescapedChildMapOfResource;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.util.EnvironmentRequest;
-import org.simantics.db.layer0.util.RuntimeEnvironmentRequest;
 import org.simantics.db.request.Read;
 import org.simantics.layer0.Layer0;
 import org.simantics.scl.compiler.common.names.Name;
@@ -58,18 +58,14 @@ public class OntologyModule extends LazyModule {
     public static final String SCL_TYPES_NAME = "SCLTypes";
     private static final String DB_MODULE = "Simantics/DB";
     private static final String VARIABLE_MODULE = "Simantics/Variable";
-    private static final Collection<ImportDeclaration> DEPENDENCIES = Arrays.asList(
-            new ImportDeclaration(DB_MODULE, null),
-            new ImportDeclaration(VARIABLE_MODULE, null)
-            );
     private static final TCon RESOURCE = Types.con(DB_MODULE, "Resource");
     private static final TCon BROWSABLE = Types.con(DB_MODULE, "Browsable");
     private static final TCon VARIABLE = Types.con(VARIABLE_MODULE, "Variable");
     
     private Resource ontology;
     private String defaultLocalName;
-    private THashMap<Resource,Map<String,Resource>> childMaps = new THashMap<Resource,Map<String,Resource>>();
-    private List<ImportDeclaration> importDeclarations;
+    private THashMap<Resource,Map<String,Resource>> childMaps = new THashMap<>();
+    private ArrayList<ImportDeclaration> importDeclarations = new ArrayList<>();
     private Environment environment;
     
     public OntologyModule(ReadGraph graph, String moduleName) throws DatabaseException {
@@ -96,7 +92,8 @@ public class OntologyModule extends LazyModule {
                 });
             }
         });
-        this.importDeclarations = pair.first.imports;
+        for(ImportDeclaration decl : pair.first.imports)
+            importDeclarations.add(decl.hidden());
         this.environment = pair.second;
     }
     
@@ -122,7 +119,11 @@ public class OntologyModule extends LazyModule {
         public final Resource resource;
         public JustResource(Resource resource) {
             this.resource = resource;
-        }   
+        }
+        @Override
+        public String toString() {
+            return "JustResource(" + resource + ")";
+        }
     }
     private static class ResourceAndSuffix implements ResourceSearchResult {
         public final Resource resource;
@@ -130,7 +131,11 @@ public class OntologyModule extends LazyModule {
         public ResourceAndSuffix(Resource resource, String suffix) {
             this.resource = resource;
             this.suffix = suffix;
-        }  
+        }
+        @Override
+        public String toString() {
+            return "ResourceAndSuffix(" + resource + ", " + suffix + ")";
+        }
     }
     
     private ResourceSearchResult getResourceOrSuffixedResource(String name) {