From 1d8547a78900615b3befdd8eaafb7e29ecc2b1bc Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 23 Dec 2013 18:57:07 +0400 Subject: [PATCH] Factory method moved to the top --- .../JavaPackageFragmentDescriptorImpl.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPackageFragmentDescriptorImpl.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPackageFragmentDescriptorImpl.java index 87cecd413f0..9585c0c35a9 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPackageFragmentDescriptorImpl.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPackageFragmentDescriptorImpl.java @@ -32,8 +32,19 @@ import org.jetbrains.jet.lang.types.TypeSubstitutor; import java.util.Collections; public class JavaPackageFragmentDescriptorImpl extends DeclarationDescriptorImpl implements JavaPackageFragmentDescriptor { + @Nullable + public static JavaPackageFragmentDescriptorImpl create( + @NotNull JavaPackageFragmentProvider provider, + @NotNull FqName fqName, + @NotNull NullableFunction scopeFactory + ) { + JavaPackageFragmentDescriptorImpl descriptor = new JavaPackageFragmentDescriptorImpl(provider, fqName, scopeFactory); + return descriptor.memberScope == null ? null : descriptor; + } + private final JavaPackageFragmentProvider provider; private final FqName fqName; + private final JavaPackageFragmentScope memberScope; private JavaPackageFragmentDescriptorImpl( @@ -47,16 +58,6 @@ public class JavaPackageFragmentDescriptorImpl extends DeclarationDescriptorImpl this.memberScope = scopeFactory.fun(this); } - @Nullable - public static JavaPackageFragmentDescriptorImpl create( - @NotNull JavaPackageFragmentProvider provider, - @NotNull FqName fqName, - @NotNull NullableFunction scopeFactory - ) { - JavaPackageFragmentDescriptorImpl descriptor = new JavaPackageFragmentDescriptorImpl(provider, fqName, scopeFactory); - return descriptor.memberScope == null ? null : descriptor; - } - @NotNull @Override public ModuleDescriptor getContainingDeclaration() {