From a2a9d6847b6e06cd7d2c3956e817b1a641b5cfe8 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 17 Apr 2012 12:08:48 +0400 Subject: [PATCH] Added IDE error messages for CONFLICTING_OVERLOADS. --- .../org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java | 1 + 1 file changed, 1 insertion(+) diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java b/idea/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java index 5d61d3e7bca..d22dda9ae86 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java @@ -72,6 +72,7 @@ public class IdeErrorMessages { MAP.put(MANY_IMPL_MEMBER_NOT_IMPLEMENTED, "{0} must override {1}
because it inherits many implementations of it", RENDER_CLASS_OR_OBJECT, DescriptorRenderer.HTML); + MAP.put(CONFLICTING_OVERLOADS, "{1}
is already defined in ''{0}''", DescriptorRenderer.HTML, TO_STRING); MAP.setImmutable(); }