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 2015/08/20 21:02:56 UTC

[02/13] jena git commit: Add missing operation. Order in file systematically.

Add missing operation. Order in file systematically.

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/fdd77f9b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/fdd77f9b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/fdd77f9b

Branch: refs/heads/JENA-491-construct-quads
Commit: fdd77f9b59ee72a56b8a21e44632c0a9ca7e6d61
Parents: 880ab7c
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 20 16:14:32 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 20 16:14:32 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/jena/riot/RDFDataMgr.java   | 30 +++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/fdd77f9b/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
index 3a511f8..d9c4823 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
@@ -640,6 +640,16 @@ public class RDFDataMgr
      * @param uri       URI to read from (includes file: and a plain file name).
      * @param base      Base URI (defaults to uri).
      * @param hintLang  Hint for the syntax
+     */
+    public static void parse(StreamRDF sink, String uri, String base, Lang hintLang) {
+        parse(sink, uri, uri, hintLang, null) ;
+    }
+    
+    /** Read RDF data.
+     * @param sink     Destination for the RDF read.
+     * @param uri       URI to read from (includes file: and a plain file name).
+     * @param base      Base URI (defaults to uri).
+     * @param hintLang  Hint for the syntax
      * @param context   Content object to control reading process.
      */
     public static void parse(StreamRDF sink, String uri, String base, Lang hintLang, Context context) {
@@ -677,13 +687,13 @@ public class RDFDataMgr
 
     /** Read RDF data.
      * @param sink      Destination for the RDF read.
-     * @param in        StringReader
+     * @param in        Bytes to read.
      * @param base      Base URI (defaults to uri).
      * @param hintLang  Hint for the syntax
      * @param context   Content object to control reading process.
      */
-    public static void parse(StreamRDF sink, StringReader in, String base, Lang hintLang, Context context) {
-        process(sink, in, base, hintLang, context) ;
+    public static void parse(StreamRDF sink, InputStream in, String base, Lang hintLang, Context context) {
+        process(sink, new TypedInputStream(in), base, hintLang, context) ;
     }
 
     /** Read RDF data.
@@ -707,14 +717,12 @@ public class RDFDataMgr
 
     /** Read RDF data.
      * @param sink      Destination for the RDF read.
-     * @param in        Reader
+     * @param in        StringReader
      * @param base      Base URI (defaults to uri).
      * @param hintLang  Hint for the syntax
      * @param context   Content object to control reading process.
-     * @deprecated     Use an InputStream or a StringReader. 
      */
-    @Deprecated
-    public static void parse(StreamRDF sink, Reader in, String base, Lang hintLang, Context context) {
+    public static void parse(StreamRDF sink, StringReader in, String base, Lang hintLang, Context context) {
         process(sink, in, base, hintLang, context) ;
     }
 
@@ -743,13 +751,15 @@ public class RDFDataMgr
 
     /** Read RDF data.
      * @param sink      Destination for the RDF read.
-     * @param in        Bytes to read.
+     * @param in        Reader
      * @param base      Base URI (defaults to uri).
      * @param hintLang  Hint for the syntax
      * @param context   Content object to control reading process.
+     * @deprecated     Use an InputStream or a StringReader. 
      */
-    public static void parse(StreamRDF sink, InputStream in, String base, Lang hintLang, Context context) {
-        process(sink, new TypedInputStream(in), base, hintLang, context) ;
+    @Deprecated
+    public static void parse(StreamRDF sink, Reader in, String base, Lang hintLang, Context context) {
+        process(sink, in, base, hintLang, context) ;
     }
 
     /** Read RDF data.