From d7e9a77fdb627518a4661689d88ca1b0745326be Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 17 Apr 2012 01:51:48 +0400 Subject: [PATCH] Added IDE error message for UPPER_BOUND_VIOLATED. --- .../jet/plugin/highlighter/IdeErrorMessages.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java b/idea/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java index 3bd41ac2bf1..f7507daff65 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java @@ -22,9 +22,7 @@ import org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticFactoryToRendererM import org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticRenderer; import org.jetbrains.jet.lang.diagnostics.rendering.DispatchingDiagnosticRenderer; -import static org.jetbrains.jet.lang.diagnostics.Errors.TYPE_MISMATCH; -import static org.jetbrains.jet.lang.diagnostics.Errors.WRONG_GETTER_RETURN_TYPE; -import static org.jetbrains.jet.lang.diagnostics.Errors.WRONG_SETTER_PARAMETER_TYPE; +import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lang.diagnostics.rendering.Renderers.RENDER_TYPE; /** @@ -39,9 +37,12 @@ public class IdeErrorMessages { MAP.put(TYPE_MISMATCH, "Type mismatch.
Required:{0}
Found:{1}
", RENDER_TYPE, RENDER_TYPE); MAP.put(WRONG_SETTER_PARAMETER_TYPE, "Setter parameter type must be equal to the type of the property." + - "
Expected:{0}
Found:{1}
", RENDER_TYPE, RENDER_TYPE); + "
Expected:{0}
Found:{1}
", RENDER_TYPE, RENDER_TYPE); MAP.put(WRONG_GETTER_RETURN_TYPE, "Getter return type must be equal to the type of the property." + - "
Expected:{0}
Found:{1}
", RENDER_TYPE, RENDER_TYPE); + "
Expected:{0}
Found:{1}
", RENDER_TYPE, RENDER_TYPE); + + MAP.put(UPPER_BOUND_VIOLATED, "Type argument is not within its bounds." + + "
Expected:{0}
Found:{1}
", RENDER_TYPE, RENDER_TYPE); MAP.setImmutable(); }