You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jcs-dev@jakarta.apache.org by hc...@apache.org on 2005/01/29 07:06:03 UTC
cvs commit: jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote RemoteUtils.java
hchar 2005/01/28 22:06:03
Modified: src/java/org/apache/jcs/engine/control
CompositeCacheConfigurator.java
src/java/org/apache/jcs/utils/servlet/session
HttpServletRequestFacade.java
src/test/org/apache/jcs/servlet ListTestCacheServlet.java
src/java/org/apache/jcs/auxiliary/remote RemoteUtils.java
Log:
enum is a keyword in jdk1.5; renamed to en
Revision Changes Path
1.11 +6 -6 jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/CompositeCacheConfigurator.java
Index: CompositeCacheConfigurator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/CompositeCacheConfigurator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CompositeCacheConfigurator.java 12 Jun 2004 02:34:13 -0000 1.10
+++ CompositeCacheConfigurator.java 29 Jan 2005 06:06:03 -0000 1.11
@@ -146,10 +146,10 @@
*/
protected void parseSystemRegions( Properties props )
{
- Enumeration enum = props.propertyNames();
- while ( enum.hasMoreElements() )
+ Enumeration en = props.propertyNames();
+ while ( en.hasMoreElements() )
{
- String key = ( String ) enum.nextElement();
+ String key = ( String ) en.nextElement();
if ( key.startsWith( SYSTEM_REGION_PREFIX )
&& ( key.indexOf( "attributes" ) == -1 ) )
{
@@ -170,10 +170,10 @@
/** Parse region elements. */
protected void parseRegions( Properties props )
{
- Enumeration enum = props.propertyNames();
- while ( enum.hasMoreElements() )
+ Enumeration en = props.propertyNames();
+ while ( en.hasMoreElements() )
{
- String key = ( String ) enum.nextElement();
+ String key = ( String ) en.nextElement();
if ( key.startsWith( REGION_PREFIX ) && ( key.indexOf( "attributes" ) == -1 ) )
{
String regionName = key.substring( REGION_PREFIX.length() );
1.6 +3 -3 jakarta-turbine-jcs/src/java/org/apache/jcs/utils/servlet/session/HttpServletRequestFacade.java
Index: HttpServletRequestFacade.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/utils/servlet/session/HttpServletRequestFacade.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HttpServletRequestFacade.java 12 Jun 2004 02:34:13 -0000 1.5
+++ HttpServletRequestFacade.java 29 Jan 2005 06:06:03 -0000 1.6
@@ -245,11 +245,11 @@
// FUTURE: Call req.getParameterMap() for servlet api 2.3
Map params = new HashMap();
- Enumeration enum = req.getParameterNames();
+ Enumeration en = req.getParameterNames();
String name;
- while ( enum.hasMoreElements() )
+ while ( en.hasMoreElements() )
{
- name = ( String ) enum.nextElement();
+ name = ( String ) en.nextElement();
params.put( name, req.getParameterValues( name ) );
}
return params;
1.7 +4 -4 jakarta-turbine-jcs/src/test/org/apache/jcs/servlet/ListTestCacheServlet.java
Index: ListTestCacheServlet.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/test/org/apache/jcs/servlet/ListTestCacheServlet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ListTestCacheServlet.java 15 Apr 2004 19:24:19 -0000 1.6
+++ ListTestCacheServlet.java 29 Jan 2005 06:06:03 -0000 1.7
@@ -446,16 +446,16 @@
//
// // providing this feature adds a significant burden to the cache,
// // but it makes it able to completely implement the seesion api
-// Enumeration enum = this.cityGroupCache.getAttributeNames( city );
-// if ( enum == null )
+// Enumeration en = this.cityGroupCache.getAttributeNames( city );
+// if ( en == null )
// {
// out.println( "<br>There is no info for this city. <br>" );
// }
// else
// {
-// while ( enum.hasMoreElements() )
+// while ( en.hasMoreElements() )
// {
-// out.println( "Zip code " + ( String ) enum.nextElement() + " is in <b>" );
+// out.println( "Zip code " + ( String ) en.nextElement() + " is in <b>" );
// out.println( "<a href=\"?task=zipForCity&city=" + city + "\">" + city + "</a>" );
// out.println( "</b> city. <br>" );
// }
1.6 +3 -3 jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/RemoteUtils.java
Index: RemoteUtils.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/RemoteUtils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RemoteUtils.java 7 Jan 2005 22:29:17 -0000 1.5
+++ RemoteUtils.java 29 Jan 2005 06:06:03 -0000 1.6
@@ -82,11 +82,11 @@
{
if ( props != null )
{
- Enumeration enum = props.keys();
+ Enumeration en = props.keys();
StringBuffer buf = new StringBuffer();
- while( enum.hasMoreElements() )
+ while( en.hasMoreElements() )
{
- String key = (String)enum.nextElement();
+ String key = (String)en.nextElement();
buf.append( "\n" + key + " = " + props.getProperty(key) );
}
log.debug( buf.toString() );
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-jcs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-jcs-dev-help@jakarta.apache.org