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 2018/09/21 10:38:07 UTC
jena git commit: Ensure newline after printing expression.
Repository: jena
Updated Branches:
refs/heads/master da5d7f9c9 -> 322e1a5d6
Ensure newline after printing expression.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/322e1a5d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/322e1a5d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/322e1a5d
Branch: refs/heads/master
Commit: 322e1a5d6e5a28d530482b6706cc4bdcd4b65cbd
Parents: da5d7f9
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Sep 21 11:34:16 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Sep 21 11:34:16 2018 +0100
----------------------------------------------------------------------
jena-cmds/src/main/java/arq/qexpr.java | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/322e1a5d/jena-cmds/src/main/java/arq/qexpr.java
----------------------------------------------------------------------
diff --git a/jena-cmds/src/main/java/arq/qexpr.java b/jena-cmds/src/main/java/arq/qexpr.java
index 9ef0144..8a3ef41 100644
--- a/jena-cmds/src/main/java/arq/qexpr.java
+++ b/jena-cmds/src/main/java/arq/qexpr.java
@@ -170,22 +170,27 @@ public class qexpr
pmap.setNsPrefixes(ARQConstants.getGlobalPrefixMap()) ;
pmap.setNsPrefix("", "http://example/") ;
pmap.setNsPrefix("ex", "http://example/ns#") ;
-// Node n = asNode() ;
-// return makeNode(n) ;
Expr expr = ExprUtils.parse(exprStr, pmap) ;
- if ( verbose )
- System.out.print(expr.toString()+" => ") ;
-
if ( actionPrint )
{
- if ( actionPrintSPARQL )
- System.out.println(ExprUtils.fmtSPARQL(expr)) ;
- if ( actionPrintPrefix )
- WriterSSE.out(IndentedWriter.stdout, expr, new Prologue(pmap)) ;
+ IndentedWriter iOut = IndentedWriter.stdout;
+
+ if ( actionPrintSPARQL ) {
+ ExprUtils.fmtSPARQL(iOut, expr);
+ iOut.ensureStartOfLine();
+ }
+ if ( actionPrintPrefix ) {
+ WriterSSE.out(iOut, expr, new Prologue(pmap)) ;
+ iOut.ensureStartOfLine();
+ }
+ iOut.flush();
continue ;
}
-
+
+ if ( verbose )
+ System.out.print(expr.toString()+" => ") ;
+
try {
if ( actionCopySubstitute )
{