svn commit: r1620388 - /jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java

[an...@apache.org]

Author: andy
Date: Mon Aug 25 17:44:27 2014
New Revision: 1620388

URL: http://svn.apache.org/r1620388
Log:
Don't initialize dispatch too early - extensions can't override.

Modified:
    jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java

Modified: jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java?rev=1620388&r1=1620387&r2=1620388&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java Mon Aug 25 17:44:27 2014
@@ -20,8 +20,6 @@ package riotcmd;
 
 import java.io.InputStream ;
 import java.io.OutputStream ;
-import java.util.HashMap ;
-import java.util.Map ;
 
 import org.apache.jena.atlas.io.IO ;
 import org.apache.jena.atlas.web.ContentType ;
@@ -80,17 +78,6 @@ public abstract class CmdLangParse exten
         public String getRateName()         { return "TPS" ; }
     } ;
     
-    protected static Map<Lang, LangHandler> dispatch = new HashMap<>() ;
-    static {
-        for ( Lang lang : RDFLanguages.getRegisteredLanguages() )
-        {
-            if ( RDFLanguages.isQuads(lang) )
-                dispatch.put(lang, langHandlerQuads) ;
-            else
-                dispatch.put(lang, langHandlerTriples) ;
-        }
-    }
-    
     protected LangHandler langHandlerOverall = null ;
 
     protected CmdLangParse(String[] argv)
@@ -213,8 +200,12 @@ public abstract class CmdLangParse exten
         }
         
         Lang lang = selectLang(filename, ct, RDFLanguages.NQUADS) ;  
-        LangHandler handler = dispatch.get(lang) ;
-        if ( handler == null )
+        LangHandler handler = null ;
+        if ( RDFLanguages.isQuads(lang) )
+            handler = langHandlerQuads ;
+        else if ( RDFLanguages.isTriples(lang) )
+            handler = langHandlerTriples ;
+        else 
             throw new CmdException("Undefined language: "+lang) ; 
         
         // If multiple files, choose the overall labels.