Renamed class.

compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java

@@ -260,11 +260,11 @@ public class DescriptorDeserializer {
             @NotNull AnnotationDeserializer annotationDeserializer,
             @NotNull NameResolver nameResolver
     ) {
-        assert containingDeclaration instanceof ClassOrNamespaceDescriptor
-                : "Only members in classes or namespaces should be serialized: " + containingDeclaration;
+        assert containingDeclaration instanceof ClassOrPackageFragmentDescriptor
+                : "Only members in classes or package fragments should be serialized: " + containingDeclaration;
         return Flags.HAS_ANNOTATIONS.get(flags)
                ? annotationDeserializer
-                       .loadCallableAnnotations((ClassOrNamespaceDescriptor) containingDeclaration, proto, nameResolver, kind)
+                       .loadCallableAnnotations((ClassOrPackageFragmentDescriptor) containingDeclaration, proto, nameResolver, kind)
                : Collections.<AnnotationDescriptor>emptyList();
     }
 
@@ -371,9 +371,9 @@ public class DescriptorDeserializer {
     @NotNull
     private List<ValueParameterDescriptor> valueParameters(@NotNull Callable callable, @NotNull AnnotatedCallableKind kind) {
         DeclarationDescriptor containerOfCallable = containingDeclaration.getContainingDeclaration();
-        assert containerOfCallable instanceof ClassOrNamespaceDescriptor
-                : "Only members in classes or namespaces should be serialized: " + containerOfCallable;
-        ClassOrNamespaceDescriptor classOrNamespace = (ClassOrNamespaceDescriptor) containerOfCallable;
+        assert containerOfCallable instanceof ClassOrPackageFragmentDescriptor
+                : "Only members in classes or package fragments should be serialized: " + containerOfCallable;
+        ClassOrPackageFragmentDescriptor classOrPackage = (ClassOrPackageFragmentDescriptor) containerOfCallable;
 
         List<Callable.ValueParameter> protos = callable.getValueParameterList();
         List<ValueParameterDescriptor> result = new ArrayList<ValueParameterDescriptor>(protos.size());
@@ -382,7 +382,7 @@ public class DescriptorDeserializer {
             result.add(new ValueParameterDescriptorImpl(
                     containingDeclaration,
                     i,
-                    getAnnotations(classOrNamespace, callable, kind, proto),
+                    getAnnotations(classOrPackage, callable, kind, proto),
                     nameResolver.getName(proto.getName()),
                     typeDeserializer.type(proto.getType()),
                     Flags.DECLARES_DEFAULT_VALUE.get(proto.getFlags()),
@@ -394,13 +394,13 @@ public class DescriptorDeserializer {
 
     @NotNull
     private List<AnnotationDescriptor> getAnnotations(
-            @NotNull ClassOrNamespaceDescriptor classOrNamespace,
+            @NotNull ClassOrPackageFragmentDescriptor classOrPackage,
             @NotNull Callable callable,
             @NotNull AnnotatedCallableKind kind,
             @NotNull Callable.ValueParameter valueParameter
     ) {
         return Flags.HAS_ANNOTATIONS.get(valueParameter.getFlags())
-               ? annotationDeserializer.loadValueParameterAnnotations(classOrNamespace, callable, nameResolver, kind, valueParameter)
+               ? annotationDeserializer.loadValueParameterAnnotations(classOrPackage, callable, nameResolver, kind, valueParameter)
                : Collections.<AnnotationDescriptor>emptyList();
     }
 }

compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameTable.java

@@ -19,7 +19,6 @@ package org.jetbrains.jet.descriptors.serialization;
 import gnu.trove.TObjectHashingStrategy;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.*;
-import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 
@@ -67,7 +66,7 @@ public class NameTable {
         return simpleNames.intern(name.asString());
     }
 
-    public int getFqNameIndex(@NotNull ClassOrNamespaceDescriptor descriptor) {
+    public int getFqNameIndex(@NotNull ClassOrPackageFragmentDescriptor descriptor) {
         QualifiedName.Builder builder = QualifiedName.newBuilder();
         if (descriptor instanceof ClassDescriptor) {
             builder.setKind(QualifiedName.Kind.CLASS);

compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationDeserializer.java

@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.descriptors.serialization.NameResolver;
 import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
-import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor;
+import org.jetbrains.jet.lang.descriptors.ClassOrPackageFragmentDescriptor;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 
 import java.util.List;
@@ -36,7 +36,7 @@ public interface AnnotationDeserializer {
         @NotNull
         @Override
         public List<AnnotationDescriptor> loadCallableAnnotations(
-                @NotNull ClassOrNamespaceDescriptor container,
+                @NotNull ClassOrPackageFragmentDescriptor container,
                 @NotNull ProtoBuf.Callable proto,
                 @NotNull NameResolver nameResolver,
                 @NotNull AnnotatedCallableKind kind
@@ -47,7 +47,7 @@ public interface AnnotationDeserializer {
         @NotNull
         @Override
         public List<AnnotationDescriptor> loadValueParameterAnnotations(
-                @NotNull ClassOrNamespaceDescriptor container,
+                @NotNull ClassOrPackageFragmentDescriptor container,
                 @NotNull ProtoBuf.Callable callable,
                 @NotNull NameResolver nameResolver,
                 @NotNull AnnotatedCallableKind kind,
@@ -74,7 +74,7 @@ public interface AnnotationDeserializer {
 
     @NotNull
     List<AnnotationDescriptor> loadCallableAnnotations(
-            @NotNull ClassOrNamespaceDescriptor container,
+            @NotNull ClassOrPackageFragmentDescriptor container,
             @NotNull ProtoBuf.Callable proto,
             @NotNull NameResolver nameResolver,
             @NotNull AnnotatedCallableKind kind
@@ -82,7 +82,7 @@ public interface AnnotationDeserializer {
 
     @NotNull
     List<AnnotationDescriptor> loadValueParameterAnnotations(
-            @NotNull ClassOrNamespaceDescriptor container,
+            @NotNull ClassOrPackageFragmentDescriptor container,
             @NotNull ProtoBuf.Callable callable,
             @NotNull NameResolver nameResolver,
             @NotNull AnnotatedCallableKind kind,

compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java

@@ -152,7 +152,7 @@ public class DeserializedClassDescriptor extends AbstractClassDescriptor impleme
             return fragments.iterator().next();
         }
         else {
-            ClassOrNamespaceDescriptor result = descriptorFinder.findClass(classId.getOuterClassId());
+            ClassOrPackageFragmentDescriptor result = descriptorFinder.findClass(classId.getOuterClassId());
             return result != null ? result : ErrorUtils.getErrorModule();
         }
     }