svn commit: r1540282 - /jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java

[an...@apache.org]

Author: andy
Date: Sat Nov  9 09:57:35 2013
New Revision: 1540282

URL: http://svn.apache.org/r1540282
Log:
Convert to Lang from string once only

Modified:
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java?rev=1540282&r1=1540281&r2=1540282&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java Sat Nov  9 09:57:35 2013
@@ -22,6 +22,7 @@ import java.io.InputStream ;
 import java.io.Reader ;
 import java.util.Locale ;
 
+import org.apache.jena.riot.Lang ;
 import org.apache.jena.riot.RDFDataMgr ;
 import org.apache.jena.riot.RDFLanguages ;
 
@@ -37,9 +38,9 @@ import com.hp.hpl.jena.sparql.util.Symbo
 public class RDFReaderRIOT implements RDFReader
 {
     private final String basename ; // This will be per reader instance.
-    private final String hintlang ;
-    private Context context = new Context() ;
-    private RDFErrorHandler errorHandler = new RDFDefaultErrorHandler();
+    protected final Lang hintlang ;
+    protected Context context = new Context() ;
+    protected RDFErrorHandler errorHandler = new RDFDefaultErrorHandler();
     
     public RDFReaderRIOT()
     {
@@ -50,7 +51,7 @@ public class RDFReaderRIOT implements RD
     public RDFReaderRIOT(String lang)
     {
         basename = "org.apache.jena.riot.reader."+lang.toLowerCase(Locale.ROOT) ;
-        hintlang = lang ;
+        hintlang = RDFLanguages.nameToLang(lang) ;
     }
 
     @SuppressWarnings("deprecation")
@@ -58,7 +59,7 @@ public class RDFReaderRIOT implements RD
     public void read(Model model, Reader r, String base)
     { 
         startRead(model) ; 
-        RDFDataMgr.read(model, r, base, RDFLanguages.nameToLang(hintlang)) ;
+        RDFDataMgr.read(model, r, base, hintlang) ;
         finishRead(model) ;
     }
 
@@ -66,7 +67,7 @@ public class RDFReaderRIOT implements RD
     public void read(Model model, InputStream r, String base)
     { 
         startRead(model) ; 
-        RDFDataMgr.read(model, r, base, RDFLanguages.nameToLang(hintlang)) ;
+        RDFDataMgr.read(model, r, base, hintlang) ;
         finishRead(model) ;
     }
     
@@ -74,7 +75,7 @@ public class RDFReaderRIOT implements RD
     public void read(Model model, String url)
     { 
         startRead(model) ;
-        RDFDataMgr.read(model, url, RDFLanguages.nameToLang(hintlang)) ;
+        RDFDataMgr.read(model, url, hintlang) ;
         finishRead(model) ;
     }