Author: andy
Date: Sun Aug 31 14:37:53 2014
New Revision: 1621594
URL: http://svn.apache.org/r1621594
Log:
Some Tidying up around RDF Thrift
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFactory.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFormatter.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetWriterRegistry.java
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFactory.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFactory.java?rev=1621594&r1=1621593&r2=1621594&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFactory.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFactory.java
Sun Aug 31 14:37:53 2014
@@ -38,6 +38,9 @@ import com.hp.hpl.jena.util.FileManager
/** ResultSetFactory - make result sets from places other than a query. */
public class ResultSetFactory {
+ // See also ResultSetMgr -- this post-dates this code.
+ // Ideally, read operations here should call ResultSetMgr.
+
/**
* Load a result set from file or URL into a result set (memory backed).
*
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFormatter.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFormatter.java?rev=1621594&r1=1621593&r2=1621594&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFormatter.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFormatter.java
Sun Aug 31 14:37:53 2014
@@ -27,6 +27,7 @@ import java.util.Iterator ;
import java.util.List ;
import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.riot.ResultSetMgr ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.RDFNode ;
@@ -51,10 +52,14 @@ import com.hp.hpl.jena.sparql.serializer
import com.hp.hpl.jena.util.FileUtils ;
/** ResultSetFormatter - Convenience ways to call the various output
formatters.
- * in various formats. */
-
-public class ResultSetFormatter
-{
+ * in various formats.
+ * @see ResultSetMgr
+ */
+
+public class ResultSetFormatter {
+ // See also ResultSetMgr -- this post-dates this code.
+ // Ideally, the operation here should call ResultSetMgr.
+
private ResultSetFormatter() {}
/**
* Output a result set in a text format. The result set is consumed.
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetWriterRegistry.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetWriterRegistry.java?rev=1621594&r1=1621593&r2=1621594&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetWriterRegistry.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetWriterRegistry.java
Sun Aug 31 14:37:53 2014
@@ -70,14 +70,15 @@ public class ResultSetWriterRegistry {
// RDFLanguages.register(SPARQLResultSetCSV) ;
// RDFLanguages.register(SPARQLResultSetTSV) ;
// RDFLanguages.register(SPARQLResultSetThrift) ;
+// // Not text.
ResultSetWriterFactory factory = new ResultSetWriterFactoryStd() ;
- register(SPARQLResultSetXML, factory) ;
- register(SPARQLResultSetJSON, factory) ;
- register(SPARQLResultSetCSV, factory) ;
- register(SPARQLResultSetTSV, factory) ;
+ register(SPARQLResultSetXML, factory) ;
+ register(SPARQLResultSetJSON, factory) ;
+ register(SPARQLResultSetCSV, factory) ;
+ register(SPARQLResultSetTSV, factory) ;
register(SPARQLResultSetThrift, factory) ;
- register(SPARQLResultSetText, factory) ;
+ register(SPARQLResultSetText, factory) ;
}
static { ResultSetLang.init(); }