Author: andy
Date: Fri Jul 26 21:25:58 2013
New Revision: 1507457
URL: http://svn.apache.org/r1507457
Log:
Minor cleanups
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultsFormat.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/QueryExecUtils.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultsFormat.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultsFormat.java?rev=1507457&r1=1507456&r2=1507457&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultsFormat.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultsFormat.java
Fri Jul 26 21:25:58 2013
@@ -26,7 +26,7 @@ import com.hp.hpl.jena.sparql.util.Trans
// Better ....
//public enum ResultFormat
//{
-// // Merge with out system wide naming (WebContent?)
+// // Merge with our system wide naming (WebContent?)
// FMT_RS_XML , FMT_RS_JSON , FMT_RS_CSV , FMT_RS_TSV , FMT_RS_SSE ,
FMT_RS_BIO ,
// FMT_NONE , FMT_TEXT , FMT_TUPLES , FMT_COUNT ,
// FMT_RS_RDF , FMT_RDF_XML , FMT_RDF_N3 , FMT_RDF_TTL , FMT_RDF_TURTLE ,
FMT_RDF_NT ,
@@ -50,7 +50,6 @@ public class ResultsFormat extends Symbo
static public ResultsFormat FMT_TEXT = new ResultsFormat("text") ;
static public ResultsFormat FMT_TUPLES = new ResultsFormat("tuples")
;
static public ResultsFormat FMT_COUNT = new ResultsFormat("count") ;
- static public ResultsFormat FMT_RS_RDF = new
ResultsFormat(contentTypeRDFXML) ;
static public ResultsFormat FMT_RDF_XML = new
ResultsFormat(contentTypeRDFXML) ;
static public ResultsFormat FMT_RDF_N3 = new
ResultsFormat(contentTypeN3) ;
static public ResultsFormat FMT_RDF_TTL = new
ResultsFormat(contentTypeTurtle) ;
@@ -127,7 +126,7 @@ public class ResultsFormat extends Symbo
if ( url.endsWith(".yml") )
return FMT_RS_JSON ;
- // -- SSE : http://openjena.org/wiki/SSE
+ // -- SSE : http://jena.apache.org/documentation/notes/sse.html
if ( url.endsWith(".sse") )
return FMT_RS_SSE ;
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/QueryExecUtils.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/QueryExecUtils.java?rev=1507457&r1=1507456&r2=1507457&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/QueryExecUtils.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/QueryExecUtils.java
Fri Jul 26 21:25:58 2013
@@ -122,7 +122,7 @@ public class QueryExecUtils
done = true ;
}
- if ( outputFormat.equals(ResultsFormat.FMT_RS_RDF) ||
+ if ( outputFormat.equals(ResultsFormat.FMT_RDF_XML) ||
outputFormat.equals(ResultsFormat.FMT_RDF_N3) ||
outputFormat.equals(ResultsFormat.FMT_RDF_TTL) )
{
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java?rev=1507457&r1=1507456&r2=1507457&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java Fri Jul 26
21:25:58 2013
@@ -74,7 +74,7 @@ public class Lang
private final List<String> altContentTypes ;
private final List<String> fileExtensions ;
- // NOT public. This is to force use of the RDFLanguages which makes
languges symbols and so == works
+ // NOT public. This is to force use of the RDFLanguages which makes
languages symbols and so == works
protected Lang(String langlabel, String mainContentType, List<String>
altLangLabels, List<String> otherContentTypes, List<String> fileExt)
{
if ( langlabel == null )
