webwork/src/main/webwork/action/factory ApplicationMap.java,1.8,1.9 ParameterMap.java,1.7,1.8 ServletMap.java,1.6,1.7 SessionMap.java,1.10,1.11

Update of /cvsroot/opensymphony/webwork/src/main/webwork/action/factory
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20558/src/main/webwork/action/factory

Modified Files:
	ApplicationMap.java ParameterMap.java ServletMap.java 
	SessionMap.java 
Log Message:
Fixed a bunch of 1.5 related warnings

Index: ApplicationMap.java
===================================================================
RCS file: /cvsroot/opensymphony/webwork/src/main/webwork/action/factory/ApplicationMap.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ApplicationMap.java	24 Mar 2003 11:29:03 -0000	1.8
+++ ApplicationMap.java	19 Mar 2005 19:20:20 -0000	1.9
@@ -10,7 +10,7 @@
 import java.util.*;
 
 /**
- * @author Rickard Öberg ([email protected])
+ * @author Rickard �berg ([email protected])
  * @version $Revision$
  */
 public class ApplicationMap
@@ -31,10 +31,10 @@
          entries = new HashSet();
 
          // Add servlet context attributes
-         Enumeration enum = context.getAttributeNames();
-         while (enum.hasMoreElements())
+         Enumeration e = context.getAttributeNames();
+         while (e.hasMoreElements())
          {
-            final String key = enum.nextElement().toString();
+            final String key = e.nextElement().toString();
             final Object value = context.getAttribute(key);
             entries.add(new Map.Entry()
             {
@@ -65,17 +65,17 @@
 
                public Object setValue(Object obj)
                {
-                  context.setAttribute(key.toString(), obj);
+                  context.setAttribute(key, obj);
                   return value;
                }
             });
          }
 
          // Add servlet context init parameters
-         enum = context.getInitParameterNames();
-         while (enum.hasMoreElements())
+         e = context.getInitParameterNames();
+         while (e.hasMoreElements())
          {
-            final String key = enum.nextElement().toString();
+            final String key = e.nextElement().toString();
             final Object value = context.getInitParameter(key);
             entries.add(new Map.Entry()
             {
@@ -106,7 +106,7 @@
 
                public Object setValue(Object obj)
                {
-                  context.setAttribute(key.toString(), obj);
+                  context.setAttribute(key, obj);
                   return value;
                }
             });
@@ -143,10 +143,10 @@
    public void clear()
    {
       entries = null;
-      Enumeration enum = context.getAttributeNames();
-      while (enum.hasMoreElements())
+      Enumeration e = context.getAttributeNames();
+      while (e.hasMoreElements())
       {
-         context.removeAttribute(enum.nextElement().toString());
+         context.removeAttribute(e.nextElement().toString());
       }
    }
 }

Index: ParameterMap.java
===================================================================
RCS file: /cvsroot/opensymphony/webwork/src/main/webwork/action/factory/ParameterMap.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ParameterMap.java	21 May 2003 05:02:17 -0000	1.7
+++ ParameterMap.java	19 Mar 2005 19:20:21 -0000	1.8
@@ -32,10 +32,10 @@
       {
          entries = new HashSet();
 
-         Enumeration enum = request.getParameterNames();
-         while (enum.hasMoreElements())
+         Enumeration e = request.getParameterNames();
+         while (e.hasMoreElements())
          {
-            final String key = enum.nextElement().toString();
+            final String key = e.nextElement().toString();
             final String[] value = request.getParameterValues(key);
 
              //handle ;jsessionid= being passed at the end of parameters.  Fixes WW-190

Index: ServletMap.java
===================================================================
RCS file: /cvsroot/opensymphony/webwork/src/main/webwork/action/factory/ServletMap.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ServletMap.java	11 Mar 2002 09:02:34 -0000	1.6
+++ ServletMap.java	19 Mar 2005 19:20:21 -0000	1.7
@@ -11,7 +11,7 @@
 
 /**
  *
- * @author Rickard Öberg ([email protected])
+ * @author Rickard �berg ([email protected])
  * @version $Revision$
  */
 class ServletMap
@@ -30,10 +30,10 @@
       {
          entries = new HashSet();
 
-         Enumeration enum = config.getInitParameterNames();
-         while (enum.hasMoreElements())
+         Enumeration e = config.getInitParameterNames();
+         while (e.hasMoreElements())
          {
-            final String key = enum.nextElement().toString();
+            final String key = e.nextElement().toString();
             final Object value = config.getInitParameter(key);
             entries.add(new Map.Entry()
             {

Index: SessionMap.java
===================================================================
RCS file: /cvsroot/opensymphony/webwork/src/main/webwork/action/factory/SessionMap.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- SessionMap.java	29 Dec 2003 00:25:31 -0000	1.10
+++ SessionMap.java	19 Mar 2005 19:20:21 -0000	1.11
@@ -11,7 +11,7 @@
 
 /**
  *
- * @author Rickard Öberg ([email protected])
+ * @author Rickard �berg ([email protected])
  * @version $Revision$
  */
 public class SessionMap
@@ -31,10 +31,10 @@
            {
               entries = new HashSet();
 
-              Enumeration enum = session.getAttributeNames();
-              while (enum.hasMoreElements())
+              Enumeration e = session.getAttributeNames();
+              while (e.hasMoreElements())
               {
-                 final String key = enum.nextElement().toString();
+                 final String key = e.nextElement().toString();
                  final Object value = session.getAttribute(key);
                  entries.add(new Map.Entry()
                  {
@@ -65,7 +65,7 @@
 
                     public Object setValue(Object obj)
                     {
-                       session.setAttribute(key.toString(), obj);
+                       session.setAttribute(key, obj);
                        return value;
                     }
                  });



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click