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/02/09 21:55:05 UTC
svn commit: r1444432 - in /jena/trunk/jena-arq:
src-examples/arq/examples/riot/ExRIOT_5.java
src/main/java/org/apache/jena/riot/RDFDataMgr.java
src/main/java/org/apache/jena/riot/RDFLanguages.java
src/main/java/org/apache/jena/riot/RiotReader.java
Author: andy
Date: Sat Feb 9 20:55:05 2013
New Revision: 1444432
URL: http://svn.apache.org/r1444432
Log:
Tidy up comments and example.
Modified:
jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_5.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/RDFLanguages.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
Modified: jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_5.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_5.java?rev=1444432&r1=1444431&r2=1444432&view=diff
==============================================================================
--- jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_5.java (original)
+++ jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_5.java Sat Feb 9 20:55:05 2013
@@ -43,7 +43,7 @@ public class ExRIOT_5
RDFLanguages.register(lang) ;
// Register the parser factory.
- ReaderRIOTFactory factory = new Factory() ;
+ ReaderRIOTFactory factory = new SSEReaderFactory() ;
RDFParserRegistry.registerLangTriples(lang, factory) ;
String filename = "data.rsse" ;
@@ -51,7 +51,7 @@ public class ExRIOT_5
model.write(System.out, "TTL") ;
}
- static class Factory implements ReaderRIOTFactory
+ static class SSEReaderFactory implements ReaderRIOTFactory
{
@Override
public ReaderRIOT create(Lang language)
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=1444432&r1=1444431&r2=1444432&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 Feb 9 20:55:05 2013
@@ -58,12 +58,19 @@ import com.hp.hpl.jena.sparql.util.Utils
* <li>Application language hint</li>
* </ul>
* <p>
- * It also provide a way to lookup names in different
+ * It also provides a way to lookup names in different
* locations and to remap URIs to other URIs.
* </p>
* <p>
* Extensible - a new syntax can be added to the framework.
* </p>
+ * <p>Operations fall into the follwoing categories:</p>
+ * <ul>
+ * <li>{@code read} -- Read data from a location into a Model/Dataset etc</li>
+ * <li>{@code loadXXX} -- Read data and return an in-memory object holding the data.</li>
+ * <li>{@code parse} -- Read data and send to an {@link StreamRDF}</li>
+ * <li>{@code open} -- Open a typed input stream to the location, using any alternative locations</li>
+ * </ul>
*/
public class RDFDataMgr
@@ -668,13 +675,18 @@ public class RDFDataMgr
}
/** Open a stream to the destination (URI or filename)
- * Performs content negotition, including looking at file extension.
+ * Performs content negotition, including looking at file extension.
+ * @param filenameOrURI
+ * @return TypedInputStream
*/
public static TypedInputStream open(String filenameOrURI)
{ return open(filenameOrURI, (Context)null) ; }
/** Open a stream to the destination (URI or filename)
* Performs content negotition, including looking at file extension.
+ * @param filenameOrURI
+ * @param context
+ * @return TypedInputStream
*/
public static TypedInputStream open(String filenameOrURI, Context context)
{
@@ -689,9 +701,15 @@ public class RDFDataMgr
return open(filenameOrURI, sMgr) ;
}
- public static TypedInputStream open(String filenameOrURI, StreamManager sMgr)
+ /** Open a stream to the destination (URI or filename)
+ * Performs content negotition, including looking at file extension.
+ * @param filenameOrURI
+ * @param streamManager
+ * @return TypedInputStream
+ */
+ public static TypedInputStream open(String filenameOrURI, StreamManager streamManager)
{
- TypedInputStream in = sMgr.open(filenameOrURI) ;
+ TypedInputStream in = streamManager.open(filenameOrURI) ;
if ( in == null )
{
@@ -747,7 +765,6 @@ public class RDFDataMgr
private static void processTriples(StreamRDF output, String base, Reader in, Lang lang, Context context)
{
// Not as good as from an InputStream - RDF/XML not supported
- //****
ContentType ct = determineCT(base, null, lang) ;
if ( ct == null )
throw new RiotException("Failed to determine the triples content type: (URI="+base+" : hint="+lang+")") ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java?rev=1444432&r1=1444431&r2=1444432&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java Sat Feb 9 20:55:05 2013
@@ -126,6 +126,7 @@ public class RDFLanguages
if ( initialized ) return ;
initialized = true ;
initStandard() ;
+ // Needed to avoid a class initialization loop.
Lang.RDFXML = RDFLanguages.RDFXML ;
Lang.NTRIPLES = RDFLanguages.NTRIPLES ;
Lang.N3 = RDFLanguages.N3 ;
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=1444432&r1=1444431&r2=1444432&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 Feb 9 20:55:05 2013
@@ -57,13 +57,11 @@ import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.Quad ;
/** Operations to access RIOT parsers and send the output to
- * a ParserOutput (triples or quads as appropriate).
+ * a StreamRDF (triples or quads as appropriate).
* This class is probably not what you want to use.
* It is public to give maximum compatibility.
- * Please consider it likely to move into org.apache.jena.riot.system.
*
* @see RDFDataMgr for reading from a location, including web access and content negotation.
- *
*/
public class RiotReader
{