From f5b35e39ac30187519e6907f1393b09963335e84 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 13 Dec 2012 20:50:40 +0400 Subject: [PATCH] Removed all but default constructors of DescriptorRendererImpl. --- .../jet/renderer/DescriptorRendererImpl.java | 26 +++++-------------- .../AddKotlinSignatureAnnotation.java | 3 +-- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java index e5d358788f8..fe6a5ae7482 100644 --- a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java @@ -47,13 +47,13 @@ public class DescriptorRendererImpl implements Renderer { } } - public static final DescriptorRendererImpl COMPACT_WITH_MODIFIERS = new DescriptorRendererImpl() { + public static final DescriptorRendererImpl COMPACT_WITH_MODIFIERS = new DescriptorRendererImpl(false, null) { @Override protected boolean shouldRenderDefinedIn() { return false; } }; - public static final DescriptorRendererImpl COMPACT = new DescriptorRendererImpl() { + public static final DescriptorRendererImpl COMPACT = new DescriptorRendererImpl(false, null) { @Override protected boolean shouldRenderDefinedIn() { return false; @@ -64,7 +64,7 @@ public class DescriptorRendererImpl implements Renderer { return false; } }; - public static final DescriptorRendererImpl STARTS_FROM_NAME = new DescriptorRendererImpl() { + public static final DescriptorRendererImpl STARTS_FROM_NAME = new DescriptorRendererImpl(false, null) { @Override protected boolean shouldRenderDefinedIn() { return false; @@ -80,16 +80,16 @@ public class DescriptorRendererImpl implements Renderer { return true; } }; - public static final DescriptorRendererImpl TEXT = new DescriptorRendererImpl(); - public static final DescriptorRendererImpl SHORT_NAMES_IN_TYPES = new DescriptorRendererImpl(true); - public static final DescriptorRendererImpl DEBUG_TEXT = new DescriptorRendererImpl() { + public static final DescriptorRendererImpl TEXT = new DescriptorRendererImpl(false, null); + public static final DescriptorRendererImpl SHORT_NAMES_IN_TYPES = new DescriptorRendererImpl(true, null); + public static final DescriptorRendererImpl DEBUG_TEXT = new DescriptorRendererImpl(false, null) { @Override protected boolean hasDefaultValue(ValueParameterDescriptor descriptor) { // hasDefaultValue() has effects return descriptor.declaresDefaultValue(); } }; - public static final DescriptorRendererImpl HTML = new HtmlDescriptorRendererImpl(); + public static final DescriptorRendererImpl HTML = new HtmlDescriptorRendererImpl(false, null); //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// protected final DeclarationDescriptorVisitor subVisitor = new RenderDeclarationDescriptorVisitor() { @Override @@ -113,14 +113,6 @@ public class DescriptorRendererImpl implements Renderer { @Nullable private final ValueParametersHandler handler; - public DescriptorRendererImpl() { - this(false, null); - } - - public DescriptorRendererImpl(boolean shortNames) { - this(shortNames, null); - } - public DescriptorRendererImpl(boolean shortNames, @Nullable ValueParametersHandler handler) { this.shortNames = shortNames; this.handler = handler; @@ -331,10 +323,6 @@ public class DescriptorRendererImpl implements Renderer { } public static class HtmlDescriptorRendererImpl extends DescriptorRendererImpl { - public HtmlDescriptorRendererImpl() { - super(); - } - public HtmlDescriptorRendererImpl(boolean shortNames, @Nullable ValueParametersHandler handler) { super(shortNames, handler); } diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java index 71cf9d960b4..05612a56f43 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java @@ -39,7 +39,6 @@ import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetIcons; import org.jetbrains.jet.renderer.DescriptorRendererImpl; @@ -53,7 +52,7 @@ import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUt * @since 16 Aug 2012 */ public class AddKotlinSignatureAnnotation extends BaseIntentionAction implements Iconable { - private static final DescriptorRendererImpl RENDERER = new DescriptorRendererImpl(true) { + private static final DescriptorRendererImpl RENDERER = new DescriptorRendererImpl(true, null) { @Override protected boolean shouldRenderDefinedIn() { return false;