[Mulgara-svn] r1868 - branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst

[pag at mulgara.org]

Author: pag
Date: 2009-12-09 06:57:09 -0800 (Wed, 09 Dec 2009)
New Revision: 1868

Modified:
   branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst/AbstractNaryOperator.java
   branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst/IRIReference.java
   branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst/Triple.java
   branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst/TripleList.java
   branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst/Variable.java
Log:
Added toString methods for debugging

Modified: branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst/AbstractNaryOperator.java
===================================================================
--- branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst/AbstractNaryOperator.java	2009-12-09 14:56:41 UTC (rev 1867)
+++ branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst/AbstractNaryOperator.java	2009-12-09 14:57:09 UTC (rev 1868)
@@ -61,4 +61,11 @@
    */
   protected abstract String getOperatorString();
 
+  /**
+   * @see java.lang.Object#toString()
+   * @return By default this will return the image, since that's often right.
+   */
+  public String toString() {
+    return getImage();
+  }
 }

Modified: branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst/IRIReference.java
===================================================================
--- branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst/IRIReference.java	2009-12-09 14:56:41 UTC (rev 1867)
+++ branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst/IRIReference.java	2009-12-09 14:57:09 UTC (rev 1868)
@@ -165,6 +165,13 @@
   }
 
   /**
+   * @see java.lang.Object#toString()
+   */
+  public String toString() {
+    return "<" + uri.toString() + ">";
+  }
+
+  /**
    * Parse a URI, looking for a valid QName structure.
    * @param uri The URI to parse.
    * @return a new QName if one could be parsed, or <code>null</code> if one couldn't be found.

Modified: branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst/Triple.java
===================================================================
--- branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst/Triple.java	2009-12-09 14:56:41 UTC (rev 1867)
+++ branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst/Triple.java	2009-12-09 14:57:09 UTC (rev 1868)
@@ -40,16 +40,9 @@
   public Triple(Node s, Node p, Node o) {
     subject = s;
     predicate = p;
-    assert !(o instanceof AnnotatedNode): "Can't make a single triple with an annotated node";
     object = o;
   }
 
-  public Triple(Node s, Node p, AnnotatedNode o) {
-    subject = s;
-    predicate = p;
-    object = o.getSubject();
-  }
-
   /**
    * @return the subject
    */
@@ -98,4 +91,10 @@
     return addPatterns(result.toString());
   }
 
+  /**
+   * @see java.lang.Object#toString()
+   */
+  public String toString() {
+    return subject.toString() + " " + predicate.toString() + " " + object.toString();
+  }
 }

Modified: branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst/TripleList.java
===================================================================
--- branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst/TripleList.java	2009-12-09 14:56:41 UTC (rev 1867)
+++ branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst/TripleList.java	2009-12-09 14:57:09 UTC (rev 1868)
@@ -173,4 +173,12 @@
     addAll(annotations);
   }
 
+  /**
+   * @see java.lang.Object#toString()
+   */
+  public String toString() {
+    StringBuilder b = new StringBuilder();
+    for (Triple t: triples) b.append(t).append(" . ");
+    return b.toString();
+  }
 }

Modified: branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst/Variable.java
===================================================================
--- branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst/Variable.java	2009-12-09 14:56:41 UTC (rev 1867)
+++ branches/distinct_queries/src/jar/querylang/java/org/mulgara/sparql/parser/cst/Variable.java	2009-12-09 14:57:09 UTC (rev 1868)
@@ -47,4 +47,10 @@
     return "?" + name;
   }
 
+  /**
+   * @see java.lang.Object#toString()
+   */
+  public String toString() {
+    return getImage();
+  }
 }