svn commit: r1234856 - in /incubator/jena/Scratch/AFS/Dev/trunk: src-archive/riot/comms/TokenStreamEndpoint.java src/main/java/riot/io/TestTokenIO.java

[an...@apache.org]

Author: andy
Date: Mon Jan 23 15:27:08 2012
New Revision: 1234856

URL: http://svn.apache.org/viewvc?rev=1234856&view=rev
Log: (empty)

Modified:
    incubator/jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenStreamEndpoint.java
    incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TestTokenIO.java

Modified: incubator/jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenStreamEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenStreamEndpoint.java?rev=1234856&r1=1234855&r2=1234856&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenStreamEndpoint.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenStreamEndpoint.java Mon Jan 23 15:27:08 2012
@@ -18,16 +18,15 @@
 
 package riot.comms;
 
+import java.io.ByteArrayOutputStream ;
 import java.io.IOException ;
 import java.io.InputStream ;
 import java.io.OutputStream ;
 import java.io.Writer ;
 import java.net.Socket ;
-import java.nio.ByteBuffer ;
 import java.nio.channels.SocketChannel ;
 
-import org.openjena.atlas.io.BufferingWriter ;
-import org.openjena.atlas.lib.Sink ;
+import org.openjena.atlas.io.IO ;
 import org.openjena.riot.tokens.Tokenizer ;
 import org.openjena.riot.tokens.TokenizerFactory ;
 import riot.comms.client.DirectChannel ;
@@ -99,8 +98,8 @@ public class TokenStreamEndpoint
         this.tokenInput = new TokenInputStreamBase(labelInput, stream) ;
 
         // Output.
-        Sink<ByteBuffer> dest = new BufferingWriter.SinkOutputStream(output) ; 
-        Writer bw = new BufferingWriter(dest) ;
+        ByteArrayOutputStream bytesOut = new ByteArrayOutputStream() ; 
+        Writer bw = IO.asBufferedUTF8(bytesOut) ;
         this.tokenOutput = new TokenOutputStreamWriter(labelOutput, bw) ;
     }
     

Modified: incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TestTokenIO.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TestTokenIO.java?rev=1234856&r1=1234855&r2=1234856&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TestTokenIO.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TestTokenIO.java Mon Jan 23 15:27:08 2012
@@ -32,7 +32,7 @@ import org.junit.AfterClass ;
 import org.junit.Before ;
 import org.junit.BeforeClass ;
 import org.junit.Test ;
-import org.openjena.atlas.io.BufferingWriter ;
+import org.openjena.atlas.io.IO ;
 import org.openjena.atlas.junit.BaseTest ;
 import org.openjena.atlas.lib.Chars ;
 import org.openjena.atlas.lib.Sink ;
@@ -41,9 +41,6 @@ import org.openjena.riot.tokens.Token ;
 import org.openjena.riot.tokens.TokenType ;
 import org.openjena.riot.tokens.Tokenizer ;
 import org.openjena.riot.tokens.TokenizerFactory ;
-import riot.io.TokenInputStream ;
-import riot.io.TokenInputStreamBase ;
-import riot.io.TokenOutputStreamWriter ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.sparql.sse.SSE ;
@@ -61,8 +58,9 @@ public class TestTokenIO extends BaseTes
     static Node n7 = SSE.parseNode("'123'^^<http://example/myType>") ;
 
     // Where to send things.
-    private SinkToBytes sink = new SinkToBytes() ;
-    private Writer w = new BufferingWriter(sink) ;
+    //private SinkToBytes sink = new SinkToBytes() ;
+    private ByteArrayOutputStream bytesOut = new ByteArrayOutputStream() ;
+    private Writer w = IO.asBufferedUTF8(bytesOut) ;
     private TokenOutputStreamWriter out = new TokenOutputStreamWriter("OUT", w) ;
 
     @BeforeClass public static void setupClass()
@@ -144,7 +142,7 @@ public class TestTokenIO extends BaseTes
     
     private void expect(Node... nodes)
     {
-        byte b[] = sink.bytes() ;
+        byte b[] = bytesOut.toByteArray() ;
         Tokenizer tokenizer = TokenizerFactory.makeTokenizerUTF8(new ByteArrayInputStream(b)) ;
         //tokenizer = new PrintTokenizer("Read", tokenizer) ;
         
@@ -168,7 +166,7 @@ public class TestTokenIO extends BaseTes
     private void expect(Token ...tokens)
     {
         out.flush() ;
-        byte b[] = sink.bytes() ;
+        byte b[] = bytesOut.toByteArray() ;
 
         //String s = StrUtils.fromUTF8bytes(b) ;
         //System.out.println(s) ;