From a45a7ae631e0863551f94d2c49135e25ce2b3f0d Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 18 Apr 2012 18:03:31 +0400 Subject: [PATCH] Made renderers added to DiagnosticWithParametersXRenderer nullable. --- .../DiagnosticFactoryToRendererMap.java | 22 ++++++------ .../rendering/DiagnosticRendererUtil.java | 34 +++++++++++++++++++ .../DiagnosticWithParameters1Renderer.java | 7 ++-- .../DiagnosticWithParameters2Renderer.java | 9 +++-- .../DiagnosticWithParameters3Renderer.java | 15 ++++---- 5 files changed, 65 insertions(+), 22 deletions(-) create mode 100644 compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticFactoryToRendererMap.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticFactoryToRendererMap.java index 96067f8fd53..cf5615bfa5b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticFactoryToRendererMap.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticFactoryToRendererMap.java @@ -39,29 +39,29 @@ public final class DiagnosticFactoryToRendererMap { } } - public void put(SimpleDiagnosticFactory factory, String message) { + public void put(@NotNull SimpleDiagnosticFactory factory, @NotNull String message) { checkMutability(); map.put(factory, new SimpleDiagnosticRenderer(message)); } - public void put(DiagnosticFactory1 factory, String message, Renderer rendererA) { + public void put(@NotNull DiagnosticFactory1 factory, @NotNull String message, @Nullable Renderer rendererA) { checkMutability(); map.put(factory, new DiagnosticWithParameters1Renderer(message, rendererA)); } - public void put(DiagnosticFactory2 factory, - String message, - Renderer rendererA, - Renderer rendererB) { + public void put(@NotNull DiagnosticFactory2 factory, + @NotNull String message, + @Nullable Renderer rendererA, + @Nullable Renderer rendererB) { checkMutability(); map.put(factory, new DiagnosticWithParameters2Renderer(message, rendererA, rendererB)); } - public void put(DiagnosticFactory3 factory, - String message, - Renderer rendererA, - Renderer rendererB, - Renderer rendererC) { + public void put(@NotNull DiagnosticFactory3 factory, + @NotNull String message, + @Nullable Renderer rendererA, + @Nullable Renderer rendererB, + @Nullable Renderer rendererC) { checkMutability(); map.put(factory, new DiagnosticWithParameters3Renderer(message, rendererA, rendererB, rendererC)); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.java new file mode 100644 index 00000000000..6fdd8653ee0 --- /dev/null +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.java @@ -0,0 +1,34 @@ +/* + * Copyright 2010-2012 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.annotations.Nullable; + +/** + * @author Evgeny Gerashchenko + * @since 4/18/12 + */ +public class DiagnosticRendererUtil { + private DiagnosticRendererUtil() { + } + + @NotNull + public static

Object renderParameter(@NotNull P parameter, @Nullable Renderer

renderer) { + return renderer == null ? parameter : renderer.render(parameter); + } +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters1Renderer.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters1Renderer.java index f005f2b343b..5727b40beda 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters1Renderer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters1Renderer.java @@ -17,10 +17,13 @@ package org.jetbrains.jet.lang.diagnostics.rendering; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1; import java.text.MessageFormat; +import static org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticRendererUtil.renderParameter; + /** * @author Evgeny Gerashchenko * @since 4/12/12 @@ -29,7 +32,7 @@ public class DiagnosticWithParameters1Renderer implements DiagnosticRenderer< private final MessageFormat messageFormat; private final Renderer rendererForA; - public DiagnosticWithParameters1Renderer(@NotNull String message, @NotNull Renderer rendererForA) { + public DiagnosticWithParameters1Renderer(@NotNull String message, @Nullable Renderer rendererForA) { this.messageFormat = new MessageFormat(message); this.rendererForA = rendererForA; } @@ -37,6 +40,6 @@ public class DiagnosticWithParameters1Renderer implements DiagnosticRenderer< @NotNull @Override public String render(@NotNull DiagnosticWithParameters1 diagnostic) { - return messageFormat.format(new Object[]{rendererForA.render(diagnostic.getA())}); + return messageFormat.format(new Object[]{renderParameter(diagnostic.getA(), rendererForA)}); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters2Renderer.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters2Renderer.java index d61591c2ba5..506f7cbe767 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters2Renderer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters2Renderer.java @@ -17,10 +17,13 @@ package org.jetbrains.jet.lang.diagnostics.rendering; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters2; import java.text.MessageFormat; +import static org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticRendererUtil.renderParameter; + /** * @author Evgeny Gerashchenko * @since 4/12/12 @@ -30,7 +33,7 @@ public class DiagnosticWithParameters2Renderer implements DiagnosticRender private final Renderer rendererForA; private final Renderer rendererForB; - public DiagnosticWithParameters2Renderer(@NotNull String message, @NotNull Renderer rendererForA, @NotNull Renderer rendererForB) { + public DiagnosticWithParameters2Renderer(@NotNull String message, @Nullable Renderer rendererForA, @Nullable Renderer rendererForB) { this.messageFormat = new MessageFormat(message); this.rendererForA = rendererForA; this.rendererForB = rendererForB; @@ -40,7 +43,7 @@ public class DiagnosticWithParameters2Renderer implements DiagnosticRender @Override public String render(@NotNull DiagnosticWithParameters2 diagnostic) { return messageFormat.format(new Object[]{ - rendererForA.render(diagnostic.getA()), - rendererForB.render(diagnostic.getB())}); + renderParameter(diagnostic.getA(), rendererForA), + renderParameter(diagnostic.getB(), rendererForB)}); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters3Renderer.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters3Renderer.java index fbb42366840..e831df6b0e3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters3Renderer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters3Renderer.java @@ -17,10 +17,13 @@ package org.jetbrains.jet.lang.diagnostics.rendering; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters3; import java.text.MessageFormat; +import static org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticRendererUtil.renderParameter; + /** * @author Evgeny Gerashchenko * @since 4/12/12 @@ -32,9 +35,9 @@ public class DiagnosticWithParameters3Renderer implements DiagnosticRen private final Renderer rendererForC; public DiagnosticWithParameters3Renderer(@NotNull String message, - @NotNull Renderer rendererForA, - @NotNull Renderer rendererForB, - @NotNull Renderer rendererForC) { + @Nullable Renderer rendererForA, + @Nullable Renderer rendererForB, + @Nullable Renderer rendererForC) { this.messageFormat = new MessageFormat(message); this.rendererForA = rendererForA; this.rendererForB = rendererForB; @@ -45,8 +48,8 @@ public class DiagnosticWithParameters3Renderer implements DiagnosticRen @Override public String render(@NotNull DiagnosticWithParameters3 diagnostic) { return messageFormat.format(new Object[]{ - rendererForA.render(diagnostic.getA()), - rendererForB.render(diagnostic.getB()), - rendererForC.render(diagnostic.getC())}); + renderParameter(diagnostic.getA(), rendererForA), + renderParameter(diagnostic.getB(), rendererForB), + renderParameter(diagnostic.getC(), rendererForC)}); } }