From 553ce9e5e0a60db36007df4ebb2919ba8d2f4a67 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Thu, 12 Apr 2012 20:21:09 +0400
Subject: [PATCH] Extracted DiagnosticWithParameters1Renderer, moved it along
 with DiagnosticRenderer to frontend module.

---
 .../compiler/DefaultDiagnosticRenderer.java   | 20 +--------
 .../{ => rendering}/DiagnosticRenderer.java   |  4 +-
 .../DiagnosticWithParameters1Renderer.java    | 44 +++++++++++++++++++
 3 files changed, 49 insertions(+), 19 deletions(-)
 rename compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/{ => rendering}/DiagnosticRenderer.java (84%)
 create mode 100644 compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters1Renderer.java

diff --git a/compiler/cli/src/org/jetbrains/jet/compiler/DefaultDiagnosticRenderer.java b/compiler/cli/src/org/jetbrains/jet/compiler/DefaultDiagnosticRenderer.java
index 16f97836827..158ca104b80 100644
--- a/compiler/cli/src/org/jetbrains/jet/compiler/DefaultDiagnosticRenderer.java
+++ b/compiler/cli/src/org/jetbrains/jet/compiler/DefaultDiagnosticRenderer.java
@@ -16,12 +16,12 @@
 
 package org.jetbrains.jet.compiler;
 
-import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.diagnostics.*;
+import org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticRenderer;
+import org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticWithParameters1Renderer;
 import org.jetbrains.jet.lang.psi.JetFile;
 
-import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -56,20 +56,4 @@ public class DefaultDiagnosticRenderer implements DiagnosticRenderer<Diagnostic>
         //noinspection unchecked
         return renderer.render(diagnostic);
     }
-
-    private class DiagnosticWithParameters1Renderer<E extends PsiElement, A> implements DiagnosticRenderer<DiagnosticWithParameters1<E, A>> {
-        private final MessageFormat messageFormat;
-        private final Renderer<? super A> rendererForA;
-
-        private DiagnosticWithParameters1Renderer(@NotNull String message, @NotNull Renderer<? super A> rendererForA) {
-            this.messageFormat = new MessageFormat(message);
-            this.rendererForA = rendererForA;
-        }
-
-        @NotNull
-        @Override
-        public String render(@NotNull DiagnosticWithParameters1<E, A> diagnostic) {
-            return messageFormat.format(new Object[]{rendererForA.render(diagnostic.getA())});
-        }
-    }
 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticRenderer.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRenderer.java
similarity index 84%
rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticRenderer.java
rename to compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRenderer.java
index c71d686fc0f..ce843b367b2 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticRenderer.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRenderer.java
@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.diagnostics;
+package org.jetbrains.jet.lang.diagnostics.rendering;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.diagnostics.Diagnostic;
+import org.jetbrains.jet.lang.diagnostics.Renderer;
 
 /**
  * @author Evgeny Gerashchenko
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
new file mode 100644
index 00000000000..6ae1c64d191
--- /dev/null
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters1Renderer.java
@@ -0,0 +1,44 @@
+/*
+ * 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 com.intellij.psi.PsiElement;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1;
+import org.jetbrains.jet.lang.diagnostics.Renderer;
+
+import java.text.MessageFormat;
+
+/**
+* @author Evgeny Gerashchenko
+* @since 4/12/12
+*/
+public class DiagnosticWithParameters1Renderer<E extends PsiElement, A> implements DiagnosticRenderer<DiagnosticWithParameters1<E, A>> {
+    private final MessageFormat messageFormat;
+    private final Renderer<? super A> rendererForA;
+
+    public DiagnosticWithParameters1Renderer(@NotNull String message, @NotNull Renderer<? super A> rendererForA) {
+        this.messageFormat = new MessageFormat(message);
+        this.rendererForA = rendererForA;
+    }
+
+    @NotNull
+    @Override
+    public String render(@NotNull DiagnosticWithParameters1<E, A> diagnostic) {
+        return messageFormat.format(new Object[]{rendererForA.render(diagnostic.getA())});
+    }
+}