azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove constructor parameter of JavaNamespaceDescriptor

Browse Source
This commit is contained in:
Stepan Koltsov
2012-06-17 00:40:41 +04:00
parent 9ddbe4a414
commit 49178e6cff
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
-2
View File
@@ -37,7 +37,6 @@ import org.jetbrains.jet.lang.resolve.constants.StringValue;
import org.jetbrains.jet.lang.resolve.java.kt.JetClassAnnotation;
import org.jetbrains.jet.lang.resolve.java.kt.PsiAnnotationWithFlags;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.resolve.name.NamePredicate;
import org.jetbrains.jet.lang.types.*;
@@ -694,7 +693,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
JavaNamespaceDescriptor ns = new JavaNamespaceDescriptor(
parentNs,
Collections.<AnnotationDescriptor>emptyList(), // TODO
qualifiedName.isRoot() ? FqNameUnsafe.ROOT_NAME : qualifiedName.shortName(),
qualifiedName
);
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaNamespaceDescriptor.java
+2 -2
View File
@@ -34,8 +34,8 @@ public class JavaNamespaceDescriptor extends AbstractNamespaceDescriptorImpl {
private final FqName qualifiedName;
public JavaNamespaceDescriptor(NamespaceDescriptorParent containingDeclaration, List<AnnotationDescriptor> annotations,
@NotNull Name name, @NotNull FqName qualifiedName) {
super(containingDeclaration, annotations, name);
@NotNull FqName qualifiedName) {
super(containingDeclaration, annotations, qualifiedName.shortNameOrSpecial());
this.qualifiedName = qualifiedName;
}