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 2014/05/26 12:34:23 UTC
svn commit: r1597555 - in /jena/trunk/jena-arq/src/main/java/org/apache/jena:
atlas/csv/CSVParser.java riot/lang/LangCSV.java
Author: andy
Date: Mon May 26 10:34:23 2014
New Revision: 1597555
URL: http://svn.apache.org/r1597555
Log:
CSVParser.create factory method for Reader input
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/csv/CSVParser.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangCSV.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/csv/CSVParser.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/csv/CSVParser.java?rev=1597555&r1=1597554&r2=1597555&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/csv/CSVParser.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/csv/CSVParser.java Mon May 26 10:34:23 2014
@@ -19,6 +19,7 @@
package org.apache.jena.atlas.csv ;
import java.io.InputStream ;
+import java.io.Reader ;
import java.util.ArrayList ;
import java.util.Iterator ;
import java.util.List ;
@@ -42,7 +43,12 @@ public class CSVParser implements Iterab
CSVParser parser = new CSVParser(iter) ;
return parser ;
}
- // ----
+
+ public static CSVParser create(Reader input) {
+ CSVTokenIterator iter = new CSVTokenIterator(input) ;
+ CSVParser parser = new CSVParser(iter) ;
+ return parser ;
+ }
private final CSVTokenIterator iter ;
private final PeekIterator<CSVToken> pIter ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangCSV.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangCSV.java?rev=1597555&r1=1597554&r2=1597555&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangCSV.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangCSV.java Mon May 26 10:34:23 2014
@@ -24,7 +24,6 @@ import java.util.ArrayList ;
import java.util.List ;
import org.apache.jena.atlas.csv.CSVParser ;
-import org.apache.jena.atlas.csv.CSVTokenIterator ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFLanguages ;
import org.apache.jena.riot.system.ErrorHandler ;
@@ -85,14 +84,7 @@ public class LangCSV implements LangRIOT
@Override
public void parse() {
sink.start() ;
- CSVTokenIterator iter;
- if ( input != null ){
- iter = new CSVTokenIterator(input) ;
- } else {
- iter = new CSVTokenIterator(reader) ;
- }
-
- CSVParser parser = new CSVParser(iter) ;
+ CSVParser parser = ( input != null ) ? CSVParser.create(input) : CSVParser.create(reader) ;
List<String> row = null ;
ArrayList<Node> predicates = new ArrayList<Node>();
int rowNum = 0;