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

Removed all but default constructors of DescriptorRendererImpl.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-13 20:50:40 +04:00
parent 9947bff2e1
commit f5b35e39ac
2 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+7 -19
View File
@@ -47,13 +47,13 @@ public class DescriptorRendererImpl implements Renderer<DeclarationDescriptor> {
}
}
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<DeclarationDescriptor> {
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<DeclarationDescriptor> {
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<Void, StringBuilder> subVisitor = new RenderDeclarationDescriptorVisitor() {
@Override
@@ -113,14 +113,6 @@ public class DescriptorRendererImpl implements Renderer<DeclarationDescriptor> {
@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<DeclarationDescriptor> {
}
public static class HtmlDescriptorRendererImpl extends DescriptorRendererImpl {
public HtmlDescriptorRendererImpl() {
super();
}
public HtmlDescriptorRendererImpl(boolean shortNames, @Nullable ValueParametersHandler handler) {
super(shortNames, handler);
}
idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java
+1 -2
View File
@@ -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;