From 000dd4478a5882b64146b1a2ba24676b8de8c749 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Tue, 18 Feb 2014 13:40:23 +0400 Subject: [PATCH] Rename --- .../resolve/java/resolver/TraceBasedErrorReporter.java | 2 +- .../jet/lang/resolve/kotlin/VirtualFileKotlinClass.java | 2 +- .../jet/lang/resolve/java/resolver/ErrorReporter.java | 2 +- .../resolve/kotlin/AnnotationDescriptorDeserializer.java | 9 ++++----- .../lang/resolve/kotlin/BaseDescriptorDeserializer.java | 2 +- .../resolve/kotlin/ConstantDescriptorDeserializer.java | 4 ++-- .../resolve/kotlin/DescriptorDeserializersStorage.java | 9 ++++----- .../jet/lang/resolve/kotlin/KotlinJvmBinaryClass.java | 2 +- .../jet/plugin/libraries/DeserializerForDecompiler.kt | 2 +- 9 files changed, 16 insertions(+), 18 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedErrorReporter.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedErrorReporter.java index 0feacda9caf..c41004bedb3 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedErrorReporter.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedErrorReporter.java @@ -59,7 +59,7 @@ public class TraceBasedErrorReporter implements ErrorReporter { } @Override - public void reportAnnotationLoadingError(@NotNull String message, @Nullable Exception exception) { + public void reportLoadingError(@NotNull String message, @Nullable Exception exception) { LOG.error(message, exception); } } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.java index 6699eb29bef..ba9767e052e 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.java @@ -153,7 +153,7 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass { } @Override - public void loadMemberAnnotations(@NotNull final MemberVisitor memberVisitor) { + public void visitMembers(@NotNull final MemberVisitor memberVisitor) { try { new ClassReader(file.contentsToByteArray()).accept(new ClassVisitor(ASM4) { @Override diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ErrorReporter.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ErrorReporter.java index 4f17f8155c3..ccf4684830f 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ErrorReporter.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ErrorReporter.java @@ -26,5 +26,5 @@ public interface ErrorReporter { void reportCannotInferVisibility(@NotNull CallableMemberDescriptor descriptor); - void reportAnnotationLoadingError(@NotNull String message, @Nullable Exception exception); + void reportLoadingError(@NotNull String message, @Nullable Exception exception); } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java index 4ee26553789..8588ce0e594 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java @@ -39,7 +39,6 @@ import org.jetbrains.jet.lang.resolve.java.resolver.ResolverPackage; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.DependencyClassByQualifiedNameResolver; import org.jetbrains.jet.lang.types.ErrorUtils; -import org.jetbrains.jet.lang.types.JetType; import javax.inject.Inject; import java.io.IOException; @@ -81,14 +80,14 @@ public class AnnotationDescriptorDeserializer extends BaseDescriptorDeserializer if (kotlinClass == null) { // This means that the resource we're constructing the descriptor from is no longer present: KotlinClassFinder had found the // class earlier, but it can't now - errorReporter.reportAnnotationLoadingError("Kotlin class for loading class annotations is not found: " + descriptor, null); + errorReporter.reportLoadingError("Kotlin class for loading class annotations is not found: " + descriptor, null); return Annotations.EMPTY; } try { return loadClassAnnotationsFromClass(kotlinClass); } catch (IOException e) { - errorReporter.reportAnnotationLoadingError("Error loading member annotations from Kotlin class: " + kotlinClass, e); + errorReporter.reportLoadingError("Error loading member annotations from Kotlin class: " + kotlinClass, e); return Annotations.EMPTY; } } @@ -207,9 +206,9 @@ public class AnnotationDescriptorDeserializer extends BaseDescriptorDeserializer @NotNull AnnotatedCallableKind kind, @NotNull MemberSignature signature ) { - KotlinJvmBinaryClass kotlinClass = findClassWithMemberAnnotations(container, proto, nameResolver, kind); + KotlinJvmBinaryClass kotlinClass = findClassWithAnnotationsAndInitializers(container, proto, nameResolver, kind); if (kotlinClass == null) { - errorReporter.reportAnnotationLoadingError("Kotlin class for loading member annotations is not found: " + container, null); + errorReporter.reportLoadingError("Kotlin class for loading member annotations is not found: " + container, null); return Annotations.EMPTY; } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BaseDescriptorDeserializer.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BaseDescriptorDeserializer.java index a8e17bae251..694c1d7c0e5 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BaseDescriptorDeserializer.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BaseDescriptorDeserializer.java @@ -97,7 +97,7 @@ public abstract class BaseDescriptorDeserializer { } @Nullable - protected KotlinJvmBinaryClass findClassWithMemberAnnotations( + protected KotlinJvmBinaryClass findClassWithAnnotationsAndInitializers( @NotNull ClassOrPackageFragmentDescriptor container, @NotNull ProtoBuf.Callable proto, @NotNull NameResolver nameResolver, diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/ConstantDescriptorDeserializer.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/ConstantDescriptorDeserializer.java index f024166bfc5..0f240a14531 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/ConstantDescriptorDeserializer.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/ConstantDescriptorDeserializer.java @@ -67,9 +67,9 @@ public class ConstantDescriptorDeserializer extends BaseDescriptorDeserializer i MemberSignature signature = getCallableSignature(proto, nameResolver, kind); if (signature == null) return null; - KotlinJvmBinaryClass kotlinClass = findClassWithMemberAnnotations(container, proto, nameResolver, kind); + KotlinJvmBinaryClass kotlinClass = findClassWithAnnotationsAndInitializers(container, proto, nameResolver, kind); if (kotlinClass == null) { - errorReporter.reportAnnotationLoadingError("Kotlin class for loading property constant is not found: " + container, null); + errorReporter.reportLoadingError("Kotlin class for loading property constant is not found: " + container, null); return null; } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DescriptorDeserializersStorage.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DescriptorDeserializersStorage.java index 147d3e0a5d9..8ef8b037ebe 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DescriptorDeserializersStorage.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DescriptorDeserializersStorage.java @@ -46,11 +46,10 @@ public class DescriptorDeserializersStorage { @Override public Storage invoke(@NotNull KotlinJvmBinaryClass kotlinClass) { try { - return loadMemberAnnotationsFromClass(kotlinClass); + return loadAnnotationsAndInitializers(kotlinClass); } catch (IOException e) { - errorReporter.reportAnnotationLoadingError( - "Error loading member annotations from Kotlin class: " + kotlinClass, e); + errorReporter.reportLoadingError("Error loading member information from Kotlin class: " + kotlinClass, e); return Storage.EMPTY; } } @@ -73,11 +72,11 @@ public class DescriptorDeserializersStorage { } @NotNull - private Storage loadMemberAnnotationsFromClass(@NotNull KotlinJvmBinaryClass kotlinClass) throws IOException { + private Storage loadAnnotationsAndInitializers(@NotNull KotlinJvmBinaryClass kotlinClass) throws IOException { final Map> memberAnnotations = new HashMap>(); final Map> propertyConstants = new HashMap>(); - kotlinClass.loadMemberAnnotations(new KotlinJvmBinaryClass.MemberVisitor() { + kotlinClass.visitMembers(new KotlinJvmBinaryClass.MemberVisitor() { @Nullable @Override public KotlinJvmBinaryClass.MethodAnnotationVisitor visitMethod(@NotNull Name name, @NotNull String desc) { diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinJvmBinaryClass.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinJvmBinaryClass.java index a008a4d1923..c2992d60f16 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinJvmBinaryClass.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinJvmBinaryClass.java @@ -28,7 +28,7 @@ public interface KotlinJvmBinaryClass { void loadClassAnnotations(@NotNull AnnotationVisitor visitor); - void loadMemberAnnotations(@NotNull MemberVisitor visitor); + void visitMembers(@NotNull MemberVisitor visitor); @Nullable KotlinClassHeader getClassHeader(); diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/DeserializerForDecompiler.kt b/idea/src/org/jetbrains/jet/plugin/libraries/DeserializerForDecompiler.kt index 165bd7403f5..74b1dc14025 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/DeserializerForDecompiler.kt +++ b/idea/src/org/jetbrains/jet/plugin/libraries/DeserializerForDecompiler.kt @@ -203,7 +203,7 @@ public class DeserializerForDecompiler(val packageDirectory: VirtualFile, val di private val LOG = Logger.getInstance(javaClass()) private object LOGGING_REPORTER: ErrorReporter { - override fun reportAnnotationLoadingError(message: String, exception: Exception?) { + override fun reportLoadingError(message: String, exception: Exception?) { LOG.error(message, exception) } override fun reportCannotInferVisibility(descriptor: CallableMemberDescriptor) {