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 20:41:08 UTC
svn commit: r1453509 - in /jena/Experimental/riot-output/src/main/java/dev:
MainWriter.java PROJECT_RiotWriter.java
Author: andy
Date: Wed Mar 6 19:41:07 2013
New Revision: 1453509
URL: http://svn.apache.org/r1453509
Log: (empty)
Modified:
jena/Experimental/riot-output/src/main/java/dev/MainWriter.java
jena/Experimental/riot-output/src/main/java/dev/PROJECT_RiotWriter.java
Modified: jena/Experimental/riot-output/src/main/java/dev/MainWriter.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-output/src/main/java/dev/MainWriter.java?rev=1453509&r1=1453508&r2=1453509&view=diff
==============================================================================
--- jena/Experimental/riot-output/src/main/java/dev/MainWriter.java (original)
+++ jena/Experimental/riot-output/src/main/java/dev/MainWriter.java Wed Mar 6 19:41:07 2013
@@ -27,7 +27,7 @@ import java.util.Map.Entry ;
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.iri.IRI ;
import org.apache.jena.riot.* ;
-import org.apache.jena.riot.system.IO_Jena2 ;
+import org.apache.jena.riot.system.IO_JenaWriters ;
import org.apache.jena.riot.system.PrefixMap ;
import org.apache.jena.riot.system.PrefixMapFactory ;
import org.apache.jena.riot.system.StreamRDF ;
@@ -47,7 +47,8 @@ public class MainWriter
{
public static void main(String ...args)
{
- IO_Jena2.wireIntoJenaW() ;
+// RIOT.init();
+
// writeTriG() ;
// System.exit(0) ;
// writeAll() ;
@@ -63,14 +64,14 @@ public class MainWriter
m.write(System.out, "TTL") ;
System.exit(0) ;
-// RDFWriterMgr.write(System.out, m, Lang.TTL) ;
-// RDFWriterMgr.write(System.out, m, Lang.TTL,
+// RDFDataMgr.write(System.out, m, Lang.TTL) ;
+// RDFDataMgr.write(System.out, m, Lang.TTL,
// System.exit(0) ;
// ModelWriter? WriterModel WriterGraph
// DatasetWriter? WriterDataset WriterDatasetGraph
- WriterGraphRIOT w = RDFWriterMgr.createGraphWriter(RDFFormat.TRIG) ;
+ WriterGraphRIOT w = RDFDataMgr.createGraphWriter(RDFFormat.TRIG) ;
w.write(System.out, m.getGraph(), null, null, null) ;
//w.getContext().set(..)
//w.set() ;
@@ -80,12 +81,12 @@ public class MainWriter
System.exit(0) ;
System.out.println("## -------------------") ;
- IO_Jena2.resetJenaW() ;
+ IO_JenaWriters.resetJena() ;
m.write(System.out, "TTL") ;
// System.out.println("## -------------------") ;
// Dataset ds = DatasetFactory.create(m) ;
-// RDFWriterMgr.write(System.out, ds, Lang.TRIG) ;
+// RDFDataMgr.write(System.out, ds, Lang.TRIG) ;
//writeTTL() ;
//writeTriG() ;
@@ -120,7 +121,7 @@ public class MainWriter
{
System.out.println("## -------- "+format) ;
count ++ ;
- RDFWriterMgr.write(System.out, model, format) ;
+ RDFDataMgr.write(System.out, model, format) ;
}
public static void writeTriG()
@@ -128,11 +129,11 @@ public class MainWriter
Dataset ds = RDFDataMgr.loadDataset("W.trig") ;
System.out.println("# Write TriG") ;
- RDFWriterMgr.write(System.out, ds, RDFFormat.TRIG) ;
+ RDFDataMgr.write(System.out, ds, RDFFormat.TRIG) ;
System.out.println("# Write TriG (Blocks)") ;
- RDFWriterMgr.write(System.out, ds, RDFFormat.TRIG_BLOCKS) ;
+ RDFDataMgr.write(System.out, ds, RDFFormat.TRIG_BLOCKS) ;
// System.out.println("# Write TriG (Flat)") ;
-// RDFWriterMgr.write(System.out, ds, RDFFormat.TRIG_FLAT) ;
+// RDFDataMgr.write(System.out, ds, RDFFormat.TRIG_FLAT) ;
}
public static void writeTTL()
@@ -146,12 +147,12 @@ public class MainWriter
int written = 0 ;
System.out.println("# Write (Pretty)") ;
- RDFWriterMgr.write(System.out, m.getGraph(), Lang.TRIG) ;
+ RDFDataMgr.write(System.out, m.getGraph(), Lang.TRIG) ;
System.out.println("----------------------------------") ;
if ( true ) return ;
// check.
ByteArrayOutputStream out = new ByteArrayOutputStream() ;
- RDFWriterMgr.write(out, m.getGraph(), Lang.TURTLE) ;
+ RDFDataMgr.write(out, m.getGraph(), Lang.TURTLE) ;
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()) ;
String s = StrUtils.fromUTF8bytes(out.toByteArray()) ;
Modified: jena/Experimental/riot-output/src/main/java/dev/PROJECT_RiotWriter.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-output/src/main/java/dev/PROJECT_RiotWriter.java?rev=1453509&r1=1453508&r2=1453509&view=diff
==============================================================================
--- jena/Experimental/riot-output/src/main/java/dev/PROJECT_RiotWriter.java (original)
+++ jena/Experimental/riot-output/src/main/java/dev/PROJECT_RiotWriter.java Wed Mar 6 19:41:07 2013
@@ -21,29 +21,12 @@ package dev;
public class PROJECT_RiotWriter
{
// MIGRATION
- // - RIOT.init to call RDFWriterRegistry.init()
- // - RDFWriter -> RDFDataMgr
// riot --out FMT (later?)
- // - Remove some RIOT.init calls.
- // - IO_Jena2 to JenaReadersWriters (IO_Jena, IO_Ctl)
- // - RiotWriteLib to RiotLib
// - Writer names in FusekiLib
- // - Remove old RDF/JSON writer, NQuadsWriter, NTriplesWriter, out.Sink*
- // - Organise tests
- // See RIOT.init
- // IO_Jena.resetJenaReaders -- incldomple?
// MIGRATION
- // Tests:
- // - all registrations (implict current because they are used)
- // WriterStreamTuples - use NodeFormatterNT?
-
// Trig reading - prefixes to default graph.
- // Add RDFDataMgr.createParser(Lang) -> ReaderRIOT
-
- // ready to migrate.
-
// NodeToLabel vs NodeToLabelMap
// LabelToNode vs LabelToNodeMap