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 2013/03/06 19:51:17 UTC
svn commit: r1453477 - in /jena/branches/arq-riot-output/src/main/java:
com/hp/hpl/jena/sparql/engine/binding/ com/hp/hpl/jena/sparql/resultset/
org/apache/jena/atlas/io/ org/apache/jena/riot/out/
org/apache/jena/riot/system/ org/apache/jena/riot/writer/
Author: andy
Date: Wed Mar 6 18:51:17 2013
New Revision: 1453477
URL: http://svn.apache.org/r1453477
Log:
Rename WriterI as AWriter
Added:
jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/AWriter.java
- copied, changed from r1452591, jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/WriterI.java
jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/AWriterBase.java
- copied, changed from r1452591, jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/WriterIBase.java
Removed:
jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/WriterI.java
jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/WriterIBase.java
Modified:
jena/branches/arq-riot-output/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingOutputStream.java
jena/branches/arq-riot-output/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVOutput.java
jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/IO.java
jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java
jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/Writer2.java
jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/EscapeStr.java
jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NodeFormatter.java
jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NodeFormatterNT.java
jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NodeFormatterTTL.java
jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/OutputUtils.java
jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/SinkQuadOutput.java
jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/SinkTripleOutput.java
jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java
jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFTuples.java
Modified: jena/branches/arq-riot-output/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingOutputStream.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingOutputStream.java?rev=1453477&r1=1453476&r2=1453477&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingOutputStream.java (original)
+++ jena/branches/arq-riot-output/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingOutputStream.java Wed Mar 6 18:51:17 2013
@@ -25,7 +25,7 @@ import java.util.List ;
import java.util.Map ;
import org.apache.jena.atlas.io.IO ;
-import org.apache.jena.atlas.io.WriterI ;
+import org.apache.jena.atlas.io.AWriter ;
import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.iri.IRI ;
@@ -40,7 +40,7 @@ import com.hp.hpl.jena.sparql.core.Var ;
/** Parser for the RDF Tuples language */
public class BindingOutputStream implements Sink<Binding>
{
- private final WriterI bw ;
+ private final AWriter bw ;
private Binding lastBinding = null ;
private List<Var> vars = null ;
private PrefixMap pmap ;
Modified: jena/branches/arq-riot-output/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVOutput.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVOutput.java?rev=1453477&r1=1453476&r2=1453477&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVOutput.java (original)
+++ jena/branches/arq-riot-output/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVOutput.java Wed Mar 6 18:51:17 2013
@@ -24,7 +24,7 @@ import java.util.ArrayList ;
import java.util.List ;
import org.apache.jena.atlas.io.IO ;
-import org.apache.jena.atlas.io.WriterI ;
+import org.apache.jena.atlas.io.AWriter ;
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.riot.out.NodeFormatterTTL ;
@@ -54,7 +54,7 @@ public class TSVOutput extends OutputBas
//Use a Turtle formatter to format terms
NodeFormatterTTL formatter = new NodeFormatterTTL(null, null);
- WriterI w = IO.wrapUTF8(out) ;
+ AWriter w = IO.wrapUTF8(out) ;
String sep = null ;
List<String> varNames = resultSet.getResultVars() ;
Copied: jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/AWriter.java (from r1452591, jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/WriterI.java)
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/AWriter.java?p2=jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/AWriter.java&p1=jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/WriterI.java&r1=1452591&r2=1453477&rev=1453477&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/WriterI.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/AWriter.java Wed Mar 6 18:51:17 2013
@@ -23,7 +23,7 @@ import org.apache.jena.atlas.lib.Closeab
/** Simple abstraction of a string/character output stream */
-public interface WriterI extends Closeable
+public interface AWriter extends Closeable
{
public void write(char ch) ;
public void write(char[] cbuf) ;
Copied: jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/AWriterBase.java (from r1452591, jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/WriterIBase.java)
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/AWriterBase.java?p2=jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/AWriterBase.java&p1=jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/WriterIBase.java&r1=1452591&r2=1453477&rev=1453477&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/WriterIBase.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/AWriterBase.java Wed Mar 6 18:51:17 2013
@@ -21,7 +21,7 @@ package org.apache.jena.atlas.io;
/** Simple abstraction of a string/character output stream */
-public abstract class WriterIBase implements WriterI
+public abstract class AWriterBase implements AWriter
{
@Override
public final void write(char ch) { print(ch) ; }
Modified: jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/IO.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/IO.java?rev=1453477&r1=1453476&r2=1453477&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/IO.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/IO.java Wed Mar 6 18:51:17 2013
@@ -129,13 +129,13 @@ public class IO
}
/** Wrap in a general writer interface */
- static public WriterI wrap(Writer w)
+ static public AWriter wrap(Writer w)
{
return Writer2.wrap(w) ;
}
/** Wrap in a general writer interface */
- static public WriterI wrapUTF8(OutputStream out) { return wrap(asUTF8(out)); }
+ static public AWriter wrapUTF8(OutputStream out) { return wrap(asUTF8(out)); }
/** Create a print writer that uses UTF-8 encoding */
static public PrintWriter asPrintWriterUTF8(OutputStream out) {
@@ -197,7 +197,7 @@ public class IO
try { out.flush(); } catch (IOException ex) { exception(ex) ; }
}
- public static void flush(WriterI out)
+ public static void flush(AWriter out)
{
if ( out == null )
return ;
Modified: jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java?rev=1453477&r1=1453476&r2=1453477&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java Wed Mar 6 18:51:17 2013
@@ -30,7 +30,7 @@ import org.apache.jena.atlas.lib.Closeab
* uses that to insert a prefix at each line.
* It can also insert line numbers at the beginning of lines. */
-public class IndentedWriter extends WriterIBase implements WriterI, Closeable
+public class IndentedWriter extends AWriterBase implements AWriter, Closeable
{
/** Stdout wrapped in an IndentedWriter - no line numbers */
public static final IndentedWriter stdout = new IndentedWriter(System.out) ;
Modified: jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/Writer2.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/Writer2.java?rev=1453477&r1=1453476&r2=1453477&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/Writer2.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/Writer2.java Wed Mar 6 18:51:17 2013
@@ -26,7 +26,7 @@ import org.apache.jena.atlas.lib.Closeab
/** A Writer, without the checked exceptions. */
-public class Writer2 extends WriterIBase implements WriterI, Closeable
+public class Writer2 extends AWriterBase implements AWriter, Closeable
{
protected final Writer writer ;
Modified: jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/EscapeStr.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/EscapeStr.java?rev=1453477&r1=1453476&r2=1453477&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/EscapeStr.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/EscapeStr.java Wed Mar 6 18:51:17 2013
@@ -19,7 +19,7 @@
package org.apache.jena.riot.out;
import org.apache.jena.atlas.io.IndentedLineBuffer ;
-import org.apache.jena.atlas.io.WriterI ;
+import org.apache.jena.atlas.io.AWriter ;
import com.hp.hpl.jena.sparql.lang.ParserBase ;
@@ -31,7 +31,7 @@ public class EscapeStr
public EscapeStr(boolean asciiOnly) { this.ascii = asciiOnly ; }
- public void writeURI(WriterI w, String s)
+ public void writeURI(AWriter w, String s)
{
if ( ascii )
stringEsc(w, s, true, ascii) ;
@@ -40,12 +40,12 @@ public class EscapeStr
w.print(s) ;
}
- public void writeStr(WriterI w, String s)
+ public void writeStr(AWriter w, String s)
{
stringEsc(w, s, true, ascii) ;
}
- public void writeStrMultiLine(WriterI w, String s)
+ public void writeStrMultiLine(AWriter w, String s)
{
// N-Triples does not have """
stringEsc(w, s, false, ascii) ;
@@ -65,7 +65,7 @@ public class EscapeStr
return sb.toString() ;
}
- public static void stringEsc(WriterI out, String s, boolean singleLineString, boolean asciiOnly)
+ public static void stringEsc(AWriter out, String s, boolean singleLineString, boolean asciiOnly)
{
int len = s.length() ;
for (int i = 0; i < len; i++) {
Modified: jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NodeFormatter.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NodeFormatter.java?rev=1453477&r1=1453476&r2=1453477&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NodeFormatter.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NodeFormatter.java Wed Mar 6 18:51:17 2013
@@ -20,35 +20,35 @@ package org.apache.jena.riot.out;
-import org.apache.jena.atlas.io.WriterI ;
+import org.apache.jena.atlas.io.AWriter ;
import com.hp.hpl.jena.graph.Node ;
public interface NodeFormatter
{
- public void format(WriterI w, Node n) ;
+ public void format(AWriter w, Node n) ;
/** Node is guaranteed to be a URI node */
- public void formatURI(WriterI w, Node n) ;
- public void formatURI(WriterI w, String uriStr) ;
+ public void formatURI(AWriter w, Node n) ;
+ public void formatURI(AWriter w, String uriStr) ;
- public void formatVar(WriterI w, Node n) ;
- public void formatVar(WriterI w, String name) ;
+ public void formatVar(AWriter w, Node n) ;
+ public void formatVar(AWriter w, String name) ;
/** Node is guaranteed to be a blank node */
- public void formatBNode(WriterI w, Node n) ;
- public void formatBNode(WriterI w, String label) ;
+ public void formatBNode(AWriter w, Node n) ;
+ public void formatBNode(AWriter w, String label) ;
/** Node is guaranteed to be a literal */
- public void formatLiteral(WriterI w, Node n) ;
+ public void formatLiteral(AWriter w, Node n) ;
/** Plain string / xsd:string (RDF 1.1) */
- public void formatLitString(WriterI w, String lex) ;
+ public void formatLitString(AWriter w, String lex) ;
/** String with language tag */
- public void formatLitLang(WriterI w, String lex, String langTag) ;
+ public void formatLitLang(AWriter w, String lex, String langTag) ;
/** Literal with datatype, not a simple literal, not an xsd:string (RDF 1.1), no language tag. */
- public void formatLitDT(WriterI w, String lex, String datatypeURI) ;
+ public void formatLitDT(AWriter w, String lex, String datatypeURI) ;
}
Modified: jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java?rev=1453477&r1=1453476&r2=1453477&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java Wed Mar 6 18:51:17 2013
@@ -18,7 +18,7 @@
package org.apache.jena.riot.out;
-import org.apache.jena.atlas.io.WriterI ;
+import org.apache.jena.atlas.io.AWriter ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
@@ -29,7 +29,7 @@ import com.hp.hpl.jena.sparql.ARQInterna
public abstract class NodeFormatterBase implements NodeFormatter
{
@Override
- public void format(WriterI w, Node n)
+ public void format(AWriter w, Node n)
{
if ( n.isBlank() )
formatBNode(w, n) ;
@@ -46,13 +46,13 @@ public abstract class NodeFormatterBase
}
@Override
- public void formatURI(WriterI w, Node n) { formatURI(w, n.getURI()) ; }
+ public void formatURI(AWriter w, Node n) { formatURI(w, n.getURI()) ; }
@Override
- public void formatBNode(WriterI w, Node n) { formatBNode(w, n.getBlankNodeLabel()) ; }
+ public void formatBNode(AWriter w, Node n) { formatBNode(w, n.getBlankNodeLabel()) ; }
@Override
- public void formatLiteral(WriterI w, Node n)
+ public void formatLiteral(AWriter w, Node n)
{
String dt = n.getLiteralDatatypeURI() ;
String lang = n.getLiteralLanguage() ;
@@ -70,5 +70,5 @@ public abstract class NodeFormatterBase
}
@Override
- public void formatVar(WriterI w, Node n) { formatVar(w, n.getName()) ; }
+ public void formatVar(AWriter w, Node n) { formatVar(w, n.getName()) ; }
}
Modified: jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NodeFormatterNT.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NodeFormatterNT.java?rev=1453477&r1=1453476&r2=1453477&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NodeFormatterNT.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NodeFormatterNT.java Wed Mar 6 18:51:17 2013
@@ -19,7 +19,7 @@
package org.apache.jena.riot.out;
-import org.apache.jena.atlas.io.WriterI ;
+import org.apache.jena.atlas.io.AWriter ;
public class NodeFormatterNT extends NodeFormatterBase
{
@@ -33,7 +33,7 @@ public class NodeFormatterNT extends Nod
protected NodeFormatterNT(boolean asciiOnly) { escapeProc = new EscapeStr(asciiOnly) ;}
@Override
- public void formatURI(WriterI w, String uriStr)
+ public void formatURI(AWriter w, String uriStr)
{
w.print('<') ;
w.print(uriStr) ;
@@ -41,14 +41,14 @@ public class NodeFormatterNT extends Nod
}
@Override
- public void formatVar(WriterI w, String name)
+ public void formatVar(AWriter w, String name)
{
w.print('?') ;
w.print(name) ;
}
@Override
- public void formatBNode(WriterI w, String label)
+ public void formatBNode(AWriter w, String label)
{
w.print("_:") ;
String lab = NodeFmtLib.encodeBNodeLabel(label) ;
@@ -56,12 +56,12 @@ public class NodeFormatterNT extends Nod
}
@Override
- public void formatLitString(WriterI w, String lex)
+ public void formatLitString(AWriter w, String lex)
{
writeEscaped(w, lex) ;
}
- private void writeEscaped(WriterI w, String lex)
+ private void writeEscaped(AWriter w, String lex)
{
w.print('"') ;
escapeProc.writeStr(w, lex) ;
@@ -69,7 +69,7 @@ public class NodeFormatterNT extends Nod
}
@Override
- public void formatLitLang(WriterI w, String lex, String langTag)
+ public void formatLitLang(AWriter w, String lex, String langTag)
{
writeEscaped(w, lex) ;
w.print('@') ;
@@ -77,7 +77,7 @@ public class NodeFormatterNT extends Nod
}
@Override
- public void formatLitDT(WriterI w, String lex, String datatypeURI)
+ public void formatLitDT(AWriter w, String lex, String datatypeURI)
{
writeEscaped(w, lex) ;
w.print("^^") ;
Modified: jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NodeFormatterTTL.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NodeFormatterTTL.java?rev=1453477&r1=1453476&r2=1453477&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NodeFormatterTTL.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NodeFormatterTTL.java Wed Mar 6 18:51:17 2013
@@ -20,7 +20,7 @@ package org.apache.jena.riot.out;
import java.net.MalformedURLException ;
-import org.apache.jena.atlas.io.WriterI ;
+import org.apache.jena.atlas.io.AWriter ;
import org.apache.jena.atlas.lib.Pair ;
import org.apache.jena.iri.IRI ;
import org.apache.jena.iri.IRIFactory ;
@@ -56,7 +56,7 @@ public class NodeFormatterTTL extends No
}
@Override
- public void formatURI(WriterI w, String uriStr)
+ public void formatURI(AWriter w, String uriStr)
{
Pair<String, String> pName = prefixMap.abbrev(uriStr) ;
// Check if legal
@@ -127,7 +127,7 @@ public class NodeFormatterTTL extends No
// public void formatBNode(WriterI w, String label)
@Override
- public void formatBNode(WriterI w, Node n)
+ public void formatBNode(AWriter w, Node n)
{
String x = nodeToLabel.get(null, n) ;
w.print(x) ;
@@ -201,7 +201,7 @@ public class NodeFormatterTTL extends No
private static final String dtBoolean = XSDDatatype.XSDboolean.getURI() ;
@Override
- public void formatLitDT(WriterI w, String lex, String datatypeURI)
+ public void formatLitDT(AWriter w, String lex, String datatypeURI)
{
if ( dtDecimal.equals(datatypeURI) )
{
Modified: jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/OutputUtils.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/OutputUtils.java?rev=1453477&r1=1453476&r2=1453477&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/OutputUtils.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/OutputUtils.java Wed Mar 6 18:51:17 2013
@@ -21,7 +21,7 @@ package org.apache.jena.riot.out;
import java.io.IOException ;
import java.io.Writer ;
-import org.apache.jena.atlas.io.WriterI ;
+import org.apache.jena.atlas.io.AWriter ;
import org.apache.jena.atlas.lib.BitsInt ;
import org.apache.jena.atlas.lib.Chars ;
@@ -60,14 +60,14 @@ public class OutputUtils
}
/** Print the number x in width hex chars. x must fit */
- public static void printHex(WriterI out, int x, int width)
+ public static void printHex(AWriter out, int x, int width)
{
for ( int i = width-1 ; i >= 0 ; i-- )
x = oneHex(out, x, i) ;
}
/** Print one hex digit of the number */
- public static int oneHex(WriterI out, int x, int i)
+ public static int oneHex(AWriter out, int x, int i)
{
int y = BitsInt.unpack(x, 4*i, 4*i+4) ;
char charHex = Chars.hexDigitsUC[y] ;
Modified: jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/SinkQuadOutput.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/SinkQuadOutput.java?rev=1453477&r1=1453476&r2=1453477&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/SinkQuadOutput.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/SinkQuadOutput.java Wed Mar 6 18:51:17 2013
@@ -21,7 +21,7 @@ package org.apache.jena.riot.out;
import java.io.OutputStream ;
import org.apache.jena.atlas.io.IO ;
-import org.apache.jena.atlas.io.WriterI ;
+import org.apache.jena.atlas.io.AWriter ;
import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.system.Prologue ;
@@ -38,7 +38,7 @@ import com.hp.hpl.jena.sparql.core.Quad
public class SinkQuadOutput implements Sink<Quad>
{
private Prologue prologue = null ;
- private WriterI out ;
+ private AWriter out ;
private NodeToLabel labelPolicy = null ;
private NodeFormatter nodeFmt = new NodeFormatterNT() ;
Modified: jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/SinkTripleOutput.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/SinkTripleOutput.java?rev=1453477&r1=1453476&r2=1453477&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/SinkTripleOutput.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/SinkTripleOutput.java Wed Mar 6 18:51:17 2013
@@ -21,7 +21,7 @@ package org.apache.jena.riot.out;
import java.io.OutputStream ;
import org.apache.jena.atlas.io.IO ;
-import org.apache.jena.atlas.io.WriterI ;
+import org.apache.jena.atlas.io.AWriter ;
import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.system.Prologue ;
@@ -41,7 +41,7 @@ public class SinkTripleOutput implements
// WriterStreamRDFTuples
private Prologue prologue = null ;
- private final WriterI out ;
+ private final AWriter out ;
private NodeToLabel labelPolicy = null ;
private NodeFormatter nodeFmt = new NodeFormatterNT() ;
Modified: jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java?rev=1453477&r1=1453476&r2=1453477&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java Wed Mar 6 18:51:17 2013
@@ -22,6 +22,8 @@ import java.io.OutputStream ;
import java.io.Writer ;
import java.util.Iterator ;
+import org.apache.jena.atlas.io.AWriter ;
+import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.atlas.lib.Tuple ;
import org.apache.jena.riot.lang.StreamRDFCounting ;
@@ -39,8 +41,9 @@ public class StreamRDFLib
/** Send everything to nowhere ... efficiently */
public static StreamRDF sinkNull() { return new StreamRDFBase() ; }
- public static StreamRDF writer(OutputStream out) { return new WriterStreamRDFTuples(out) ; }
- public static StreamRDF writer(Writer out) { return new WriterStreamRDFTuples(out) ; }
+ 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 graph(Graph graph) { return new ParserOutputGraph(graph) ; }
Modified: jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFTuples.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFTuples.java?rev=1453477&r1=1453476&r2=1453477&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFTuples.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFTuples.java Wed Mar 6 18:51:17 2013
@@ -18,16 +18,13 @@
package org.apache.jena.riot.writer;
-import java.io.OutputStream ;
-import java.io.Writer ;
-
+import org.apache.jena.atlas.io.AWriter ;
import org.apache.jena.atlas.io.IO ;
-import org.apache.jena.atlas.io.IndentedWriter ;
import org.apache.jena.atlas.lib.Tuple ;
import org.apache.jena.riot.out.NodeFormatter ;
import org.apache.jena.riot.out.NodeFormatterNT ;
-import org.apache.jena.riot.system.RiotLib ;
import org.apache.jena.riot.system.StreamRDF ;
+import org.apache.jena.riot.system.StreamRDFLib ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
@@ -39,19 +36,22 @@ import com.hp.hpl.jena.sparql.core.Quad
public class WriterStreamRDFTuples implements StreamRDF
{
- private final IndentedWriter out ;
+ private final AWriter out ;
- public WriterStreamRDFTuples(OutputStream outs)
- {
- this(new IndentedWriter(outs)) ;
- }
-
- public WriterStreamRDFTuples(Writer w)
- {
- this(RiotLib.create(w)) ;
- }
-
- public WriterStreamRDFTuples(IndentedWriter w)
+// public WriterStreamRDFTuples(OutputStream outs)
+// {
+// this(IO.wrapUTF8(outs)) ;
+// }
+//
+// public WriterStreamRDFTuples(Writer w)
+// {
+// this(IO.wrap(w)) ;
+// }
+//
+ /**
+ * See {@linkplain StreamRDFLib#writer} for ways to create a writer stream.
+ */
+ public WriterStreamRDFTuples(AWriter w)
{
out = w ;
}