From 8cbdb2924ae4159d6d483c6671ee5531c87dbad4 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 15 Jul 2013 23:08:28 +0400 Subject: [PATCH] Minor, make callback method empty, not abstract --- .../serialization/AbstractDescriptorFinder.java | 3 ++- .../lang/types/lang/BuiltinsNamespaceDescriptorImpl.java | 8 -------- .../jetbrains/jet/codegen/KotlinClassAnnotationTest.java | 4 ---- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java index 4aaa0f323f5..4cc6dbedb6b 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java @@ -72,5 +72,6 @@ public abstract class AbstractDescriptorFinder implements DescriptorFinder { @Nullable protected abstract ClassData getClassData(@NotNull ClassId classId); - protected abstract void classDescriptorCreated(@NotNull ClassDescriptor classDescriptor); + protected void classDescriptorCreated(@NotNull ClassDescriptor classDescriptor) { + } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java index 7ff2257d9b4..4e50bcdaae8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java @@ -6,9 +6,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.descriptors.serialization.*; import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationDeserializer; import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPackageMemberScope; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; -import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.descriptors.impl.AbstractNamespaceDescriptorImpl; import org.jetbrains.jet.lang.resolve.lazy.storage.NotNullLazyValue; @@ -18,7 +16,6 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import java.io.DataInputStream; -import java.io.EOFException; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -103,11 +100,6 @@ class BuiltinsNamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl { ? classNames.compute() : Collections.emptyList(); } - - @Override - protected void classDescriptorCreated(@NotNull ClassDescriptor classDescriptor) { - // Do nothing - } }; members = new DeserializedPackageMemberScope( diff --git a/compiler/tests/org/jetbrains/jet/codegen/KotlinClassAnnotationTest.java b/compiler/tests/org/jetbrains/jet/codegen/KotlinClassAnnotationTest.java index e8f749f1dfd..22ac85b75ea 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/KotlinClassAnnotationTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/KotlinClassAnnotationTest.java @@ -97,9 +97,5 @@ public class KotlinClassAnnotationTest extends CodegenTestCase { public Collection getClassNames(@NotNull FqName packageName) { throw new UnsupportedOperationException(); } - - @Override - protected void classDescriptorCreated(@NotNull ClassDescriptor classDescriptor) { - } } }