From: <pat...@us...> - 2009-10-17 20:33:33
|
Revision: 968 http://cishell.svn.sourceforge.net/cishell/?rev=968&view=rev Author: pataphil Date: 2009-10-17 19:59:58 +0000 (Sat, 17 Oct 2009) Log Message: ----------- Changed contents of DateUtilities.MONTH_DAY_YEAR_DATE_FORMAT and DateUtilities.DAY_MONTH_YEAR_DATE_FORMAT to reflect Katy's requests. Modified Paths: -------------- trunk/core/org.cishell.utilities/src/org/cishell/utilities/DateUtilities.java Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/DateUtilities.java =================================================================== --- trunk/core/org.cishell.utilities/src/org/cishell/utilities/DateUtilities.java 2009-10-17 00:25:32 UTC (rev 967) +++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/DateUtilities.java 2009-10-17 19:59:58 UTC (rev 968) @@ -10,10 +10,10 @@ // TODO: Fix this class. public class DateUtilities { - public static final String MONTH_DAY_DATE_FORMAT = - "Month-Then-Day Date Format"; - public static final String DAY_MONTH_DATE_FORMAT = - "Day-Then-Month Date Format"; + public static final String MONTH_DAY_YEAR_DATE_FORMAT = + "Month-Day-Year Date Format"; + public static final String DAY_MONTH_YEAR_DATE_FORMAT = + "Day-Month-Year Date Format"; public final static double AVERAGE_MILLIS_PER_MONTH = (365.24 * 24 * 60 * 60 * 1000 / 12); @@ -225,11 +225,11 @@ public static Date parseDate(String dateString, String suggestedDateFormat) throws ParseException { /*System.err.println("suggestedDateFormat: " + suggestedDateFormat); - System.err.println("MONTH_DAY_DATE_FORMAT: " + MONTH_DAY_DATE_FORMAT); - System.err.println("DAY_MONTH_DATE_FORMAT: " + DAY_MONTH_DATE_FORMAT);*/ - if (MONTH_DAY_DATE_FORMAT.equals(suggestedDateFormat)) { + System.err.println("MONTH_DAY_YEAR_DATE_FORMAT: " + MONTH_DAY_YEAR_DATE_FORMAT); + System.err.println("DAY_MONTH_YEAR_DATE_FORMAT: " + DAY_MONTH_YEAR_DATE_FORMAT);*/ + if (MONTH_DAY_YEAR_DATE_FORMAT.equals(suggestedDateFormat)) { return parseDate(dateString, MONTH_DAY_DATE_FORMATS); - } else if (DAY_MONTH_DATE_FORMAT.equals(suggestedDateFormat)) { + } else if (DAY_MONTH_YEAR_DATE_FORMAT.equals(suggestedDateFormat)) { return parseDate(dateString, DAY_MONTH_DATE_FORMATS); } else { DateFormat[] dateFormats = new DateFormat[] { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |