Removed namespaces from descriptor visitor.

compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java

@@ -105,7 +105,7 @@ public class JdkAnnotationsValidityTest extends UsefulTestCase {
                 int chunkStart = chunkIndex * CLASSES_IN_CHUNK;
                 for (FqName javaClass : affectedClasses.subList(chunkStart, Math.min(chunkStart + CLASSES_IN_CHUNK, affectedClasses.size()))) {
                     ClassDescriptor topLevelClass = javaDescriptorResolver.resolveClass(javaClass, IGNORE_KOTLIN_SOURCES);
-                    PackageViewDescriptor topLevelPackage = javaDescriptorResolver.getPackageFragmentProvider().getModule().getPackage(javaClass);
+                    PackageViewDescriptor topLevelPackage = injector.getModule().getPackage(javaClass);
                     if (topLevelClass == null) {
                         continue;
                     }
@@ -178,11 +178,6 @@ public class JdkAnnotationsValidityTest extends UsefulTestCase {
             this.errors = errors;
         }
 
-        @Override
-        public Void visitNamespaceDescriptor(NamespaceDescriptor descriptor, Void data) {
-            return visitDeclarationRecursively(descriptor, descriptor.getMemberScope());
-        }
-
         @Override
         public Void visitPackageViewDescriptor(PackageViewDescriptor descriptor, Void data) {
             return visitDeclarationRecursively(descriptor, descriptor.getMemberScope());

compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java

@@ -174,14 +174,6 @@ public class DescriptorValidator {
             assertEquals(accessor, collector, "corresponding property", descriptor, accessor.getCorrespondingProperty());
         }
 
-        @Override
-        public Boolean visitNamespaceDescriptor(
-                NamespaceDescriptor descriptor, DiagnosticCollector collector
-        ) {
-            validateScope(descriptor.getMemberScope(), collector);
-            return true;
-        }
-
         @Override
         public Boolean visitPackageFragmentDescriptor(
                 PackageFragmentDescriptor descriptor, DiagnosticCollector collector
@@ -377,13 +369,6 @@ public class DescriptorValidator {
             }
         }
 
-        @Override
-        public Void visitNamespaceDescriptor(
-                NamespaceDescriptor descriptor, JetScope scope
-        ) {
-            throw new IllegalStateException("namespace don't exist");
-        }
-
         @Override
         public Void visitPackageFragmentDescriptor(
                 PackageFragmentDescriptor descriptor, JetScope scope

compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessor.java

@@ -77,12 +77,6 @@ public class RecursiveDescriptorProcessor {
                    && visitChildren(descriptor.getMemberScope().getAllDescriptors(), data);
         }
 
-        @Override
-        public Boolean visitNamespaceDescriptor(NamespaceDescriptor descriptor, D data) {
-            return applyWorker(descriptor, data)
-                   && visitChildren(descriptor.getMemberScope().getAllDescriptors(), data);
-        }
-
         @Override
         public Boolean visitVariableDescriptor(VariableDescriptor descriptor, D data) {
             return processCallable(descriptor, data);

compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java

@@ -91,12 +91,6 @@ public class RecursiveDescriptorProcessorTest extends KotlinTestWithEnvironment
                 add(prefix + descriptor.getContainingDeclaration().getName() + "." + descriptor.getName(), descriptor);
             }
 
-            @Override
-            public Boolean visitNamespaceDescriptor(NamespaceDescriptor descriptor, Void data) {
-                add(descriptor);
-                return true;
-            }
-
             @Override
             public Boolean visitPackageFragmentDescriptor(PackageFragmentDescriptor descriptor, Void data) {
                 add(descriptor);

core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorVisitor.java

@@ -17,8 +17,6 @@
 package org.jetbrains.jet.lang.descriptors;
 
 public interface DeclarationDescriptorVisitor<R, D> {
-    @Deprecated
-    R visitNamespaceDescriptor(NamespaceDescriptor descriptor, D data);
 
     R visitPackageFragmentDescriptor(PackageFragmentDescriptor descriptor, D data);
 

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractNamespaceDescriptorImpl.java

@@ -54,6 +54,6 @@ public abstract class AbstractNamespaceDescriptorImpl extends DeclarationDescrip
 
     @Override
     public <R, D> R accept(DeclarationDescriptorVisitor<R, D> visitor, D data) {
-        return visitor.visitNamespaceDescriptor(this, data);
+        throw new UnsupportedOperationException("namespaces are retired");
     }
 }

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorVisitorEmptyBodies.java

@@ -38,11 +38,6 @@ public class DeclarationDescriptorVisitorEmptyBodies<R, D> implements Declaratio
         return visitDeclarationDescriptor(descriptor, data);
     }
 
-    @Override
-    public R visitNamespaceDescriptor(NamespaceDescriptor descriptor, D data) {
-        return visitDeclarationDescriptor(descriptor, data);
-    }
-
     @Override
     public R visitPackageFragmentDescriptor(PackageFragmentDescriptor descriptor, D data) {
         return visitDeclarationDescriptor(descriptor, data);

core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java

@@ -744,11 +744,6 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
             return null;
         }
 
-        @Override
-        public Void visitNamespaceDescriptor(NamespaceDescriptor namespaceDescriptor, StringBuilder builder) {
-            return null;
-        }
-
         @Override
         public Void visitPackageFragmentDescriptor(
                 PackageFragmentDescriptor descriptor, StringBuilder builder

idea/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java

@@ -112,8 +112,8 @@ public final class DecompiledNavigationUtils {
     private static FqName getContainerFqName(@NotNull DeclarationDescriptor referencedDescriptor) {
         ClassOrNamespaceDescriptor
                 containerDescriptor = DescriptorUtils.getParentOfType(referencedDescriptor, ClassOrNamespaceDescriptor.class, false);
-        if (containerDescriptor instanceof NamespaceDescriptor) {
-            return PackageClassUtils.getPackageClassFqName(getFQName(containerDescriptor).toSafe());
+        if (containerDescriptor instanceof PackageFragmentDescriptor) {
+            return PackageClassUtils.getPackageClassFqName(((PackageFragmentDescriptor) containerDescriptor).getFqName());
         }
         if (containerDescriptor instanceof ClassDescriptor) {
             ClassKind classKind = ((ClassDescriptor) containerDescriptor).getKind();

idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java

@@ -96,12 +96,6 @@ public class BuiltInsReferenceResolverTest extends ResolveTestCase {
                 return visitDescriptors(descriptor.getDefaultType().getMemberScope().getAllDescriptors());
             }
 
-            @Override
-            public Void visitNamespaceDescriptor(NamespaceDescriptor descriptor, Void data) {
-                descriptors.add(descriptor);
-                return visitDescriptors(descriptor.getMemberScope().getAllDescriptors());
-            }
-
             @Override
             public Void visitPackageViewDescriptor(PackageViewDescriptor descriptor, Void data) {
                 descriptors.add(descriptor);