jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1237161 - in /incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena: atlas/lib/DS.java atlas/web/TypedStream.java riot/WebContent.java
Date Sat, 28 Jan 2012 20:52:50 GMT
Author: andy
Date: Sat Jan 28 20:52:50 2012
New Revision: 1237161

URL: http://svn.apache.org/viewvc?rev=1237161&view=rev
Log:
Add .clsoe to TypeStream ; corrections to WebContent naming.

Modified:
    incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/DS.java
    incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/web/TypedStream.java
    incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/WebContent.java

Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/DS.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/DS.java?rev=1237161&r1=1237160&r2=1237161&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/DS.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/DS.java Sat Jan 28
20:52:50 2012
@@ -30,7 +30,7 @@ import java.util.Set ;
 import org.openjena.atlas.iterator.NullIterator ;
 
 
-/** Datastructure factory - allows indirecly to other implementations */ 
+/** Datastructure factory - allows indirecting to other implementations */ 
 
 public class DS
 {

Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/web/TypedStream.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/web/TypedStream.java?rev=1237161&r1=1237160&r2=1237161&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/web/TypedStream.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/web/TypedStream.java Sat
Jan 28 20:52:50 2012
@@ -20,6 +20,7 @@ package org.openjena.atlas.web;
 
 import java.io.InputStream;
 
+import org.openjena.atlas.io.IO ;
 import org.openjena.riot.ContentType ;
 
 public class TypedStream
@@ -45,4 +46,6 @@ public class TypedStream
     public String getContentType()          { return mediaType.getContentType() ; }
     public String getCharset()              { return mediaType.getCharset() ; }
     public ContentType getMediaType()       { return mediaType ; }
+    
+    public void close()                     { IO.close(input) ; }
 }

Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/WebContent.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/WebContent.java?rev=1237161&r1=1237160&r2=1237161&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/WebContent.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/WebContent.java Sat Jan
28 20:52:50 2012
@@ -104,9 +104,9 @@ public class WebContent
     static {
         // Or is code preferrable?
         mapContentTypeToLang.put(contentTypeRDFXML,         Lang.RDFXML) ;
-        mapContentTypeToLang.put(contentTypeTurtle1,        Lang.TURTLE) ;
-        mapContentTypeToLang.put(contentTypeTurtle2,        Lang.TURTLE) ;
-        mapContentTypeToLang.put(contentTypeTurtle3,        Lang.TURTLE) ;
+        mapContentTypeToLang.put(contentTypeTurtle,         Lang.TURTLE) ;
+        mapContentTypeToLang.put(contentTypeTurtleAlt1,     Lang.TURTLE) ;
+        mapContentTypeToLang.put(contentTypeTurtleAlt2,     Lang.TURTLE) ;
         mapContentTypeToLang.put(contentTypeNTriples,       Lang.NTRIPLES) ;   // text/plain
         mapContentTypeToLang.put(contentTypeNTriplesAlt,    Lang.NTRIPLES) ;
         mapContentTypeToLang.put(contentTypeRdfJson,		Lang.RDFJSON) ;
@@ -122,7 +122,7 @@ public class WebContent
     private static Map<Lang, String> mapLangToContentType =  new HashMap<Lang, String>()
;
     static {
         mapLangToContentType.put(Lang.N3,           contentTypeN3) ;
-        mapLangToContentType.put(Lang.TURTLE,       contentTypeTurtle2) ;
+        mapLangToContentType.put(Lang.TURTLE,       contentTypeTurtle) ;
         mapLangToContentType.put(Lang.NTRIPLES,     contentTypeNTriples) ;
         mapLangToContentType.put(Lang.RDFXML,       contentTypeRDFXML) ;
         mapLangToContentType.put(Lang.RDFJSON,		contentTypeRdfJson) ;



Mime
View raw message