Return-Path: X-Original-To: apmail-jena-commits-archive@www.apache.org Delivered-To: apmail-jena-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C40EC17B72 for ; Fri, 24 Apr 2015 18:44:37 +0000 (UTC) Received: (qmail 15669 invoked by uid 500); 24 Apr 2015 18:44:37 -0000 Delivered-To: apmail-jena-commits-archive@jena.apache.org Received: (qmail 15643 invoked by uid 500); 24 Apr 2015 18:44:37 -0000 Mailing-List: contact commits-help@jena.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jena.apache.org Delivered-To: mailing list commits@jena.apache.org Received: (qmail 15632 invoked by uid 99); 24 Apr 2015 18:44:37 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 18:44:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5BA3BE05E3; Fri, 24 Apr 2015 18:44:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andy@apache.org To: commits@jena.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: jena git commit: Restore behaviour of FormatterElement Date: Fri, 24 Apr 2015 18:44:37 +0000 (UTC) Repository: jena Updated Branches: refs/heads/jena3 024ce8388 -> 86b5ea76b Restore behaviour of FormatterElement Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/86b5ea76 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/86b5ea76 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/86b5ea76 Branch: refs/heads/jena3 Commit: 86b5ea76ba4f27287756f040a72c1d23597e621c Parents: 024ce83 Author: Andy Seaborne Authored: Fri Apr 24 19:44:31 2015 +0100 Committer: Andy Seaborne Committed: Fri Apr 24 19:44:31 2015 +0100 ---------------------------------------------------------------------- .../apache/jena/sparql/serializer/FormatterElement.java | 10 ++++++++-- jena-extras/jena-querybuilder/pom.xml | 11 ----------- pom.xml | 2 +- 3 files changed, 9 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/86b5ea76/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterElement.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterElement.java b/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterElement.java index 8f6bed8..9c8975d 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterElement.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterElement.java @@ -27,6 +27,8 @@ import org.apache.jena.atlas.io.IndentedWriter ; import org.apache.jena.graph.Node ; import org.apache.jena.graph.Triple ; import org.apache.jena.query.Query ; +import org.apache.jena.query.QueryVisitor ; +import org.apache.jena.query.Syntax ; import org.apache.jena.sparql.core.BasicPattern ; import org.apache.jena.sparql.core.PathBlock ; import org.apache.jena.sparql.core.TriplePath ; @@ -449,8 +451,12 @@ public class FormatterElement extends FormatterBase out.print("{ ") ; out.incIndent(INDENT) ; Query q = el.getQuery() ; - q.serialize(out); - // It's SELECT query so no template formatter needed. + + // Serialize with respect to the outer context prologue. + QuerySerializerFactory factory = SerializerRegistry.get().getQuerySerializerFactory(Syntax.syntaxARQ); + QueryVisitor serializer = factory.create(Syntax.syntaxARQ, context.getPrologue() , out); + q.visit(serializer); + out.decIndent(INDENT) ; out.print("}") ; } http://git-wip-us.apache.org/repos/asf/jena/blob/86b5ea76/jena-extras/jena-querybuilder/pom.xml ---------------------------------------------------------------------- diff --git a/jena-extras/jena-querybuilder/pom.xml b/jena-extras/jena-querybuilder/pom.xml index 8e1db3e..cae1272 100644 --- a/jena-extras/jena-querybuilder/pom.xml +++ b/jena-extras/jena-querybuilder/pom.xml @@ -41,15 +41,4 @@ - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jena/blob/86b5ea76/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a4c49c9..824964c 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ - jena-extras +