From e5fdebd03118e352fde4d523e7f9dc1c057c1155 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 23 Dec 2013 21:11:13 +0400 Subject: [PATCH] Rename method --- .../src/org/jetbrains/jet/codegen/state/JetTypeMapper.java | 2 +- .../lang/resolve/java/resolver/DescriptorResolverUtils.java | 2 +- .../jet/lang/resolve/java/resolver/JavaClassResolver.java | 2 +- .../resolve/java/resolver/JavaPackageFragmentProvider.java | 4 ++-- .../java/resolver/JavaPackageFragmentProviderImpl.java | 6 +++--- .../ktSignature/KotlinSignatureAnnotationIntention.java | 2 +- .../ktSignature/KotlinSignatureInJavaMarkerProvider.java | 2 +- .../jet/plugin/libraries/DecompiledDataFactory.java | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java index 524091ae94e..21e50cd314f 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java @@ -154,7 +154,7 @@ public class JetTypeMapper extends BindingTraceAware { } r.append(pathItem.shortName().asString()); - JetScope memberScope = javaFragmentProvider.getOrCreatePackage(pathItem).getMemberScope(); + JetScope memberScope = javaFragmentProvider.getPackageFragment(pathItem).getMemberScope(); if (memberScope instanceof JavaClassStaticMembersScope) { r.append("$"); } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java index 120f03965e8..131eda1f175 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java @@ -276,7 +276,7 @@ public final class DescriptorResolverUtils { "java class " + javaClass + " is under non-java fragment: " + packageFragment; JavaPackageFragmentProvider provider = ((JavaPackageFragmentDescriptorImpl) packageFragment).getProvider(); - return provider.getOrCreatePackage(getFqNameSafe(javaClass)); + return provider.getPackageFragment(getFqNameSafe(javaClass)); } public static boolean isJavaClassVisibleAsPackage(@NotNull JavaClass javaClass) { diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java index b9c0b128fb2..be5552ac746 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java @@ -385,7 +385,7 @@ public final class JavaClassResolver { } else { FqName parentFqName = childClassFQName.parent(); - PackageFragmentDescriptor parentPackage = packageFragmentProvider.getOrCreatePackage(parentFqName); + PackageFragmentDescriptor parentPackage = packageFragmentProvider.getPackageFragment(parentFqName); if (parentPackage == null) { throw new IllegalStateException("Could not resolve " + parentFqName + " required to be parent for " + childClassFQName); } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProvider.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProvider.java index d24176441bf..f477504c4b3 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProvider.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProvider.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; -import org.jetbrains.jet.lang.resolve.java.descriptor.JavaPackageFragmentDescriptorImpl; +import org.jetbrains.jet.lang.resolve.java.descriptor.JavaPackageFragmentDescriptor; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; @@ -32,7 +32,7 @@ public interface JavaPackageFragmentProvider extends PackageFragmentProvider { JavaDescriptorResolver getJavaDescriptorResolver(); @Nullable - JavaPackageFragmentDescriptorImpl getOrCreatePackage(@NotNull FqName fqName); + JavaPackageFragmentDescriptor getPackageFragment(@NotNull FqName fqName); @NotNull Collection getClassNamesInPackage(@NotNull FqName packageName); diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProviderImpl.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProviderImpl.java index cc95141503f..fba11ea87b5 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProviderImpl.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProviderImpl.java @@ -102,13 +102,13 @@ public final class JavaPackageFragmentProviderImpl implements JavaPackageFragmen @NotNull @Override public List getPackageFragments(@NotNull FqName fqName) { - return ContainerUtil.createMaybeSingletonList(getOrCreatePackage(fqName)); + return ContainerUtil.createMaybeSingletonList(getPackageFragment(fqName)); } @NotNull @Override public Collection getSubPackagesOf(@NotNull FqName fqName) { - JavaPackageFragmentDescriptorImpl packageFragment = getOrCreatePackage(fqName); + JavaPackageFragmentDescriptorImpl packageFragment = getPackageFragment(fqName); if (packageFragment == null) { return Collections.emptyList(); } @@ -118,7 +118,7 @@ public final class JavaPackageFragmentProviderImpl implements JavaPackageFragmen @Override @Nullable - public JavaPackageFragmentDescriptorImpl getOrCreatePackage(@NotNull final FqName fqName) { + public JavaPackageFragmentDescriptorImpl getPackageFragment(@NotNull final FqName fqName) { if (packageFragments.containsKey(fqName)) { return packageFragments.get(fqName); } diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java index 52598dae78d..647b7140327 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java @@ -187,7 +187,7 @@ public class KotlinSignatureAnnotationIntention extends BaseIntentionAction impl @NotNull private static JetScope getMemberScope(PsiModifierListOwner psiModifierListOwner, FqName classFqName, JavaDescriptorResolver javaDescriptorResolver) { if (psiModifierListOwner.hasModifierProperty(PsiModifier.STATIC)) { - PackageFragmentDescriptor packageFragment = javaDescriptorResolver.getPackageFragmentProvider().getOrCreatePackage(classFqName); + PackageFragmentDescriptor packageFragment = javaDescriptorResolver.getPackageFragmentProvider().getPackageFragment(classFqName); assert packageFragment != null: "Couldn't resolve package fragment for " + classFqName; return packageFragment.getMemberScope(); } diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java index b4fb9fe1470..865a17d8831 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java @@ -167,7 +167,7 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider { @NotNull PsiMember member ) { if (member.hasModifierProperty(PsiModifier.STATIC)) { - PackageFragmentDescriptor packageFragment = javaDescriptorResolver.getPackageFragmentProvider().getOrCreatePackage(classFqName); + PackageFragmentDescriptor packageFragment = javaDescriptorResolver.getPackageFragmentProvider().getPackageFragment(classFqName); if (packageFragment == null) { return null; } diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java index ee4e0e30fc0..bf7f1eb512a 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java @@ -85,7 +85,7 @@ public final class DecompiledDataFactory { appendDecompiledTextAndPackageName(packageFqName); SerializedDataHeader.Kind kind = classFileHeader.getKind(); if (kind == SerializedDataHeader.Kind.PACKAGE) { - PackageFragmentDescriptor pf = javaDescriptorResolver.getPackageFragmentProvider().getOrCreatePackage(packageFqName); + PackageFragmentDescriptor pf = javaDescriptorResolver.getPackageFragmentProvider().getPackageFragment(packageFqName); if (pf != null) { for (DeclarationDescriptor member : sortDeclarations(pf.getMemberScope().getAllDescriptors())) { if (!(member instanceof ClassDescriptor)) {