jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject jena git commit: Restore behaviour of FormatterElement
Date Fri, 24 Apr 2015 18:44:37 GMT
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 <andy@apache.org>
Authored: Fri Apr 24 19:44:31 2015 +0100
Committer: Andy Seaborne <andy@apache.org>
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 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
\ 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 @@
         <!-- <module>apache-jena-libs</module>    -->
         <!-- <module>apache-jena</module>         -->
         <!-- <module>jena-elephas</module> -->
-        <module>jena-extras</module>
+	<!-- <module>jena-extras</module> -->
       </modules>
     </profile>
 


Mime
View raw message