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

Removed fields and methods for rendering error messages in DiagnosticFactoryWithMessageFormat and its subclasses.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-04-13 14:27:33 +04:00
parent 9b50cdfbe3
commit d64d2c8579
4 changed files with 2 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory1.java
-11
View File
@@ -25,16 +25,6 @@ import org.jetbrains.jet.lang.diagnostics.rendering.Renderers;
* @author svtk
*/
public class DiagnosticFactory1<E extends PsiElement, A> extends DiagnosticFactoryWithMessageFormat<E> {
private final Renderer<? super A> renderer;
protected String makeMessage(@NotNull A argument) {
return messageFormat.format(new Object[]{makeMessageFor(argument)});
}
protected String makeMessageFor(@NotNull A argument) {
return renderer.render(argument);
}
@NotNull
public ParametrizedDiagnostic<E> on(@NotNull E element, @NotNull A argument) {
return new DiagnosticWithParameters1<E, A>(element, argument, this, severity);
@@ -42,7 +32,6 @@ public class DiagnosticFactory1<E extends PsiElement, A> extends DiagnosticFacto
protected DiagnosticFactory1(Severity severity, String message, PositioningStrategy<? super E> positioningStrategy, Renderer<? super A> renderer) {
super(severity, message, positioningStrategy);
this.renderer = renderer;
}
public static <T extends PsiElement, A> DiagnosticFactory1<T, A> create(Severity severity, String message, PositioningStrategy<? super T> positioningStrategy, Renderer<? super A> renderer) {
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory2.java
-16
View File
@@ -25,20 +25,6 @@ import org.jetbrains.jet.lang.diagnostics.rendering.Renderers;
* @author abreslav
*/
public class DiagnosticFactory2<E extends PsiElement, A, B> extends DiagnosticFactoryWithMessageFormat<E> {
private final Renderer<? super A> rendererForA;
private final Renderer<? super B> rendererForB;
protected String makeMessage(@NotNull A a, @NotNull B b) {
return messageFormat.format(new Object[] {makeMessageForA(a), makeMessageForB(b)});
}
private String makeMessageForA(@NotNull A a) {
return rendererForA.render(a);
}
private String makeMessageForB(@NotNull B b) {
return rendererForB.render(b);
}
@NotNull
public ParametrizedDiagnostic<E> on(@NotNull E element, @NotNull A a, @NotNull B b) {
@@ -48,8 +34,6 @@ public class DiagnosticFactory2<E extends PsiElement, A, B> extends DiagnosticFa
private DiagnosticFactory2(Severity severity, String message, PositioningStrategy<? super E> positioningStrategy, Renderer<? super A> rendererForA, Renderer<? super B> rendererForB) {
super(severity, message, positioningStrategy);
this.rendererForA = rendererForA;
this.rendererForB = rendererForB;
}
public static <T extends PsiElement, A, B> DiagnosticFactory2<T, A, B> create(Severity severity, String messageStub, PositioningStrategy<? super T> positioningStrategy, Renderer<? super A> rendererForA, Renderer<? super B> rendererForB) {
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory3.java
+1 -22
View File
@@ -25,15 +25,9 @@ import org.jetbrains.jet.lang.diagnostics.rendering.Renderers;
* @author svtk
*/
public class DiagnosticFactory3<E extends PsiElement, A, B, C> extends DiagnosticFactoryWithMessageFormat<E> {
private final Renderer<? super A> rendererForA;
private final Renderer<? super B> rendererForB;
private final Renderer<? super C> rendererForC;
protected DiagnosticFactory3(Severity severity, String messageStub, PositioningStrategy<? super E> positioningStrategy, Renderer<? super A> rendererForA, Renderer<? super B> rendererForB, Renderer<? super C> rendererForC) {
super(severity, messageStub, positioningStrategy);
this.rendererForA = rendererForA;
this.rendererForB = rendererForB;
this.rendererForC = rendererForC;
}
public static <T extends PsiElement, A, B, C> DiagnosticFactory3<T, A, B, C> create(Severity severity, String messageStub) {
@@ -52,21 +46,6 @@ public class DiagnosticFactory3<E extends PsiElement, A, B, C> extends Diagnosti
return new DiagnosticFactory3<T, A, B, C>(severity, messageStub, positioningStrategy, rendererForA, rendererForB, rendererForC);
}
protected String makeMessage(@NotNull A a, @NotNull B b, @NotNull C c) {
return messageFormat.format(new Object[]{makeMessageForA(a), makeMessageForB(b), makeMessageForC(c)});
}
private String makeMessageForA(@NotNull A a) {
return rendererForA.render(a);
}
private String makeMessageForB(@NotNull B b) {
return rendererForB.render(b);
}
private String makeMessageForC(@NotNull C c) {
return rendererForC.render(c);
}
@NotNull
public ParametrizedDiagnostic<E> on(@NotNull E element, @NotNull A a, @NotNull B b, @NotNull C c) {
return new DiagnosticWithParameters3<E, A, B, C>(element, a, b, c, this, severity);
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactoryWithMessageFormat.java
+1 -8
View File
@@ -24,14 +24,7 @@ import java.text.MessageFormat;
* @author abreslav
*/
public abstract class DiagnosticFactoryWithMessageFormat<E extends PsiElement> extends DiagnosticFactoryWithPsiElement<E> {
protected final MessageFormat messageFormat;
public DiagnosticFactoryWithMessageFormat(Severity severity, String message) {
this(severity, message, PositioningStrategies.DEFAULT);
}
public DiagnosticFactoryWithMessageFormat(Severity severity, String message, PositioningStrategy<? super E> positioningStrategy) {
protected DiagnosticFactoryWithMessageFormat(Severity severity, String message, PositioningStrategy<? super E> positioningStrategy) {
super(severity, positioningStrategy);
this.messageFormat = new MessageFormat(message);
}
}