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 2014/01/01 13:46:30 UTC
svn commit: r1554616 - in /jena/trunk/jena-arq: src-examples/arq/examples/
src/main/java/arq/ src/main/java/com/hp/hpl/jena/sparql/algebra/table/
src/main/java/com/hp/hpl/jena/sparql/util/
src/main/java/org/apache/jena/riot/out/
Author: andy
Date: Wed Jan 1 12:46:30 2014
New Revision: 1554616
URL: http://svn.apache.org/r1554616
Log:
Some preliminary/investigatory clearing up of FmtUtils for NodeFmtLib.
Modified:
jena/trunk/jena-arq/src-examples/arq/examples/AlgebraExec.java
jena/trunk/jena-arq/src/main/java/arq/qexpr.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/Table1.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/FmtUtils.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFmtLib.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeToLabel.java
Modified: jena/trunk/jena-arq/src-examples/arq/examples/AlgebraExec.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src-examples/arq/examples/AlgebraExec.java?rev=1554616&r1=1554615&r2=1554616&view=diff
==============================================================================
--- jena/trunk/jena-arq/src-examples/arq/examples/AlgebraExec.java (original)
+++ jena/trunk/jena-arq/src-examples/arq/examples/AlgebraExec.java Wed Jan 1 12:46:30 2014
@@ -21,17 +21,15 @@ package arq.examples;
import java.util.ArrayList ;
import java.util.List ;
+import org.apache.jena.riot.out.NodeFmtLib ;
+
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.query.ResultSet ;
import com.hp.hpl.jena.query.ResultSetFormatter ;
-import com.hp.hpl.jena.rdf.model.Model ;
-import com.hp.hpl.jena.rdf.model.ModelFactory ;
-import com.hp.hpl.jena.rdf.model.Property ;
-import com.hp.hpl.jena.rdf.model.RDFNode ;
-import com.hp.hpl.jena.rdf.model.Resource ;
+import com.hp.hpl.jena.rdf.model.* ;
import com.hp.hpl.jena.sparql.algebra.Algebra ;
import com.hp.hpl.jena.sparql.algebra.Op ;
import com.hp.hpl.jena.sparql.algebra.op.OpBGP ;
@@ -45,7 +43,6 @@ import com.hp.hpl.jena.sparql.expr.E_Les
import com.hp.hpl.jena.sparql.expr.Expr ;
import com.hp.hpl.jena.sparql.expr.ExprVar ;
import com.hp.hpl.jena.sparql.expr.NodeValue ;
-import com.hp.hpl.jena.sparql.util.FmtUtils ;
/** Build an algebra expression and execute it */
@@ -82,7 +79,7 @@ public class AlgebraExec
{
Binding b = qIter.nextBinding() ;
Node n = b.get(var_x) ;
- System.out.println(FmtUtils.stringForNode(n)) ;
+ System.out.println(NodeFmtLib.displayStr(n)) ;
System.out.println(b) ;
}
qIter.close() ;
Modified: jena/trunk/jena-arq/src/main/java/arq/qexpr.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/arq/qexpr.java?rev=1554616&r1=1554615&r2=1554616&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/arq/qexpr.java (original)
+++ jena/trunk/jena-arq/src/main/java/arq/qexpr.java Wed Jan 1 12:46:30 2014
@@ -22,6 +22,7 @@ import java.util.Iterator ;
import org.apache.jena.atlas.io.IndentedWriter ;
import org.apache.jena.atlas.logging.LogCtl ;
+import org.apache.jena.riot.out.NodeFmtLib ;
import arq.cmd.CmdException ;
import arq.cmd.CmdUtils ;
import arq.cmd.TerminationException ;
@@ -43,7 +44,6 @@ import com.hp.hpl.jena.sparql.expr.NodeV
import com.hp.hpl.jena.sparql.function.FunctionEnv ;
import com.hp.hpl.jena.sparql.sse.WriterSSE ;
import com.hp.hpl.jena.sparql.util.ExprUtils ;
-import com.hp.hpl.jena.sparql.util.FmtUtils ;
import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
/** A program to execute expressions from the command line. */
@@ -194,7 +194,7 @@ public class qexpr
NodeValue r = expr.eval(null, env) ;
//System.out.println(r.asQuotedString()) ;
Node n = r.asNode() ;
- String s = FmtUtils.stringForNode(n) ;
+ String s = NodeFmtLib.displayStr(n) ;
System.out.println(s) ;
}
} catch (ExprEvalException ex)
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/Table1.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/Table1.java?rev=1554616&r1=1554615&r2=1554616&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/Table1.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/Table1.java Wed Jan 1 12:46:30 2014
@@ -23,6 +23,7 @@ import java.util.Iterator ;
import java.util.List ;
import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.riot.out.NodeFmtLib ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.core.Var ;
@@ -33,7 +34,6 @@ import com.hp.hpl.jena.sparql.engine.bin
import com.hp.hpl.jena.sparql.engine.iterator.QueryIterNullIterator ;
import com.hp.hpl.jena.sparql.engine.iterator.QueryIterSingleton ;
import com.hp.hpl.jena.sparql.expr.ExprList ;
-import com.hp.hpl.jena.sparql.util.FmtUtils ;
/** A table of one row of one binding */
public class Table1 extends TableBase {
@@ -115,6 +115,6 @@ public class Table1 extends TableBase {
@Override
public String toString() {
- return "Table1(" + var + "," + FmtUtils.stringForNode(value) + ")" ;
+ return "Table1(" + var + "," + NodeFmtLib.displayStr(value) + ")" ;
}
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/FmtUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/FmtUtils.java?rev=1554616&r1=1554615&r2=1554616&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/FmtUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/FmtUtils.java Wed Jan 1 12:46:30 2014
@@ -21,7 +21,6 @@ package com.hp.hpl.jena.sparql.util;
import java.util.Locale ;
import java.util.regex.Pattern ;
-
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Node_Literal ;
import com.hp.hpl.jena.graph.Triple ;
@@ -31,6 +30,7 @@ import org.apache.jena.atlas.logging.Log
import org.apache.jena.iri.IRI ;
import org.apache.jena.iri.IRIFactory ;
import org.apache.jena.iri.IRIRelativize ;
+
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.RDFNode ;
import com.hp.hpl.jena.rdf.model.Resource ;
@@ -49,7 +49,7 @@ import com.hp.hpl.jena.vocabulary.XSD ;
public class FmtUtils
{
- // OLD CODE - being replaces by riot.NodeFmtLib
+ // OLD CODE - being replaced by riot.NodeFmtLib
// Consider withdrawing non-serialzation context forms of this.
// Or a temporary SerialzationContext does not abbreviate bNodes.
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFmtLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFmtLib.java?rev=1554616&r1=1554615&r2=1554616&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFmtLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFmtLib.java Wed Jan 1 12:46:30 2014
@@ -41,9 +41,16 @@ import com.hp.hpl.jena.sparql.ARQConstan
import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.util.FmtUtils ;
-/** Presentation utilitiles for Nodes, Triples, Quads and more */
+/** Presentation utilitiles for Nodes, Triples, Quads and more.
+ * <p>
+ * Methods <tt>str</tt> generate a reparsable string.
+ * <p>
+ * Methods <tt>displayStr</tt> do not guarantee a reparsable string
+ * e.g. may use abbreviations or common prefixes.
+ */
public class NodeFmtLib
{
+ // Replaces FmtUtils
// See OutputLangUtils.
// See and use EscapeStr
@@ -75,6 +82,7 @@ public class NodeFmtLib
/** A displayable string for an RDFNode. Includes common abbreviations */
public static String displayStr(RDFNode obj)
{
+ //XXX Move code over
return FmtUtils.stringForRDFNode(obj) ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeToLabel.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeToLabel.java?rev=1554616&r1=1554615&r2=1554616&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeToLabel.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeToLabel.java Wed Jan 1 12:46:30 2014
@@ -26,8 +26,6 @@ import org.apache.jena.riot.system.MapWi
import org.apache.jena.riot.system.SyntaxLabels ;
import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.graph.Node_Literal ;
-import com.hp.hpl.jena.sparql.util.FmtUtils ;
/** Map nodes to string (usually, blank nodes to labels).
* See {@link SyntaxLabels#createNodeToLabel} for getting a default setup.
@@ -133,7 +131,7 @@ public class NodeToLabel extends MapWith
protected String labelForLiteral(Node node)
{
- return FmtUtils.stringForLiteral((Node_Literal)node, null) ;
+ return NodeFmtLib.str(node) ;
}
protected String labelForVar(Node node)