Merge "Re-enabled Acorn transaction cancellation support for testing"

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / environment / EmptyNamespace.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/EmptyNamespace.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/EmptyNamespace.java
index 9bffef06b5d93d3bfb4644e3dcf74640c287a49d..f40221eb57cb79717ef93bc7a51f07fdeffc7de5 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/EmptyNamespace.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/environment/EmptyNamespace.java
@@ -1,11 +1,8 @@
 package org.simantics.scl.compiler.environment;
 
-import gnu.trove.procedure.TObjectProcedure;
-
 import java.util.function.Consumer;
 
 import org.simantics.scl.compiler.elaboration.modules.SCLValue;
-import org.simantics.scl.compiler.elaboration.modules.TypeAlias;
 import org.simantics.scl.compiler.elaboration.modules.TypeClass;
 import org.simantics.scl.compiler.elaboration.modules.TypeConstructor;
 import org.simantics.scl.compiler.elaboration.relations.SCLEntityType;
@@ -16,6 +13,8 @@ import org.simantics.scl.compiler.environment.filter.NamespaceFilter;
 import org.simantics.scl.compiler.internal.codegen.effects.EffectConstructor;
 import org.simantics.scl.compiler.types.TCon;
 
+import gnu.trove.procedure.TObjectProcedure;
+
 public enum EmptyNamespace implements Namespace {
     INSTANCE;
 
@@ -39,10 +38,9 @@ public enum EmptyNamespace implements Namespace {
             throws AmbiguousNameException {
         return null;
     }
-
+    
     @Override
-    public TypeConstructor getTypeConstructor(String name)
-            throws AmbiguousNameException {
+    public TypeConstructor getTypeDescriptor(String name) throws AmbiguousNameException {
         return null;
     }
 
@@ -57,11 +55,6 @@ public enum EmptyNamespace implements Namespace {
         return null;
     }
 
-    @Override
-    public TypeAlias getTypeAlias(String name) throws AmbiguousNameException {
-        return null;
-    }
-
     @Override
     public MappingRelation getMappingRelation(String name)
             throws AmbiguousNameException {