svn commit: r349518 - in /jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser: BaseValueParser.java ValueParser.java

[ep...@apache.org]

Author: epugh
Date: Mon Nov 28 13:56:46 2005
New Revision: 349518

URL: http://svn.apache.org/viewcvs?rev=349518&view=rev
Log:
Move from Enumeration to Set for the keys in the hashset of ParameterParser.  Update from Turbine parameter parser codebase.

Modified:
    jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/BaseValueParser.java
    jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ValueParser.java

Modified: jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/BaseValueParser.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/BaseValueParser.java?rev=349518&r1=349517&r2=349518&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/BaseValueParser.java (original)
+++ jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/BaseValueParser.java Mon Nov 28 13:56:46 2005
@@ -29,6 +29,7 @@
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.Hashtable;
+import java.util.Set;
 
 import org.apache.fulcrum.pool.Recyclable;
 
@@ -291,15 +292,14 @@
         return parameters.containsKey(convert((String) key));
     }
 
-    /*
-     * Get an enumerator for the parameter keys. Wraps to the
-     * contained <code>Hashtable.keys()</code>.
+    /**
+     * Gets the set of keys
      *
-     * @return An <code>enumerator</code> of the keys.
+     * @return A <code>Set</code> of the keys.
      */
-    public Enumeration keys()
+    public Set keySet()
     {
-        return parameters.keys();
+        return parameters.keySet();
     }
 
     /*

Modified: jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ValueParser.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ValueParser.java?rev=349518&r1=349517&r2=349518&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ValueParser.java (original)
+++ jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ValueParser.java Mon Nov 28 13:56:46 2005
@@ -23,6 +23,7 @@
 import java.text.DateFormat;
 import java.util.Date;
 import java.util.Enumeration;
+import java.util.Set;
 
 /**
  * ValueParser is a base interface for classes that need to parse
@@ -153,13 +154,12 @@
      */
     public boolean containsKey( Object key );
 
-    /*
-     * Get an enumerator for the parameter keys. Wraps to the
-     * contained <code>Hashtable.keys()</code>.
+    /**
+     * Gets the keys.
      *
-     * @return An <code>enumerator</code> of the keys.
+     * @return A <code>Set</code> of the keys.
      */
-    public Enumeration keys();
+    Set keySet();
 
     /*
      * Returns all the available parameter names.



---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org