You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2011/08/13 18:47:07 UTC
svn commit: r1157391 - in
/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena:
query/SortCondition.java sparql/util/PrintSerializableBase.java
sparql/util/QueryOutputUtils.java
Author: andy
Date: Sat Aug 13 16:47:07 2011
New Revision: 1157391
URL: http://svn.apache.org/viewvc?rev=1157391&view=rev
Log:
SortCondition .toString
Modified:
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/SortCondition.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/util/PrintSerializableBase.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/util/QueryOutputUtils.java
Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/SortCondition.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/SortCondition.java?rev=1157391&r1=1157390&r2=1157391&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/SortCondition.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/SortCondition.java Sat Aug 13 16:47:07 2011
@@ -12,6 +12,7 @@ import org.openjena.atlas.logging.Log ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.core.Var ;
+import com.hp.hpl.jena.sparql.engine.Plan ;
import com.hp.hpl.jena.sparql.expr.E_Function ;
import com.hp.hpl.jena.sparql.expr.Expr ;
import com.hp.hpl.jena.sparql.expr.ExprVar ;
@@ -122,8 +123,20 @@ public class SortCondition extends Print
return true ;
}
+ @Override
+ public void output(IndentedWriter out)
+ {
+ out.print(Plan.startMarker) ;
+ out.print("SortCondition ") ;
+ FmtExpr fmt = new FmtExpr(out, null) ;
+ format(fmt, out) ;
+ out.print(Plan.finishMarker) ;
+ }
+
public void output(IndentedWriter out, SerializationContext sCxt)
{
+ if ( sCxt == null )
+ sCxt = new SerializationContext() ;
FmtExpr fmt = new FmtExpr(out, sCxt) ;
format(fmt, out) ;
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/util/PrintSerializableBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/util/PrintSerializableBase.java?rev=1157391&r1=1157390&r2=1157391&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/util/PrintSerializableBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/util/PrintSerializableBase.java Sat Aug 13 16:47:07 2011
@@ -10,6 +10,7 @@ import org.openjena.atlas.io.IndentedWri
import org.openjena.atlas.io.PrintUtils ;
import com.hp.hpl.jena.shared.PrefixMapping ;
+import com.hp.hpl.jena.sparql.engine.Plan ;
public abstract class PrintSerializableBase implements PrintSerializable
{
@@ -21,8 +22,13 @@ public abstract class PrintSerializableB
public final String toString()
{ return PrintUtils.toString(this) ; }
+ /** Normally overridden for better information */
public void output(IndentedWriter out)
- { QueryOutputUtils.output(this, out) ; }
+ {
+ out.print(Plan.startMarker) ;
+ out.print(Utils.className(this)) ;
+ out.print(Plan.finishMarker) ;
+ }
}
/*
Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/util/QueryOutputUtils.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/util/QueryOutputUtils.java?rev=1157391&r1=1157390&r2=1157391&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/util/QueryOutputUtils.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/util/QueryOutputUtils.java Sat Aug 13 16:47:07 2011
@@ -37,17 +37,6 @@ public class QueryOutputUtils
public static String toString(PrintSerializable item)
{ return toString(item, null) ; }
- /** Normally overridden for better information */
- public static void output(PrintSerializable item, IndentedWriter out)
- {
-// SerializationContext sCxt = new SerializationContext() ;
-// item.output(out, sCxt) ;
- out.print(Plan.startMarker) ;
- out.print(Utils.className(item)) ;
- out.print(Plan.finishMarker) ;
- }
-
-
// ModQueryOut
public static void printPlan(Query query, QueryExecution qe)