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 2013/01/11 20:21:41 UTC

svn commit: r1432239 - in /jena/trunk/jena-core/src/main/java/jena: query.java turtle.java

Author: andy
Date: Fri Jan 11 19:21:40 2013
New Revision: 1432239

URL: http://svn.apache.org/viewvc?rev=1432239&view=rev
Log:
jena.turtle now invokes, by reflection, riotcmd.turtle

Modified:
    jena/trunk/jena-core/src/main/java/jena/query.java
    jena/trunk/jena-core/src/main/java/jena/turtle.java

Modified: jena/trunk/jena-core/src/main/java/jena/query.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/query.java?rev=1432239&r1=1432238&r2=1432239&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/query.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/query.java Fri Jan 11 19:21:40 2013
@@ -41,7 +41,6 @@ public class query
     
     public static void invokeCmd(String className, String[] args)
     {
-        
         Class<?> cmd = null ;
         try { cmd = Class.forName(className) ; }
         catch (ClassNotFoundException ex)

Modified: jena/trunk/jena-core/src/main/java/jena/turtle.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/turtle.java?rev=1432239&r1=1432238&r2=1432239&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/turtle.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/turtle.java Fri Jan 11 19:21:40 2013
@@ -18,82 +18,11 @@
 
 package jena;
 
-import static jena.cmdline.CmdLineUtils.setLog4jConfiguration;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import com.hp.hpl.jena.n3.turtle.Turtle2NTriples;
-import com.hp.hpl.jena.n3.turtle.TurtleParseException;
-import com.hp.hpl.jena.n3.turtle.parser.ParseException;
-import com.hp.hpl.jena.n3.turtle.parser.TokenMgrError;
-import com.hp.hpl.jena.n3.turtle.parser.TurtleParser;
-import com.hp.hpl.jena.shared.JenaException;
-import com.hp.hpl.jena.util.FileUtils;
 
 public class turtle
 {
-	static { setLog4jConfiguration() ; }
-	
-    /** Run the Turtle parser - produce N-triples */
     public static void main(String... args)
     {
-        if ( args.length == 0 )
-        {
-            parse("http://example/BASE", System.in) ;
-            return ;
-        }
-        
-        
-        for ( int i = 0 ; i < args.length ; i++ )
-        {
-            String fn = args[i] ;
-            parse("http://base/", fn) ;
-        }
-    }        
-
-
-    public static void parse(String baseURI, String filename)
-    {
-        InputStream in = null ;
-        try {
-            in = new FileInputStream(filename) ;
-        } catch (FileNotFoundException ex)
-        {
-            System.err.println("File not found: "+filename) ;
-            return ;
-        }
-        parse(baseURI, in) ;
-    }
-
-
-    public static void parse(String baseURI, InputStream in)
-    {
-        Reader reader = FileUtils.asUTF8(in) ;
-        try {
-            TurtleParser parser = new TurtleParser(reader) ;
-            //parser.setEventHandler(new TurtleEventDump()) ;
-            parser.setEventHandler(new Turtle2NTriples(System.out)) ;
-            parser.setBaseURI(baseURI) ;
-            parser.parse() ;
-        }
-        catch (ParseException ex)
-        { throw new TurtleParseException(ex.getMessage()) ; }
-        catch (TokenMgrError tErr)
-        { throw new TurtleParseException(tErr.getMessage()) ; }
-
-        catch (TurtleParseException ex) { throw ex ; }
-
-        catch (JenaException ex)  { throw new TurtleParseException(ex.getMessage(), ex) ; }
-        catch (Error err)
-        {
-            throw new TurtleParseException(err.getMessage() , err) ;
-        }
-        catch (Throwable th)
-        {
-            throw new TurtleParseException(th.getMessage(), th) ;
-        }
+        query.invokeCmd("riotcmd.turtle",args) ;
     }
 }