Author: markt
Date: Wed Apr 16 11:28:17 2014
New Revision: 1587870
URL: http://svn.apache.org/r1587870
Log:
Add i18n error messages
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java?rev=1587870&r1=1587869&r2=1587870&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java Wed Apr 16
11:28:17 2014
@@ -298,13 +298,17 @@ public class ELParser {
}
char quote = input.charAt(0);
if (quote != '\'' && quote != '\"') {
- throw new IllegalArgumentException();
+ throw new IllegalArgumentException(Localizer.getMessage(
+
"org.apache.jasper.compiler.ELParser.invalidQuotesForStringLiteral",
+ input));
}
int lastAppend = 1;
StringBuilder output = null;
if (input.charAt(len - 1) != quote) {
- throw new IllegalArgumentException();
+ throw new IllegalArgumentException(Localizer.getMessage(
+
"org.apache.jasper.compiler.ELParser.invalidQuotesForStringLiteral",
+ input));
}
for (int i = 1; i < len - 1; i++) {
char ch = input.charAt(i);
@@ -388,7 +392,9 @@ public class ELParser {
if (ch == '\\' || ch == '\'' || ch == '\"') {
buf.append(ch);
} else {
- throw new IllegalArgumentException();
+ throw new IllegalArgumentException(Localizer.getMessage(
+
"org.apache.jasper.compiler.ELParser.invalidQuoting",
+ expression));
}
} else if (ch == quote) {
buf.append(ch);
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1587870&r1=1587869&r2=1587870&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Wed
Apr 16 11:28:17 2014
@@ -395,6 +395,9 @@ jsp.tldCache.noTldSummary=At least one J
#ELInterpreter
jsp.error.el_interpreter_class.instantiation=Failed to load or instantiate
ELInterpreter class [{0}]
+org.apache.jasper.compiler.ELParser.invalidQuotesForStringLiteral=The String
literal [{0}] is not valid. It must be contained with single or double quotes.
+org.apache.jasper.compiler.ELParser.invalidQuoting=The expression [{0}] is not
valid. Within a quoted String only [\], ['] and ["] may be escaped with [\].
+
org.apache.jasper.compiler.TldCache.servletContextNull=The provided
SevletContext was null
org.apache.jasper.servlet.JasperInitializer.onStartup=Initializing Jasper for
context [{0}]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
