From 6a68de9a8b8afd26a6a84b432dbd572252f02074 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Sat, 7 Apr 2012 23:16:48 +0400 Subject: [PATCH] useless class --- .../resolve/java/JavaDescriptorResolver.java | 29 +++---------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java index a4e76518949..37a598a616a 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java @@ -138,20 +138,8 @@ public class JavaDescriptorResolver { public abstract List getTypeParameters(); } - static abstract class ResolverClassData extends ResolverScopeData { - - @NotNull - public abstract ClassDescriptor getClassDescriptor(); - - @NotNull - @Override - public List getTypeParameters() { - return getClassDescriptor().getTypeConstructor().getParameters(); - } - } - /** Class with instance members */ - static class ResolverBinaryClassData extends ResolverClassData { + static class ResolverBinaryClassData extends ResolverScopeData { ResolverBinaryClassData() { } @@ -160,26 +148,17 @@ public class JavaDescriptorResolver { List typeParameters; - @Override @NotNull public ClassDescriptor getClassDescriptor() { return classDescriptor; } - } - static class ResolverSrcClassData extends ResolverClassData { @NotNull - private final ClassDescriptor classDescriptor; - - ResolverSrcClassData(@NotNull ClassDescriptor classDescriptor) { - this.classDescriptor = classDescriptor; - } - @Override - @NotNull - public ClassDescriptor getClassDescriptor() { - return classDescriptor; + public List getTypeParameters() { + return getClassDescriptor().getTypeConstructor().getParameters(); } + } /** Either package or class with static members */