mpoeschl 02/02/16 06:11:18
Modified: src/java/org/apache/turbine/util/parser BaseValueParser.java
Log:
Here is a patch to fix the parsing of a TimeSelector when
using the ampm flag. Currently BaseValueParser generates
an IllegalArgumentException if you put in 12:xx pm using a
TimeSelector pulldown. Also anything that is input as
12:xx am will actually get stored as 12:xx pm. I thought
Steven F. Davis
[EMAIL PROTECTED]
Revision Changes Path
1.3 +6 -2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseValueParser.java 15 Nov 2001 23:11:55 -0000 1.2
+++ BaseValueParser.java 16 Feb 2002 14:11:18 -0000 1.3
@@ -111,7 +111,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.2 2001/11/15 23:11:55 jvanzyl Exp $
+ * @version $Id: BaseValueParser.java,v 1.3 2002/02/16 14:11:18 mpoeschl Exp $
*/
public class BaseValueParser
extends RecyclableSupport
@@ -1102,7 +1102,11 @@
// Convert from 12 to 24hr format if appropriate
if (ampm != null)
{
- if (Integer.parseInt(ampm) == Calendar.PM)
+ if ( hour == 12 )
+ {
+ hour = (Integer.parseInt(ampm) == Calendar.PM) ? 12 : 0;
+ }
+ else if (Integer.parseInt(ampm) == Calendar.PM)
{
hour += 12;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
