On 8/14/01 1:18 PM, "Daniel Rall" <[EMAIL PROTECTED]> wrote:
> Won't commenting out those methods while leaving their JavaDoc cause
> problems for doc generation? Might want to either remove one of the *
> characters on the JavaDoc comment open, or use line comments to
> comment it out.
It should all go comments and all!
> [EMAIL PROTECTED] writes:
>
>> jvanzyl 01/08/14 07:49:22
>>
>> Modified: src/java/org/apache/turbine/util/parser BaseValueParser.java
>> ValueParser.java
>> Log:
>> - removing torque references in the base value parser. i think this
>> is something i added 6 months ago as a work around but never removed.
>>
>> the sample app works fine without it and i built scarab just
>> to make sure. this will allow me to pull out the parsers and
>> place them in the commons.
>>
>> Revision Changes Path
>> 1.27 +3 -53
>> jakarta-turbine/src/java/org/apache/turbine/util/parser/BaseValueParser.java
>>
>> Index: BaseValueParser.java
>> ===================================================================
>> RCS file:
>> /home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/parser/BaseValuePa
>> rser.java,v
>> retrieving revision 1.26
>> retrieving revision 1.27
>> diff -u -r1.26 -r1.27
>> --- BaseValueParser.java 2001/08/10 12:12:32 1.26
>> +++ BaseValueParser.java 2001/08/14 14:49:22 1.27
>> @@ -68,8 +68,6 @@
>> import java.util.GregorianCalendar;
>> import java.util.Hashtable;
>> import org.apache.turbine.Turbine;
>> -import org.apache.torque.om.NumberKey;
>> -import org.apache.torque.om.StringKey;
>> import org.apache.fulcrum.pool.Recyclable;
>> import org.apache.fulcrum.pool.RecyclableSupport;
>> import org.apache.commons.util.StringUtils;
>> @@ -100,7 +98,7 @@
>> * @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
>> * @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
>> * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
>> - * @version $Id: BaseValueParser.java,v 1.26 2001/08/10 12:12:32 knielsen
>> Exp $
>> + * @version $Id: BaseValueParser.java,v 1.27 2001/08/14 14:49:22 jvanzyl
>> Exp $
>> */
>> public class BaseValueParser
>> extends RecyclableSupport
>> @@ -1047,56 +1045,6 @@
>> }
>>
>> /**
>> - * Return an NumberKey for the given name. If the name does not
>> - * exist, return null.
>> - *
>> - * @param name A String with the name.
>> - * @return A NumberKey, or <code>null</code> if unparsable.
>> - */
>> - public NumberKey getNumberKey(String name)
>> - {
>> - try
>> - {
>> - String value = null;
>> - Object object = parameters.get(convert(name));
>> - if (object != null)
>> - {
>> - value = ((String[])object)[0];
>> - }
>> - return (StringUtils.isValid(value) ? new NumberKey(value) :
>> null);
>> - }
>> - catch ( ClassCastException e )
>> - {
>> - return null;
>> - }
>> - }
>> -
>> - /**
>> - * Return an StringKey for the given name. If the name does not
>> - * exist, return null.
>> - *
>> - * @param name A String with the name.
>> - * @return An StringKey.
>> - */
>> - public StringKey getStringKey(String name)
>> - {
>> - try
>> - {
>> - String value = null;
>> - Object object = parameters.get(convert(name));
>> - if (object != null)
>> - {
>> - value = ((String[])object)[0];
>> - }
>> - return (StringUtils.isValid(value) ? new StringKey(value) :
>> null);
>> - }
>> - catch ( ClassCastException e )
>> - {
>> - return null;
>> - }
>> - }
>> -
>> - /**
>> * Uses bean introspection to set writable properties of bean from
>> * the parameters, where a (case-insensitive) name match between
>> * the bean property and the parameter is looked for.
>> @@ -1253,6 +1201,7 @@
>> {
>> args[0] = getDate(prop.getName());
>> }
>> + /*
>> else if (propclass == NumberKey.class)
>> {
>> args[0] = getNumberKey(prop.getName());
>> @@ -1261,6 +1210,7 @@
>> {
>> args[0] = getStringKey(prop.getName());
>> }
>> + */
>> else
>> {
>> throw new Exception("property "
>>
>>
>>
>> 1.7 +3 -6
>> jakarta-turbine/src/java/org/apache/turbine/util/parser/ValueParser.java
>>
>> Index: ValueParser.java
>> ===================================================================
>> RCS file:
>> /home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/parser/ValueParser
>> .java,v
>> retrieving revision 1.6
>> retrieving revision 1.7
>> diff -u -r1.6 -r1.7
>> --- ValueParser.java 2001/08/10 12:12:32 1.6
>> +++ ValueParser.java 2001/08/14 14:49:22 1.7
>> @@ -59,9 +59,6 @@
>> import java.text.DateFormat;
>> import java.util.Date;
>> import java.util.Enumeration;
>> -//!! why are these here? jvz.
>> -import org.apache.torque.om.NumberKey;
>> -import org.apache.torque.om.StringKey;
>>
>> /**
>> * ValueParser is a base interface for classes that need to parse
>> @@ -78,7 +75,7 @@
>> * @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
>> * @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
>> * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
>> - * @version $Id: ValueParser.java,v 1.6 2001/08/10 12:12:32 knielsen Exp $
>> + * @version $Id: ValueParser.java,v 1.7 2001/08/14 14:49:22 jvanzyl Exp $
>> */
>> public interface ValueParser
>> {
>> @@ -591,7 +588,7 @@
>> * @param name A String with the name.
>> * @return An NumberKey.
>> */
>> - public NumberKey getNumberKey(String name);
>> + //public NumberKey getNumberKey(String name);
>>
>> /**
>> * Return an NumberKey for the given name. If the name does not
>> @@ -600,7 +597,7 @@
>> * @param name A String with the name.
>> * @return An StringKey.
>> */
>> - public StringKey getStringKey(String name);
>> + //public StringKey getStringKey(String name);
>>
>> /**
>> * Uses bean introspection to set writable properties of bean from
>>
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: [EMAIL PROTECTED]
>> For additional commands, e-mail: [EMAIL PROTECTED]
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
--
jvz.
Jason van Zyl
http://tambora.zenplex.org
http://jakarta.apache.org/turbine
http://jakarta.apache.org/velocity
http://jakarta.apache.org/alexandria
http://jakarta.apache.org/commons
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
