diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NamespaceFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NamespaceFactory.java index f039640d763..e1a254255e4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NamespaceFactory.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NamespaceFactory.java @@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorImpl; import org.jetbrains.jet.lang.resolve.name.FqName; public interface NamespaceFactory { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java index b68d3f5cdef..6e7c52da101 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java @@ -24,7 +24,6 @@ import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl; import org.jetbrains.jet.lang.parsing.JetScriptDefinition; import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPackageFragmentDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPackageFragmentDescriptor.java index 936f40d5246..3b151f27ec6 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPackageFragmentDescriptor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPackageFragmentDescriptor.java @@ -22,16 +22,14 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorVisitor; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.DeclarationDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorParent; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.jet.lang.descriptors.impl.DeclarationDescriptorImpl; import org.jetbrains.jet.lang.resolve.java.resolver.JavaPackageFragmentProvider; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.TypeSubstitutor; import java.util.Collections; -import java.util.List; public class JavaPackageFragmentDescriptor extends DeclarationDescriptorImpl implements PackageFragmentDescriptor { private final JavaPackageFragmentProvider provider; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java index 8b60ccf6d46..53645a88cf2 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java @@ -19,14 +19,13 @@ package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; -import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorParent; import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.types.TypeSubstitutor; import java.util.List; -public interface ModuleDescriptor extends DeclarationDescriptor, NamespaceDescriptorParent { +public interface ModuleDescriptor extends DeclarationDescriptor { @Override @Nullable DeclarationDescriptor getContainingDeclaration(); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptor.java index 7b93787651d..acafe0b5a51 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptor.java @@ -17,19 +17,14 @@ package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorParent; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; @Deprecated -public interface NamespaceDescriptor extends ClassOrNamespaceDescriptor, NamespaceDescriptorParent { +public interface NamespaceDescriptor extends ClassOrNamespaceDescriptor { @NotNull JetScope getMemberScope(); - @Override - @NotNull - NamespaceDescriptorParent getContainingDeclaration(); - @NotNull FqName getFqName(); } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractNamespaceDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractNamespaceDescriptorImpl.java deleted file mode 100644 index d2595fdb558..00000000000 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractNamespaceDescriptorImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2010-2013 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.impl; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorVisitor; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.TypeSubstitutor; - -import java.util.List; - -public abstract class AbstractNamespaceDescriptorImpl extends DeclarationDescriptorNonRootImpl implements NamespaceDescriptor { - public AbstractNamespaceDescriptorImpl( - @NotNull NamespaceDescriptorParent containingDeclaration, - List annotations, - @NotNull Name name) { - - super(containingDeclaration, annotations, name); - - boolean rootAccordingToContainer = containingDeclaration instanceof ModuleDescriptor; - if (rootAccordingToContainer != name.isSpecial()) { - throw new IllegalStateException("something is wrong, name: " + name + ", container: " + containingDeclaration); - } - } - - @Override - @NotNull - public NamespaceDescriptorParent getContainingDeclaration() { - return (NamespaceDescriptorParent) super.getContainingDeclaration(); - } - - @NotNull - @Override - public NamespaceDescriptor substitute(@NotNull TypeSubstitutor substitutor) { - throw new UnsupportedOperationException("This operation does not make sense for a namespace"); - } - - @Override - public R accept(DeclarationDescriptorVisitor visitor, D data) { - throw new UnsupportedOperationException("namespaces are retired"); - } -} diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorImpl.java deleted file mode 100644 index e23a98c03f5..00000000000 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorImpl.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright 2010-2013 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.impl; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.WritableScope; - -import java.util.List; - -@Deprecated -public class NamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl { - - private WritableScope memberScope; - private NamespaceLikeBuilder builder; - - public NamespaceDescriptorImpl(@NotNull NamespaceDescriptorParent containingDeclaration, - @NotNull List annotations, - @NotNull Name name) { - super(containingDeclaration, annotations, name); - } - - public void initialize(@NotNull WritableScope memberScope) { - if (this.memberScope != null) { - throw new IllegalStateException("Namespace member scope reinitialize"); - } - - this.memberScope = memberScope; - } - - @Override - @NotNull - public WritableScope getMemberScope() { - return memberScope; - } - - @NotNull - @Override - public FqName getFqName() { - return DescriptorUtils.getFQName(this).toSafe(); - } - - @NotNull - public NamespaceLikeBuilder getBuilder() { - if (builder == null) { - builder = new ScopeBasedNamespaceLikeBuilder(this, getMemberScope()); - } - return builder; - } -} diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorParent.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorParent.java deleted file mode 100644 index a41febc9065..00000000000 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorParent.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2010-2013 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.impl; - -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; - -// TODO 2 remove -@Deprecated -public interface NamespaceDescriptorParent extends DeclarationDescriptor { - -}