WithDeferredResolve removed (it was never used)

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java

@@ -37,8 +37,7 @@ import java.util.List;
 /**
  * @author Stepan Koltsov
  */
-public abstract class MutableClassDescriptorLite extends ClassDescriptorBase
-        implements WithDeferredResolve {
+public abstract class MutableClassDescriptorLite extends ClassDescriptorBase {
 
     private List<AnnotationDescriptor> annotations = Lists.newArrayList();
 
@@ -68,16 +67,6 @@ public abstract class MutableClassDescriptorLite extends ClassDescriptorBase
         this.kind = kind;
     }
 
-    @Override
-    public void forceResolve() {
-
-    }
-
-    @Override
-    public boolean isAlreadyResolved() {
-        return false;
-    }
-
     @NotNull
     @Override
     public DeclarationDescriptor getContainingDeclaration() {

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptorImpl.java

@@ -28,7 +28,7 @@ import java.util.List;
 /**
  * @author abreslav
  */
-public class NamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl implements WithDeferredResolve {
+public class NamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl {
 
     private WritableScope memberScope;
 
@@ -102,14 +102,4 @@ public class NamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl imp
 
         return builder;
     }
-
-    @Override
-    public void forceResolve() {
-
-    }
-
-    @Override
-    public boolean isAlreadyResolved() {
-        return false;
-    }
 }

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/WithDeferredResolve.java

@@ -1,25 +0,0 @@
-/*
- * Copyright 2010-2012 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.lang.descriptors;
-
-/**
- * @author Nikolay Krasko
- */
-public interface WithDeferredResolve {
-    void forceResolve();
-    boolean isAlreadyResolved();
-}

compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java

@@ -47,7 +47,7 @@ public class TopDownAnalysisContext implements BodiesResolveContext {
     // File scopes - package scope extended with imports
     protected final Map<JetFile, WritableScope> namespaceScopes = Maps.newHashMap();
 
-    public final Map<JetDeclarationContainer, WithDeferredResolve> forDeferredResolver = Maps.newHashMap();
+    public final Map<JetDeclarationContainer, DeclarationDescriptor> forDeferredResolver = Maps.newHashMap();
 
     public final Map<JetDeclarationContainer, JetScope> normalScope = Maps.newHashMap();
 

compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java

@@ -112,7 +112,7 @@ public class TypeHierarchyResolver {
                 JetDeclarationContainer declarationContainer = forDeferredResolve.poll();
                 assert declarationContainer != null;
 
-                WithDeferredResolve descriptorForDeferredResolve = context.forDeferredResolver.get(declarationContainer);
+                DeclarationDescriptor descriptorForDeferredResolve = context.forDeferredResolver.get(declarationContainer);
                 JetScope scope = context.normalScope.get(declarationContainer);
 
                 // Even more temp code
@@ -668,12 +668,12 @@ public class TypeHierarchyResolver {
 
         private void prepareForDeferredCall(
                 @NotNull JetScope outerScope,
-                @NotNull WithDeferredResolve withDeferredResolve,
+                @NotNull DeclarationDescriptor descriptorForDeferredResolve,
                 @NotNull JetDeclarationContainer container
         ) {
             forDeferredResolve.add(container);
             context.normalScope.put(container, outerScope);
-            context.forDeferredResolver.put(container, withDeferredResolve);
+            context.forDeferredResolver.put(container, descriptorForDeferredResolve);
         }
 
         @Nullable