[Mulgara-svn] r609 - branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst

[pag at mulgara.org]

Author: pag
Date: 2007-12-09 22:16:09 -0600 (Sun, 09 Dec 2007)
New Revision: 609

Modified:
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/FunctionCall.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Literal.java
Log:
Now uses IRIReference rather than Strings for IRIs

Modified: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/FunctionCall.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/FunctionCall.java	2007-12-10 03:33:21 UTC (rev 608)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/FunctionCall.java	2007-12-10 04:16:09 UTC (rev 609)
@@ -22,15 +22,15 @@
  * @licence <a href="{@docRoot}/../../LICENCE.txt">Open Software License v3.0</a>
  */
 public class FunctionCall extends Constraint {
-  private String iriRef;
+  private IRIReference iriRef;
   private List<Expression> args;
 
-  public FunctionCall(String iriRef, List<Expression> args) {
+  public FunctionCall(IRIReference iriRef, List<Expression> args) {
     this.iriRef = iriRef;
     this.args = args;
   }
 
-  public String getIRIRef() {
+  public IRIReference getIRIRef() {
     return iriRef;
   }
 

Modified: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Literal.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Literal.java	2007-12-10 03:33:21 UTC (rev 608)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Literal.java	2007-12-10 04:16:09 UTC (rev 609)
@@ -19,27 +19,27 @@
   
   private String lang;
   
-  private String type;
+  private IRIReference type;
   
-  private Literal(String str, String lang, String type) {
+  private Literal(String str, String lang, IRIReference type) {
     this.str = str;
     this.lang = lang;
     this.type = type;
   }
 
-  static Literal newLangLiteral(String str, String lang) {
+  public static Literal newLangLiteral(String str, String lang) {
     assert str != null : "Literals may not be null";
     assert lang != null : "Language coded literals must not have a null lanugage";
     return new Literal(str, lang, null);
   }
   
-  static Literal newTypedLiteral(String str, String type) {
+  public static Literal newTypedLiteral(String str, IRIReference type) {
     assert str != null : "Literals may not be null";
     assert type != null : "Typed literal must not have a null type";
     return new Literal(str, null, type);
   }
 
-  static Literal newUntypedLiteral(String str) {
+  public static Literal newUntypedLiteral(String str) {
     assert str != null : "Literals may not be null";
     return new Literal(str, null, null);
   }
@@ -59,9 +59,9 @@
   }
 
   /**
-   * @return the type URI as a string, or <code>null</code> if none exists.
+   * @return the type IRI, or <code>null</code> if none exists.
    */
-  public String getType() {
+  public IRIReference getType() {
     return type;
   }