[CIShell-SVN] SF.net SVN: cishell:[969] trunk/core/org.cishell.utilities/src/org/cishell/ utilities/DateUtilities.java

[<pat...@us...>]

Revision: 969
          http://cishell.svn.sourceforge.net/cishell/?rev=969&view=rev
Author:   pataphil
Date:     2009-10-17 20:09:31 +0000 (Sat, 17 Oct 2009)

Log Message:
-----------
* Added version of DateUtilities.parseDate that uses a default suggestedDateFormat (MONTH_DAY_YEAR_DATE_FORMAT) to make edu.iu.scipolicy.converter.nsf.csv_to_db happy.
* Also renamed date format arrays to include YEAR_ in their names.
* Removed some commented-out System.err.println calls.

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 19:59:58 UTC (rev 968)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/DateUtilities.java	2009-10-17 20:09:31 UTC (rev 969)
@@ -175,7 +175,7 @@
 	}
 	
 	//TODO: These should be sorted so the first format checked is the most likely format, etc...
-	private static final DateFormat[] MONTH_DAY_DATE_FORMATS = { 
+	private static final DateFormat[] MONTH_DAY_YEAR_DATE_FORMATS = { 
 		new SimpleDateFormat("MM-d-yy"),
 		new SimpleDateFormat("MM-d-yyyy"),
 		new SimpleDateFormat("MM-dd-yy"),
@@ -198,7 +198,7 @@
 		DateFormat.getDateInstance(DateFormat.LONG),
 	};
 	
-	private static final DateFormat[] DAY_MONTH_DATE_FORMATS = { 
+	private static final DateFormat[] DAY_MONTH_YEAR_DATE_FORMATS = { 
 		DateFormat.getDateInstance(DateFormat.FULL),
 		new SimpleDateFormat("d-MM-yy"),
 		new SimpleDateFormat("d-MM-yyyy"),
@@ -222,15 +222,16 @@
 		DateFormat.getDateInstance(DateFormat.LONG),
 	};
 	
+	public static Date parseDate(String dateString) throws ParseException {
+		return (parseDate(dateString, MONTH_DAY_YEAR_DATE_FORMATS));
+	}
+	
 	public static Date parseDate(String dateString, String suggestedDateFormat)
 			throws ParseException {
-		/*System.err.println("suggestedDateFormat: " + 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);
+			return parseDate(dateString, MONTH_DAY_YEAR_DATE_FORMATS);
 		} else if (DAY_MONTH_YEAR_DATE_FORMAT.equals(suggestedDateFormat)) {
-			return parseDate(dateString, DAY_MONTH_DATE_FORMATS);
+			return parseDate(dateString, DAY_MONTH_YEAR_DATE_FORMATS);
 		} else {
 			DateFormat[] dateFormats = new DateFormat[] {
 				new SimpleDateFormat(suggestedDateFormat)
@@ -359,7 +360,7 @@
 	
 //	private java.util.Date parseDate(String dateString) 
 //		throws AlgorithmExecutionException {
-//		for (DateFormat format : MONTH_DAY_DATE_FORMATS) {
+//		for (DateFormat format : MONTH_DAY_YEAR_DATE_FORMATS) {
 //			try {
 //				format.setLenient(false);
 //				java.util.Date date = format.parse(dateString);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.