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

Removed redundant field in JavaPackageScope.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-03-12 19:12:18 +04:00
parent f43631377b
commit dad2ba34aa
1 changed files with 1 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/scope/JavaPackageScope.java
+1 -4
View File
@@ -33,8 +33,6 @@ import static org.jetbrains.jet.lang.resolve.java.scope.ScopeUtils.computeAllPac
public abstract class JavaPackageScope extends JavaBaseScope { public abstract class JavaPackageScope extends JavaBaseScope {
@NotNull
private final PackagePsiDeclarationProvider declarationProvider;
@NotNull @NotNull
private final FqName packageFQN; private final FqName packageFQN;
@@ -45,7 +43,6 @@ public abstract class JavaPackageScope extends JavaBaseScope {
@NotNull JavaSemanticServices semanticServices @NotNull JavaSemanticServices semanticServices
) { ) {
super(descriptor, semanticServices, declarationProvider); super(descriptor, semanticServices, declarationProvider);
this.declarationProvider = declarationProvider;
this.packageFQN = packageFQN; this.packageFQN = packageFQN;
} }
@@ -78,7 +75,7 @@ public abstract class JavaPackageScope extends JavaBaseScope {
@Override @Override
protected Collection<DeclarationDescriptor> computeAllDescriptors() { protected Collection<DeclarationDescriptor> computeAllDescriptors() {
Collection<DeclarationDescriptor> result = super.computeAllDescriptors(); Collection<DeclarationDescriptor> result = super.computeAllDescriptors();
result.addAll(computeAllPackageDeclarations(declarationProvider.getPsiPackage(), semanticServices)); result.addAll(computeAllPackageDeclarations(((PackagePsiDeclarationProvider) declarationProvider).getPsiPackage(), semanticServices));
return result; return result;
} }
} }