[Mulgara-svn] r981 - trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa

[pag at mulgara.org]

Author: pag
Date: 2008-06-06 15:50:19 -0700 (Fri, 06 Jun 2008)
New Revision: 981

Modified:
   trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateImpl.java
Log:
Changed from Mousepushers utility to Joda time

Modified: trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateImpl.java
===================================================================
--- trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateImpl.java	2008-06-06 07:22:40 UTC (rev 980)
+++ trunk/src/jar/store-stringpool/java/org/mulgara/store/stringpool/xa/SPDateImpl.java	2008-06-06 22:50:19 UTC (rev 981)
@@ -30,18 +30,14 @@
 // Java 2 standard packages
 import java.net.URI;
 import java.nio.ByteBuffer;
-import java.text.ParseException;
 import java.util.Date;
-import java.util.Locale;
 
 // Third party packages
 import org.apache.log4j.Logger;
 
-// Date utils
-import com.mousepushers.date.DateParser;
-import com.mousepushers.date.DateFormatter;
-
 // Locally written packages
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
 import org.mulgara.query.rdf.XSD;
 import org.mulgara.store.stringpool.*;
 import org.mulgara.util.Constants;
@@ -69,6 +65,7 @@
  */
 public final class SPDateImpl extends AbstractSPTypedLiteral {
 
+  @SuppressWarnings("unused")
   private final static Logger logger = Logger.getLogger(SPDateImpl.class);
 
   static final int TYPE_ID = 5; // Unique ID
@@ -100,13 +97,9 @@
 
 
   static SPDateImpl newInstance(String lexicalForm) {
-    try {
-      Date date = DateParser.parse(lexicalForm, XSD.DATE_FORMAT,
-          Locale.getDefault());
-      return new SPDateImpl(date);
-    } catch (ParseException ex) {
-      throw new IllegalArgumentException("Cannot parse date: " + lexicalForm);
-    }
+    DateTimeFormatter parser = ISODateTimeFormat.dateElementParser();
+    Date date = new Date(parser.parseDateTime(lexicalForm).getMillis());
+    return new SPDateImpl(date);
   }
 
 
@@ -126,9 +119,7 @@
 
 
   public String getLexicalForm() {
-    String dateTime = DateFormatter.formatDate(date, XSD.DATE_FORMAT,
-        Locale.getDefault());
-    return dateTime;
+    return ISODateTimeFormat.date().print(date.getTime());
   }