From 9f3f309625088715fae1c42d6226c85c7cbbbf30 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Fri, 13 Apr 2012 15:50:57 +0400
Subject: [PATCH] Made RedeclarationDiagnostic simpler.

---
 .../diagnostics/RedeclarationDiagnostic.java  | 49 +++++++++----------
 .../RedeclarationDiagnosticFactory.java       |  7 +--
 2 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/RedeclarationDiagnostic.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/RedeclarationDiagnostic.java
index e3080ba18e5..2e04e3eff8b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/RedeclarationDiagnostic.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/RedeclarationDiagnostic.java
@@ -27,36 +27,31 @@ import java.util.List;
 /**
  * @author abreslav
  */
-public interface RedeclarationDiagnostic extends Diagnostic {
-    String getName();
+public class RedeclarationDiagnostic extends AbstractDiagnostic<PsiElement> {
+    private String name;
 
-    class SimpleRedeclarationDiagnostic extends AbstractDiagnostic<PsiElement> implements RedeclarationDiagnostic {
-        private String name;
-
-        public SimpleRedeclarationDiagnostic(@NotNull PsiElement psiElement, @NotNull String name, RedeclarationDiagnosticFactory factory) {
-            super(psiElement, factory, factory.severity);
-            this.name = name;
-        }
-
-        @NotNull
-        @Override
-        public RedeclarationDiagnosticFactory getFactory() {
-            return (RedeclarationDiagnosticFactory)super.getFactory();
-        }
-
-        @Override
-        public String getName() {
-            return name;
-        }
-
-        @NotNull
-        @Override
-        public List<TextRange> getTextRanges() {
-            return POSITION_REDECLARATION.mark(getPsiElement());
-        }
+    public RedeclarationDiagnostic(@NotNull PsiElement psiElement, @NotNull String name, RedeclarationDiagnosticFactory factory) {
+        super(psiElement, factory, factory.severity);
+        this.name = name;
     }
 
-    PositioningStrategy<PsiElement> POSITION_REDECLARATION = new PositioningStrategy<PsiElement>() {
+    @NotNull
+    @Override
+    public RedeclarationDiagnosticFactory getFactory() {
+        return (RedeclarationDiagnosticFactory)super.getFactory();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @NotNull
+    @Override
+    public List<TextRange> getTextRanges() {
+        return POSITION_REDECLARATION.mark(getPsiElement());
+    }
+
+    private static final PositioningStrategy<PsiElement> POSITION_REDECLARATION = new PositioningStrategy<PsiElement>() {
         @NotNull
         @Override
         public List<TextRange> mark(@NotNull PsiElement element) {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/RedeclarationDiagnosticFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/RedeclarationDiagnosticFactory.java
index 59d138f52c4..a651060b00d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/RedeclarationDiagnosticFactory.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/RedeclarationDiagnosticFactory.java
@@ -30,11 +30,6 @@ public class RedeclarationDiagnosticFactory extends AbstractDiagnosticFactory {
     }
 
     public RedeclarationDiagnostic on(@NotNull PsiElement duplicatingElement, @NotNull String name) {
-        return new RedeclarationDiagnostic.SimpleRedeclarationDiagnostic(duplicatingElement, name, this);
-    }
-
-    @Override
-    public String toString() {
-        return getName();
+        return new RedeclarationDiagnostic(duplicatingElement, name, this);
     }
 }