Author: andy
Date: Sun Jul 27 15:03:42 2014
New Revision: 1613802
URL: http://svn.apache.org/r1613802
Log:
Rename WriterStreamRDFTuples as WriterStreamRDFPlain.
Added:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFPlain.java
- copied, changed from r1613720,
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFTuples.java
Removed:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFTuples.java
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/SinkQuadOutput.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/SinkTripleOutput.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrintingStreamRDF.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/NTriplesWriter.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBase.java
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/SinkQuadOutput.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/SinkQuadOutput.java?rev=1613802&r1=1613801&r2=1613802&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/SinkQuadOutput.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/SinkQuadOutput.java
Sun Jul 27 15:03:42 2014
@@ -25,13 +25,13 @@ import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.system.Prologue ;
-import org.apache.jena.riot.writer.WriterStreamRDFTuples ;
+import org.apache.jena.riot.writer.WriterStreamRDFPlain ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.core.Quad ;
/** A class that print quads, N-Quads style *
- * @see WriterStreamRDFTuples
+ * @see WriterStreamRDFPlain
* @see RDFDataMgr#writeTriples
*/
public class SinkQuadOutput implements Sink<Quad>
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/SinkTripleOutput.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/SinkTripleOutput.java?rev=1613802&r1=1613801&r2=1613802&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/SinkTripleOutput.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/SinkTripleOutput.java
Sun Jul 27 15:03:42 2014
@@ -25,7 +25,7 @@ import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.system.Prologue ;
-import org.apache.jena.riot.writer.WriterStreamRDFTuples ;
+import org.apache.jena.riot.writer.WriterStreamRDFPlain ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
@@ -33,7 +33,7 @@ import com.hp.hpl.jena.graph.Triple ;
/**
* A class that print triples, N-triples style
*
- * @see WriterStreamRDFTuples
+ * @see WriterStreamRDFPlain
* @see RDFDataMgr#writeTriples
*/
public class SinkTripleOutput implements Sink<Triple>
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrintingStreamRDF.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrintingStreamRDF.java?rev=1613802&r1=1613801&r2=1613802&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrintingStreamRDF.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrintingStreamRDF.java
Sun Jul 27 15:03:42 2014
@@ -22,10 +22,10 @@ import java.io.OutputStream ;
import org.apache.jena.atlas.io.AWriter ;
import org.apache.jena.atlas.io.IO ;
-import org.apache.jena.riot.writer.WriterStreamRDFTuples ;
+import org.apache.jena.riot.writer.WriterStreamRDFPlain ;
/** Primarily for debugging */
-public class PrintingStreamRDF extends WriterStreamRDFTuples //implements
StreamRDF
+public class PrintingStreamRDF extends WriterStreamRDFPlain //implements
StreamRDF
{
public PrintingStreamRDF(OutputStream out) {
super(init(out)) ;
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java?rev=1613802&r1=1613801&r2=1613802&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java
Sun Jul 27 15:03:42 2014
@@ -27,7 +27,7 @@ import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.riot.lang.StreamRDFCounting ;
import org.apache.jena.riot.out.CharSpace;
-import org.apache.jena.riot.writer.WriterStreamRDFTuples ;
+import org.apache.jena.riot.writer.WriterStreamRDFPlain ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
@@ -43,15 +43,15 @@ public class StreamRDFLib
/** Send everything to nowhere ... efficiently */
public static StreamRDF sinkNull() { return new
StreamRDFBase() ; }
- public static StreamRDF writer(OutputStream out) { return new
WriterStreamRDFTuples(IO.wrapUTF8(out)) ; }
- public static StreamRDF writer(AWriter out) { return new
WriterStreamRDFTuples(out) ; }
- public static StreamRDF writer(Writer out) { return new
WriterStreamRDFTuples(IO.wrap(out)) ; }
+ public static StreamRDF writer(OutputStream out) { return new
WriterStreamRDFPlain(IO.wrapUTF8(out)) ; }
+ public static StreamRDF writer(AWriter out) { return new
WriterStreamRDFPlain(out) ; }
+ public static StreamRDF writer(Writer out) { return new
WriterStreamRDFPlain(IO.wrap(out)) ; }
public static StreamRDF writer(OutputStream out, CharSpace charSpace)
{
switch (charSpace) {
case ASCII:
- return new WriterStreamRDFTuples(IO.wrapASCII(out), charSpace);
+ return new WriterStreamRDFPlain(IO.wrapASCII(out), charSpace);
case UTF8:
default:
return writer(out);
@@ -60,12 +60,12 @@ public class StreamRDFLib
public static StreamRDF writer(AWriter out, CharSpace charSpace)
{
- return new WriterStreamRDFTuples(out, charSpace);
+ return new WriterStreamRDFPlain(out, charSpace);
}
public static StreamRDF writer(Writer out, CharSpace charSpace)
{
- return new WriterStreamRDFTuples(IO.wrap(out), charSpace);
+ return new WriterStreamRDFPlain(IO.wrap(out), charSpace);
}
public static StreamRDF graph(Graph graph) { return new
ParserOutputGraph(graph) ; }
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/NTriplesWriter.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/NTriplesWriter.java?rev=1613802&r1=1613801&r2=1613802&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/NTriplesWriter.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/NTriplesWriter.java
Sun Jul 27 15:03:42 2014
@@ -91,7 +91,7 @@ public class NTriplesWriter extends Writ
write(out, iter) ;
else
{
- StreamRDF s = new WriterStreamRDFTuples(IO.wrap(out), ASCII) ;
+ StreamRDF s = new WriterStreamRDFPlain(IO.wrap(out), ASCII) ;
write$(s, iter) ;
}
}
@@ -104,7 +104,7 @@ public class NTriplesWriter extends Writ
write(out, iter) ;
else
{
- StreamRDF s = new WriterStreamRDFTuples(IO.wrapASCII(out), ASCII) ;
+ StreamRDF s = new WriterStreamRDFPlain(IO.wrapASCII(out), ASCII) ;
write$(s, iter) ;
}
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBase.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBase.java?rev=1613802&r1=1613801&r2=1613802&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBase.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBase.java
Sun Jul 27 15:03:42 2014
@@ -35,9 +35,10 @@ import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.Quad ;
/** Core engine for output of triples / quads that is streaming.
- * Handles prefixes and base, toegtehr with the environment for processing.
- * If fed only quads, the output is valid TriG.
- * If fed only triples, the output is valid Turtle.
+ * Handles prefixes and base, toegther with the environment for processing.
+ * If fed quads, the output is valid TriG.
+ * If fed only triples, the output is valid Turtle.
+ * Not for N-Quads and N-triples.
*/
public abstract class WriterStreamRDFBase implements StreamRDF
Copied:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFPlain.java
(from r1613720,
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFTuples.java)
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFPlain.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFPlain.java&p1=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFTuples.java&r1=1613720&r2=1613802&rev=1613802&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFTuples.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFPlain.java
Sun Jul 27 15:03:42 2014
@@ -34,7 +34,7 @@ import com.hp.hpl.jena.sparql.core.Quad
* An output of triples / quads that is streaming. It writes N-triples/N-quads.
*/
-public class WriterStreamRDFTuples implements StreamRDF {
+public class WriterStreamRDFPlain implements StreamRDF {
// This class is the overall structure - the NodeFormatter controls the
// appearance of the Nodes themselves.
@@ -45,7 +45,7 @@ public class WriterStreamRDFTuples imple
* Output tuples, using UTF8 output See {@linkplain StreamRDFLib#writer}
for
* ways to create a AWriter object.
*/
- public WriterStreamRDFTuples(AWriter w) {
+ public WriterStreamRDFPlain(AWriter w) {
this(w, CharSpace.UTF8) ;
}
@@ -53,7 +53,7 @@ public class WriterStreamRDFTuples imple
* Output tuples, choosing ASCII or UTF8 See
* {@linkplain StreamRDFLib#writer} for ways to create a AWriter object.
*/
- public WriterStreamRDFTuples(AWriter w, CharSpace charSpace) {
+ public WriterStreamRDFPlain(AWriter w, CharSpace charSpace) {
out = w ;
nodeFmt = new NodeFormatterNT(charSpace) ;
}
