Author: markt
Date: Fri Dec 26 10:15:29 2008
New Revision: 729520
URL: http://svn.apache.org/viewvc?rev=729520&view=rev
Log:
o.a.c.ssi generics changes
Modified:
tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java?rev=729520&r1=729519&r2=729520&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java Fri Dec 26
10:15:29 2008
@@ -190,7 +190,7 @@
variableValue = ssiExternalResolver.getVariableValue(variableName);
if (variableValue == null) {
variableName = variableName.toUpperCase();
- variableValue = (String)ssiExternalResolver
+ variableValue = ssiExternalResolver
.getVariableValue(className + "." + variableName);
}
if (variableValue != null) {
Modified:
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java?rev=729520&r1=729519&r2=729520&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
Fri Dec 26 10:15:29 2008
@@ -90,9 +90,9 @@
variableNames.add(variableName);
}
}
- Enumeration e = req.getAttributeNames();
+ Enumeration<String> e = req.getAttributeNames();
while (e.hasMoreElements()) {
- String name = (String)e.nextElement();
+ String name = e.nextElement();
if (!isNameReserved(name)) {
variableNames.add(name);
}
@@ -105,9 +105,9 @@
if (!isNameReserved(targetName)) {
object = req.getAttribute(targetName);
if (object == null) {
- Enumeration e = req.getAttributeNames();
+ Enumeration<String> e = req.getAttributeNames();
while (e.hasMoreElements()) {
- String name = (String)e.nextElement();
+ String name = e.nextElement();
if (targetName.equalsIgnoreCase(name)
&& !isNameReserved(name)) {
object = req.getAttribute(name);
@@ -192,14 +192,14 @@
accept = "Accept-Language";
}
if (accept != null) {
- Enumeration acceptHeaders = req.getHeaders(accept);
+ Enumeration<String> acceptHeaders = req.getHeaders(accept);
if (acceptHeaders != null)
if (acceptHeaders.hasMoreElements()) {
StringBuffer rv = new StringBuffer(
- (String) acceptHeaders.nextElement());
+ acceptHeaders.nextElement());
while (acceptHeaders.hasMoreElements()) {
rv.append(", ");
- rv.append((String)
acceptHeaders.nextElement());
+ rv.append(acceptHeaders.nextElement());
}
retVal = rv.toString();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
