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

Rename method

Browse Source
This commit is contained in:
Andrey Breslav
2013-12-23 21:11:13 +04:00
parent 230e534989
commit e5fdebd031
8 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java
+1 -1
View File
@@ -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("$");
}
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java
+1 -1
View File
@@ -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) {
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java
+1 -1
View File
@@ -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);
}
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProvider.java
+2 -2
View File
@@ -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<Name> getClassNamesInPackage(@NotNull FqName packageName);
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProviderImpl.java
+3 -3
View File
@@ -102,13 +102,13 @@ public final class JavaPackageFragmentProviderImpl implements JavaPackageFragmen
@NotNull
@Override
public List<PackageFragmentDescriptor> getPackageFragments(@NotNull FqName fqName) {
return ContainerUtil.<PackageFragmentDescriptor>createMaybeSingletonList(getOrCreatePackage(fqName));
return ContainerUtil.<PackageFragmentDescriptor>createMaybeSingletonList(getPackageFragment(fqName));
}
@NotNull
@Override
public Collection<FqName> 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);
}
idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java
+1 -1
View File
@@ -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();
}
idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java
+1 -1
View File
@@ -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;
}
idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java
+1 -1
View File
@@ -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)) {