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/02 17:51:57 UTC
svn commit: r1451904 - in /jena/trunk/jena-arq:
src-examples/arq/examples/riot/ExRIOT_2.java
src/main/java/org/apache/jena/riot/RDFDataMgr.java
src/main/java/org/apache/jena/riot/RiotReader.java
src/main/java/org/apache/jena/riot/RiotWriter.java
Author: andy
Date: Sat Mar 2 16:51:57 2013
New Revision: 1451904
URL: http://svn.apache.org/r1451904
Log:
Tidy up.
Modified:
jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_2.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java
Modified: jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_2.java?rev=1451904&r1=1451903&r2=1451904&view=diff
==============================================================================
--- jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_2.java (original)
+++ jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_2.java Sat Mar 2 16:51:57 2013
@@ -41,7 +41,7 @@ public class ExRIOT_2
{
public static void main(String...argv) throws FileNotFoundException
{
- // Ensure RIOT loaded.
+ // Ensure RIOT loaded. Usually this is automatic.
RIOT.init() ;
// ---- Parse to a Sink.
@@ -50,6 +50,8 @@ public class ExRIOT_2
// RIOT controls the conversion from bytes to java chars.
InputStream in = new FileInputStream("data.trig") ;
+ // Better is:
+ // RDFDataMgr.parse(noWhere, in, "http://example/base", RDFLanguages.TRIG, null) ;
RiotReader.parse(in, RDFLanguages.TRIG, "http://example/base", noWhere) ;
// --- Or create a parser and do the parsing as separate steps.
@@ -60,6 +62,8 @@ public class ExRIOT_2
in = new FileInputStream("data.trig") ;
LangRIOT parser = RiotReader.createParser(in, RDFLanguages.TRIG, "http://example/base", noWhere) ;
+ // Access the setup of the RIOT built-in parsers.
+
// Parser to first error or warning.
ErrorHandler errHandler = ErrorHandlerFactory.errorHandlerStrict ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java?rev=1451904&r1=1451903&r2=1451904&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java Sat Mar 2 16:51:57 2013
@@ -737,7 +737,7 @@ public class RDFDataMgr
// We could have had two step design - ReaderFactory-ReaderInstance
// no - put the bruden on complicated readers, not everyone.
- private static void process(StreamRDF destination , TypedInputStream in , String baseUri , Lang hintLang , Context context )
+ private static void process(StreamRDF destination, TypedInputStream in, String baseUri, Lang hintLang, Context context )
{
ContentType ct = determineCT(baseUri, in.getContentType(), hintLang ) ;
if ( ct == null )
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java?rev=1451904&r1=1451903&r2=1451904&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java Sat Mar 2 16:51:57 2013
@@ -57,7 +57,7 @@ import com.hp.hpl.jena.sparql.core.Quad
*/
public class RiotReader
{
- /** Parse a file, sending output to a RDFParserOutput sink.
+ /** Parse a file, sending output to a StreamRDF sink.
* Must be in a triples syntax.
* @param filename
* @param dest Where to send the triples from the parser.
@@ -65,7 +65,7 @@ public class RiotReader
public static void parse(String filename, StreamRDF dest)
{ parse(filename, null, null, dest) ; }
- /** Parse a file, sending output to a RDFParserOutput sink.
+ /** Parse a file, sending output to a StreamRDF sink.
* Must be in a triples syntax.
* @param filename
* @param lang Language, or null for "guess from URL" (e.g. file extension)
@@ -76,7 +76,7 @@ public class RiotReader
parse(filename, lang, null, dest) ;
}
- /** Parse a file, sending output to a RDFParserOutput sink.
+ /** Parse a file, sending output to a StreamRDF sink.
* Must be in a triples syntax.
* @param filename
* @param lang Language, or null for "guess from URL" (e.g. file extension)
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java?rev=1451904&r1=1451903&r2=1451904&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java Sat Mar 2 16:51:57 2013
@@ -60,5 +60,4 @@ public class RiotWriter
{
RDFJSONWriter.write(out, graph) ;
}
-
}