o.a.c.ssi generics changes

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@729520 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/ssi/SSIMediator.java b/java/org/apache/catalina/ssi/SSIMediator.java
index 561fd54..f70f334 100644 (file)
--- a/java/org/apache/catalina/ssi/SSIMediator.java
+++ b/java/org/apache/catalina/ssi/SSIMediator.java
@@ -190,7 +190,7 @@ public class SSIMediator {
             variableValue = ssiExternalResolver.getVariableValue(variableName);
             if (variableValue == null) {
                 variableName = variableName.toUpperCase();
-                variableValue = (String)ssiExternalResolver
+                variableValue = ssiExternalResolver
                         .getVariableValue(className + "." + variableName);
             }
             if (variableValue != null) {

diff --git a/java/org/apache/catalina/ssi/SSIServletExternalResolver.java b/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
index 721a846..bfad17d 100644 (file)
--- a/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
+++ b/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
@@ -90,9 +90,9 @@ public class SSIServletExternalResolver implements SSIExternalResolver {
                 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 @@ public class SSIServletExternalResolver implements SSIExternalResolver {
         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 @@ public class SSIServletExternalResolver implements SSIExternalResolver {
                     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();
                     }