Create AbstractDiagnosticWithParametersRenderer with renderParameters method.

compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/AbstractDiagnosticWithParametersRenderer.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2010-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.lang.diagnostics.rendering;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.diagnostics.Diagnostic;
+
+import java.text.MessageFormat;
+
+public abstract class AbstractDiagnosticWithParametersRenderer<D extends Diagnostic> implements DiagnosticRenderer<D> {
+    @NotNull private final MessageFormat messageFormat;
+
+    protected AbstractDiagnosticWithParametersRenderer(@NotNull String message) {
+        messageFormat = new MessageFormat(message);
+    }
+
+    @NotNull
+    @Override
+    public String render(@NotNull D diagnostic) {
+        return messageFormat.format(renderParameters(diagnostic));
+    }
+
+    @NotNull
+    public abstract Object[] renderParameters(@NotNull D diagnostic);
+}

compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithMultiParametersRenderer.java

@@ -20,20 +20,17 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1;
 import org.jetbrains.jet.renderer.MultiRenderer;
 
-import java.text.MessageFormat;
+public class DiagnosticWithMultiParametersRenderer<A> extends AbstractDiagnosticWithParametersRenderer<DiagnosticWithParameters1<?,A>> {
-
-public class DiagnosticWithMultiParametersRenderer<A> implements DiagnosticRenderer<DiagnosticWithParameters1<?, A>> {
-    @NotNull private final MessageFormat messageFormat;
     @NotNull private final MultiRenderer<? super A> renderersForA;
 
     public DiagnosticWithMultiParametersRenderer(@NotNull String message, @NotNull MultiRenderer<? super A> renderersForA) {
-        this.messageFormat = new MessageFormat(message);
+        super(message);
         this.renderersForA = renderersForA;
     }
 
     @NotNull
     @Override
-    public String render(@NotNull DiagnosticWithParameters1<?, A> diagnostic) {
+    public Object[] renderParameters(@NotNull DiagnosticWithParameters1<?, A> diagnostic) {
-        return messageFormat.format(renderersForA.render(diagnostic.getA()));
+        return renderersForA.render(diagnostic.getA());
     }
 }

compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters1Renderer.java

@@ -21,22 +21,19 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1;
 import org.jetbrains.jet.renderer.Renderer;
 
-import java.text.MessageFormat;
-
 import static org.jetbrains.jet.lang.diagnostics.rendering.RenderingPackage.renderParameter;
 
-public class DiagnosticWithParameters1Renderer<A> implements DiagnosticRenderer<DiagnosticWithParameters1<?, A>> {
+public class DiagnosticWithParameters1Renderer<A> extends AbstractDiagnosticWithParametersRenderer<DiagnosticWithParameters1<?, A>> {
-    private final MessageFormat messageFormat;
     private final Renderer<? super A> rendererForA;
 
     public DiagnosticWithParameters1Renderer(@NotNull String message, @Nullable Renderer<? super A> rendererForA) {
-        this.messageFormat = new MessageFormat(message);
+        super(message);
         this.rendererForA = rendererForA;
     }
 
     @NotNull
     @Override
-    public String render(@NotNull DiagnosticWithParameters1<?, A> diagnostic) {
+    public Object[] renderParameters(@NotNull DiagnosticWithParameters1<?, A> diagnostic) {
-        return messageFormat.format(new Object[]{renderParameter(diagnostic.getA(), rendererForA)});
+        return new Object[]{renderParameter(diagnostic.getA(), rendererForA)};
     }
 }

compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters2Renderer.java

@@ -21,26 +21,23 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters2;
 import org.jetbrains.jet.renderer.Renderer;
 
-import java.text.MessageFormat;
-
 import static org.jetbrains.jet.lang.diagnostics.rendering.RenderingPackage.renderParameter;
 
-public class DiagnosticWithParameters2Renderer<A, B> implements DiagnosticRenderer<DiagnosticWithParameters2<?, A, B>> {
+public class DiagnosticWithParameters2Renderer<A, B> extends AbstractDiagnosticWithParametersRenderer<DiagnosticWithParameters2<?, A, B>> {
-    private final MessageFormat messageFormat;
     private final Renderer<? super A> rendererForA;
     private final Renderer<? super B> rendererForB;
 
     public DiagnosticWithParameters2Renderer(@NotNull String message, @Nullable Renderer<? super A> rendererForA, @Nullable Renderer<? super B> rendererForB) {
-        this.messageFormat = new MessageFormat(message);
+        super(message);
         this.rendererForA = rendererForA;
         this.rendererForB = rendererForB;
     }
 
     @NotNull
     @Override
-    public String render(@NotNull DiagnosticWithParameters2<?, A, B> diagnostic) {
+    public Object[] renderParameters(@NotNull DiagnosticWithParameters2<?, A, B> diagnostic) {
-        return messageFormat.format(new Object[]{
+        return new Object[]{
                 renderParameter(diagnostic.getA(), rendererForA),
-                renderParameter(diagnostic.getB(), rendererForB)});
+                renderParameter(diagnostic.getB(), rendererForB)};
     }
 }

compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters3Renderer.java

@@ -21,12 +21,9 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters3;
 import org.jetbrains.jet.renderer.Renderer;
 
-import java.text.MessageFormat;
-
 import static org.jetbrains.jet.lang.diagnostics.rendering.RenderingPackage.renderParameter;
 
-public class DiagnosticWithParameters3Renderer<A, B, C> implements DiagnosticRenderer<DiagnosticWithParameters3<?, A, B, C>> {
+public class DiagnosticWithParameters3Renderer<A, B, C> extends AbstractDiagnosticWithParametersRenderer<DiagnosticWithParameters3<?, A, B, C>> {
-    private final MessageFormat messageFormat;
     private final Renderer<? super A> rendererForA;
     private final Renderer<? super B> rendererForB;
     private final Renderer<? super C> rendererForC;
@@ -35,7 +32,7 @@ public class DiagnosticWithParameters3Renderer<A, B, C> implements DiagnosticRen
             @Nullable Renderer<? super A> rendererForA,
             @Nullable Renderer<? super B> rendererForB,
             @Nullable Renderer<? super C> rendererForC) {
-        this.messageFormat = new MessageFormat(message);
+        super(message);
         this.rendererForA = rendererForA;
         this.rendererForB = rendererForB;
         this.rendererForC = rendererForC;
@@ -43,10 +40,10 @@ public class DiagnosticWithParameters3Renderer<A, B, C> implements DiagnosticRen
 
     @NotNull
     @Override
-    public String render(@NotNull DiagnosticWithParameters3<?, A, B, C> diagnostic) {
+    public Object[] renderParameters(@NotNull DiagnosticWithParameters3<?, A, B, C> diagnostic) {
-        return messageFormat.format(new Object[]{
+        return new Object[]{
                 renderParameter(diagnostic.getA(), rendererForA),
                 renderParameter(diagnostic.getB(), rendererForB),
-                renderParameter(diagnostic.getC(), rendererForC)});
+                renderParameter(diagnostic.getC(), rendererForC)};
     }
 }