quintonm 2003/03/12 11:22:27
Modified: src/java/org/apache/turbine/util/parser BaseValueParser.java
src/java/org/apache/turbine/util ValueParser.java
Log:
Switched from Hashtable to HashMap for storage of paramters.
Deprecated keys() methos that returned an iterator. Added new method to replace
called keySet()
which returns a Set. From there, you can get an Iterator.
Revision Changes Path
1.13 +25 -11
jakarta-turbine-2/src/java/org/apache/turbine/util/parser/BaseValueParser.java
Index: BaseValueParser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/parser/BaseValueParser.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- BaseValueParser.java 9 Mar 2003 04:23:58 -0000 1.12
+++ BaseValueParser.java 12 Mar 2003 19:22:27 -0000 1.13
@@ -68,12 +68,17 @@
import java.text.ParseException;
import java.util.Calendar;
+import java.util.Collections;
import java.util.Date;
import java.util.Enumeration;
import java.util.GregorianCalendar;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.Map;
import org.apache.commons.lang.StringUtils;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -83,7 +88,6 @@
import org.apache.turbine.util.DateSelector;
import org.apache.turbine.util.TimeSelector;
import org.apache.turbine.util.ValueParser;
-
import org.apache.turbine.util.pool.Recyclable;
import org.apache.turbine.util.pool.RecyclableSupport;
@@ -125,7 +129,7 @@
private static Log log = LogFactory.getLog(BaseValueParser.class);
/** Random access storage for parameter data. */
- private Hashtable parameters = new Hashtable();
+ private Map parameters = new HashMap();
/** The character encoding to use when converting to byte arrays */
private String characterEncoding = "US-ASCII";
@@ -364,18 +368,28 @@
containsKey(key + TimeSelector.SECOND_SUFFIX));
}
- /*
- * Get an enumerator for the parameter keys. Wraps to the
- * contained <code>Hashtable.keys()</code>.
+ /**
+ * Get an enumerator for the parameter keys.
*
* @return An <code>enumerator</code> of the keys.
+ * @deprecated use [EMAIL PROTECTED] #keySet} instead.
*/
public Enumeration keys()
{
- return parameters.keys();
+ return Collections.enumeration(parameters.keySet());
+ }
+
+ /**
+ * Gets the set of keys
+ *
+ * @return A <code>Set</code> of the keys.
+ */
+ public Set keySet()
+ {
+ return parameters.keySet();
}
- /*
+ /**
* Returns all the available parameter names.
*
* @return A object array with the keys.
@@ -1243,9 +1257,9 @@
public String toString()
{
StringBuffer sb = new StringBuffer();
- for (Enumeration e = parameters.keys(); e.hasMoreElements();)
+ for (Iterator iter = keySet().iterator(); iter.hasNext();)
{
- String name = (String) e.nextElement();
+ String name = (String) iter.next();
try
{
sb.append('{');
1.9 +15 -6
jakarta-turbine-2/src/java/org/apache/turbine/util/ValueParser.java
Index: ValueParser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/ValueParser.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ValueParser.java 9 Mar 2003 06:04:58 -0000 1.8
+++ ValueParser.java 12 Mar 2003 19:22:27 -0000 1.9
@@ -59,11 +59,13 @@
import java.text.DateFormat;
import java.util.Date;
import java.util.Enumeration;
+import java.util.Set;
+
+import org.apache.turbine.util.parser.ParserUtils;
import org.apache.torque.om.NumberKey;
import org.apache.torque.om.StringKey;
-import org.apache.turbine.util.parser.ParserUtils;
/**
* ValueParser is a base interface for classes that need to parse
@@ -217,15 +219,22 @@
*/
boolean containsDateSelectorKeys(String key);
- /*
- * Get an enumerator for the parameter keys. Wraps to the
- * contained <code>Hashtable.keys()</code>.
+ /**
+ * Get an enumerator for the parameter keys.
*
* @return An <code>enumerator</code> of the keys.
+ * @deprecated use [EMAIL PROTECTED] #keySet} instead.
*/
Enumeration keys();
- /*
+ /**
+ * Gets the keys.
+ *
+ * @return A <code>Set</code> of the keys.
+ */
+ Set keySet();
+
+ /**
* Returns all the available parameter names.
*
* @return A object array with the keys.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
