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 2016/10/03 10:35:35 UTC

[03/41] jena git commit: details

details

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

Branch: refs/heads/master
Commit: 1f7433400edb79ac8e01f2b16ca79ba8a2b7eadc
Parents: 99db172
Author: Franc\u0327ois-Paul Servant <fp...@semanlink.net>
Authored: Fri May 6 00:57:50 2016 +0200
Committer: Franc\u0327ois-Paul Servant <fp...@semanlink.net>
Committed: Fri May 6 00:57:50 2016 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/jena/riot/RDFDataMgr.java  |  5 +----
 .../main/java/org/apache/jena/riot/RDFFormat.java   | 16 +++++++---------
 .../org/apache/jena/riot/RDFWriterRegistry.java     |  2 --
 3 files changed, 8 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/1f743340/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 c64d218..bb96bea 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
@@ -945,7 +945,6 @@ public class RDFDataMgr
         write(out, model.getGraph(), serialization);
     }
     
-    // fps
     /** Write the model to the output stream with a given serialization format.
      * @param out           OutputStream
      * @param model         Model to write
@@ -1012,10 +1011,9 @@ public class RDFDataMgr
      * @param serialization Serialization format
      */
     public static void write(OutputStream out, Graph graph, RDFFormat serialization) {
-        write$(out, graph, serialization, RIOT.getContext()); // fps
+        write$(out, graph, serialization, RIOT.getContext());
     }
 
-    // fps
     /** Write the model to the output stream with a given serialization format.
      * @param out           OutputStream
      * @param model         Model to write
@@ -1229,7 +1227,6 @@ public class RDFDataMgr
         return wf.create(serialization);
     }
 
-    // fps
     private static void write$(OutputStream out, Graph graph, RDFFormat serialization, Context ctx) {
 	      WriterGraphRIOT w = createGraphWriter$(serialization);
 	      w.write(out, graph, RiotLib.prefixMap(graph), null, ctx);

http://git-wip-us.apache.org/repos/asf/jena/blob/1f743340/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
index c18d8a3..faec196 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
@@ -79,7 +79,6 @@ public class RDFFormat {
     /** TriG - one line per triple  */ 
     public static final RDFFormat        TRIG_FLAT      = new RDFFormat(Lang.TRIG, FLAT) ;
 
-    // fps
     // variants for the JsonLD outputs.
     // because of the prexisting JSONLD_PRETTY and JSONLD_FLAT,
     // we're more or less obliged to create all of these
@@ -87,24 +86,23 @@ public class RDFFormat {
     
     public static final RDFFormatVariant EXPAND_PRETTY      = new RDFFormatVariant("expand pretty") ;
     public static final RDFFormatVariant EXPAND_FLAT        = new RDFFormatVariant("expand flat") ;
-    public static final RDFFormatVariant COMPACT_PRETTY       = new RDFFormatVariant("compact pretty") ;
-    public static final RDFFormatVariant COMPACT_FLAT         = new RDFFormatVariant("compact flat") ;
+    public static final RDFFormatVariant COMPACT_PRETTY     = new RDFFormatVariant("compact pretty") ;
+    public static final RDFFormatVariant COMPACT_FLAT       = new RDFFormatVariant("compact flat") ;
     public static final RDFFormatVariant FLATTEN_PRETTY     = new RDFFormatVariant("flatten pretty") ;
     public static final RDFFormatVariant FLATTEN_FLAT       = new RDFFormatVariant("flatten flat") ;
-    public static final RDFFormatVariant FRAME_PRETTY         = new RDFFormatVariant("frame pretty") ;
+    public static final RDFFormatVariant FRAME_PRETTY       = new RDFFormatVariant("frame pretty") ;
     public static final RDFFormatVariant FRAME_FLAT         = new RDFFormatVariant("frame flat") ;
 
     public static final RDFFormat        JSONLD_EXPAND_PRETTY   = new RDFFormat(Lang.JSONLD, EXPAND_PRETTY) ;
     public static final RDFFormat        JSONLD_EXPAND_FLAT     = new RDFFormat(Lang.JSONLD, EXPAND_FLAT) ;
-    public static final RDFFormat        JSONLD_COMPACT_PRETTY    = new RDFFormat(Lang.JSONLD, COMPACT_PRETTY) ;
-    public static final RDFFormat        JSONLD_COMPACT_FLAT      = new RDFFormat(Lang.JSONLD, COMPACT_FLAT) ;
+    public static final RDFFormat        JSONLD_COMPACT_PRETTY  = new RDFFormat(Lang.JSONLD, COMPACT_PRETTY) ;
+    public static final RDFFormat        JSONLD_COMPACT_FLAT    = new RDFFormat(Lang.JSONLD, COMPACT_FLAT) ;
     public static final RDFFormat        JSONLD_FLATTEN_PRETTY  = new RDFFormat(Lang.JSONLD, FLATTEN_PRETTY) ;
     public static final RDFFormat        JSONLD_FLATTEN_FLAT    = new RDFFormat(Lang.JSONLD, FLATTEN_FLAT) ;
-    public static final RDFFormat        JSONLD_FRAME_PRETTY      = new RDFFormat(Lang.JSONLD, FRAME_PRETTY) ;
+    public static final RDFFormat        JSONLD_FRAME_PRETTY    = new RDFFormat(Lang.JSONLD, FRAME_PRETTY) ;
     public static final RDFFormat        JSONLD_FRAME_FLAT      = new RDFFormat(Lang.JSONLD, FRAME_FLAT) ;
 
-    // fps
-    // redefine following ones in a way that preserve what they were doing in previous version
+     // redefine following ones in a way that preserve what they were doing in previous version
     public static final RDFFormat        JSONLD_PRETTY  = JSONLD_COMPACT_PRETTY ;
     public static final RDFFormat        JSONLD         = JSONLD_COMPACT_PRETTY ;
     public static final RDFFormat        JSONLD_FLAT    = JSONLD_COMPACT_FLAT ;

http://git-wip-us.apache.org/repos/asf/jena/blob/1f743340/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
index c761978..7f98a62 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
@@ -171,7 +171,6 @@ public class RDFWriterRegistry
          register(RDFFormat.JSONLD,                      wgJsonldfactory) ;
          register(RDFFormat.JSONLD_FLAT,                 wgJsonldfactory) ;
          register(RDFFormat.JSONLD_PRETTY,               wgJsonldfactory) ;
-         // fps
          register(RDFFormat.JSONLD_COMPACT_PRETTY,       wgJsonldfactory) ;
          register(RDFFormat.JSONLD_FLATTEN_PRETTY,       wgJsonldfactory) ;
          register(RDFFormat.JSONLD_EXPAND_PRETTY,        wgJsonldfactory) ;
@@ -212,7 +211,6 @@ public class RDFWriterRegistry
          register(RDFFormat.JSONLD,                      wdsJsonldfactory) ;
          register(RDFFormat.JSONLD_FLAT,                 wdsJsonldfactory) ;
          register(RDFFormat.JSONLD_PRETTY,               wdsJsonldfactory) ;
-         // fps
          register(RDFFormat.JSONLD_COMPACT_PRETTY,       wdsJsonldfactory) ;
          register(RDFFormat.JSONLD_FLATTEN_PRETTY,       wdsJsonldfactory) ;
          register(RDFFormat.JSONLD_EXPAND_PRETTY,        wdsJsonldfactory) ;