[Mulgara-svn] r885 - trunk/src/jar/query/java/org/mulgara/query/filter/value

[pag at mulgara.org]

Author: pag
Date: 2008-05-01 10:55:57 -0700 (Thu, 01 May 2008)
New Revision: 885

Modified:
   trunk/src/jar/query/java/org/mulgara/query/filter/value/Bool.java
   trunk/src/jar/query/java/org/mulgara/query/filter/value/DateTime.java
   trunk/src/jar/query/java/org/mulgara/query/filter/value/SimpleLiteral.java
Log:
Using the URIs defined in XSD

Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/Bool.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/Bool.java	2008-05-01 17:53:25 UTC (rev 884)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/Bool.java	2008-05-01 17:55:57 UTC (rev 885)
@@ -15,6 +15,7 @@
 
 import org.mulgara.query.QueryException;
 import org.mulgara.query.filter.Context;
+import static org.mulgara.query.rdf.XSD.BOOLEAN_URI;
 
 /**
  * A boolean value.
@@ -30,10 +31,10 @@
   private static final long serialVersionUID = -1139308134744630943L;
 
   /** xsd:boolean */
-  public static final URI TYPE = URI.create(XSD_NS + "boolean");
+  public static final URI TYPE = BOOLEAN_URI;
 
   /** xsd:boolean as an IRI */
-  public static final IRI IRI_TYPE = new IRI(URI.create(XSD_NS + "boolean"));
+  public static final IRI IRI_TYPE = new IRI(BOOLEAN_URI);
 
   /** A single boolean value for true */
   public static final Bool TRUE = new Bool(Boolean.TRUE);

Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/DateTime.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/DateTime.java	2008-05-01 17:53:25 UTC (rev 884)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/DateTime.java	2008-05-01 17:55:57 UTC (rev 885)
@@ -18,6 +18,8 @@
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 
+import static org.mulgara.query.rdf.XSD.DATE_TIME_URI;
+
 /**
  * A date value.
  *
@@ -32,7 +34,7 @@
   private static final long serialVersionUID = 7517437419033492738L;
 
   /** xsd:dateTime */
-  public static final URI TYPE = URI.create(XSD_NS + "dateTime");
+  public static final URI TYPE = DATE_TIME_URI;
 
   /** Singleton reference to the datatype factory for date parsers */
   private static DatatypeFactory factory;

Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/SimpleLiteral.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/SimpleLiteral.java	2008-05-01 17:53:25 UTC (rev 884)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/SimpleLiteral.java	2008-05-01 17:55:57 UTC (rev 885)
@@ -15,6 +15,7 @@
 import org.mulgara.query.filter.Context;
 import org.mulgara.query.filter.ContextOwner;
 import org.mulgara.query.filter.RDFTerm;
+import static org.mulgara.query.rdf.XSD.STRING_URI;
 
 
 /**
@@ -37,7 +38,7 @@
   private SimpleLiteral lang = EMPTY;
 
   /** The type used for strings */
-  public static final IRI STRING_TYPE = new IRI(new TypedLiteral.XSDString().getTypeURI());
+  public static final IRI STRING_TYPE = new IRI(STRING_URI);
 
   /**
    * Creates the value to wrap the string