You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by jo...@apache.org on 2014/02/06 14:11:04 UTC
svn commit: r1565223 - in
/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools: cmdline/ formats/
formats/ad/
Author: joern
Date: Thu Feb 6 13:11:04 2014
New Revision: 1565223
URL: http://svn.apache.org/r1565223
Log:
OPENNLP-600 Updated stream factories to use CmdLineUtil.createInputStreamFactory
Modified:
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ChunkerSampleStreamFactory.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/DocumentSampleStreamFactory.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/NameSampleDataStreamFactory.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ParseSampleStreamFactory.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/SentenceSampleStreamFactory.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/TokenSampleStreamFactory.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/WordTagSampleStreamFactory.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADChunkSampleStreamFactory.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADNameSampleStreamFactory.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADPOSSampleStreamFactory.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADSentenceSampleStreamFactory.java
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java?rev=1565223&r1=1565222&r2=1565223&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java Thu Feb 6 13:11:04 2014
@@ -307,6 +307,10 @@ public final class CmdLineUtil {
throw new TerminateToolException(-1, "IO Error while reading from stdin: " + e.getMessage(), e);
}
+ public static void handleCreateObjectStreamError(IOException e) {
+ throw new TerminateToolException(-1, "IO Error while creating an Input Stream: " + e.getMessage(), e);
+ }
+
// its optional, passing null is allowed
public static TrainingParameters loadTrainingParameters(String paramFile,
boolean supportSequenceTraining) {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ChunkerSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ChunkerSampleStreamFactory.java?rev=1565223&r1=1565222&r2=1565223&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ChunkerSampleStreamFactory.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ChunkerSampleStreamFactory.java Thu Feb 6 13:11:04 2014
@@ -16,21 +16,18 @@
*/
package opennlp.tools.formats;
+import java.io.IOException;
+
import opennlp.tools.chunker.ChunkSample;
import opennlp.tools.chunker.ChunkSampleStream;
import opennlp.tools.cmdline.ArgumentParser;
import opennlp.tools.cmdline.CmdLineUtil;
import opennlp.tools.cmdline.StreamFactoryRegistry;
import opennlp.tools.cmdline.params.BasicFormatParams;
+import opennlp.tools.util.InputStreamFactory;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.PlainTextByLineStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import opennlp.tools.util.MockInputStreamFactory;
-
/**
* Factory producing OpenNLP {@link ChunkSampleStream}s.
*/
@@ -52,13 +49,13 @@ public class ChunkerSampleStreamFactory
Parameters params = ArgumentParser.parse(args, Parameters.class);
CmdLineUtil.checkInputFile("Data", params.getData());
- FileInputStream sampleDataIn = CmdLineUtil.openInFile(params.getData());
+ InputStreamFactory sampleDataIn = CmdLineUtil.createInputStreamFactory(params.getData());
ObjectStream<String> lineStream = null;
try {
- lineStream = new PlainTextByLineStream(new MockInputStreamFactory(sampleDataIn), params.getEncoding());
+ lineStream = new PlainTextByLineStream(sampleDataIn, params.getEncoding());
} catch (IOException ex) {
- Logger.getLogger(ChunkerSampleStreamFactory.class.getName()).log(Level.SEVERE, null, ex);
+ CmdLineUtil.handleCreateObjectStreamError(ex);
}
return new ChunkSampleStream(lineStream);
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/DocumentSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/DocumentSampleStreamFactory.java?rev=1565223&r1=1565222&r2=1565223&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/DocumentSampleStreamFactory.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/DocumentSampleStreamFactory.java Thu Feb 6 13:11:04 2014
@@ -16,21 +16,18 @@
*/
package opennlp.tools.formats;
+import java.io.IOException;
+
import opennlp.tools.cmdline.ArgumentParser;
import opennlp.tools.cmdline.CmdLineUtil;
import opennlp.tools.cmdline.StreamFactoryRegistry;
import opennlp.tools.cmdline.params.BasicFormatParams;
import opennlp.tools.doccat.DocumentSample;
import opennlp.tools.doccat.DocumentSampleStream;
+import opennlp.tools.util.InputStreamFactory;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.PlainTextByLineStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import opennlp.tools.util.MockInputStreamFactory;
-
/**
* Factory producing OpenNLP {@link DocumentSampleStream}s.
*/
@@ -52,16 +49,12 @@ public class DocumentSampleStreamFactory
Parameters params = ArgumentParser.parse(args, Parameters.class);
CmdLineUtil.checkInputFile("Data", params.getData());
- FileInputStream sampleDataIn = CmdLineUtil.openInFile(params.getData());
+ InputStreamFactory sampleDataIn = CmdLineUtil.createInputStreamFactory(params.getData());
ObjectStream<String> lineStream=null;
try {
- lineStream = new PlainTextByLineStream(new MockInputStreamFactory(sampleDataIn),
- params.getEncoding());
- // params.getEncoding());
- // ObjectStream<String> lineStream = new PlainTextByLineStream(sampleDataIn.getChannel(),
- // params.getEncoding());
+ lineStream = new PlainTextByLineStream(sampleDataIn, params.getEncoding());
} catch (IOException ex) {
- throw new RuntimeException(ex);
+ CmdLineUtil.handleCreateObjectStreamError(ex);
}
return new DocumentSampleStream(lineStream);
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/NameSampleDataStreamFactory.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/NameSampleDataStreamFactory.java?rev=1565223&r1=1565222&r2=1565223&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/NameSampleDataStreamFactory.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/NameSampleDataStreamFactory.java Thu Feb 6 13:11:04 2014
@@ -16,10 +16,7 @@
*/
package opennlp.tools.formats;
-import java.io.FileInputStream;
import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import opennlp.tools.cmdline.ArgumentParser;
import opennlp.tools.cmdline.CmdLineUtil;
@@ -27,7 +24,7 @@ import opennlp.tools.cmdline.StreamFacto
import opennlp.tools.cmdline.params.BasicFormatParams;
import opennlp.tools.namefind.NameSample;
import opennlp.tools.namefind.NameSampleDataStream;
-import opennlp.tools.util.MockInputStreamFactory;
+import opennlp.tools.util.InputStreamFactory;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.PlainTextByLineStream;
@@ -53,14 +50,13 @@ public class NameSampleDataStreamFactory
CmdLineUtil.checkInputFile("Data", params.getData());
- FileInputStream sampleDataIn = CmdLineUtil.openInFile(params.getData());
+ InputStreamFactory sampleDataIn = CmdLineUtil.createInputStreamFactory(params.getData());
ObjectStream<String> lineStream = null;
try {
- lineStream = new PlainTextByLineStream(new MockInputStreamFactory(sampleDataIn),
- params.getEncoding());
+ lineStream = new PlainTextByLineStream((sampleDataIn), params.getEncoding());
} catch (IOException ex) {
- throw new RuntimeException(ex);
+ CmdLineUtil.handleCreateObjectStreamError(ex);
}
return new NameSampleDataStream(lineStream);
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ParseSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ParseSampleStreamFactory.java?rev=1565223&r1=1565222&r2=1565223&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ParseSampleStreamFactory.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ParseSampleStreamFactory.java Thu Feb 6 13:11:04 2014
@@ -16,21 +16,18 @@
*/
package opennlp.tools.formats;
+import java.io.IOException;
+
import opennlp.tools.cmdline.ArgumentParser;
import opennlp.tools.cmdline.CmdLineUtil;
import opennlp.tools.cmdline.StreamFactoryRegistry;
import opennlp.tools.cmdline.params.BasicFormatParams;
import opennlp.tools.parser.Parse;
import opennlp.tools.parser.ParseSampleStream;
+import opennlp.tools.util.InputStreamFactory;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.PlainTextByLineStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import opennlp.tools.util.MockInputStreamFactory;
-
/**
* Factory producing OpenNLP {@link ParseSampleStream}s.
*/
@@ -52,13 +49,13 @@ public class ParseSampleStreamFactory ex
Parameters params = ArgumentParser.parse(args, Parameters.class);
CmdLineUtil.checkInputFile("Data", params.getData());
- FileInputStream sampleDataIn = CmdLineUtil.openInFile(params.getData());
+ InputStreamFactory sampleDataIn = CmdLineUtil.createInputStreamFactory(params.getData());
ObjectStream<String> lineStream = null;
try {
- lineStream = new PlainTextByLineStream(new MockInputStreamFactory(sampleDataIn), params.getEncoding());
+ lineStream = new PlainTextByLineStream(sampleDataIn, params.getEncoding());
} catch (IOException ex) {
- throw new RuntimeException(ex);
+ CmdLineUtil.handleCreateObjectStreamError(ex);
}
return new ParseSampleStream(lineStream);
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/SentenceSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/SentenceSampleStreamFactory.java?rev=1565223&r1=1565222&r2=1565223&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/SentenceSampleStreamFactory.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/SentenceSampleStreamFactory.java Thu Feb 6 13:11:04 2014
@@ -17,20 +17,18 @@
package opennlp.tools.formats;
+import java.io.IOException;
+
import opennlp.tools.cmdline.ArgumentParser;
import opennlp.tools.cmdline.CmdLineUtil;
import opennlp.tools.cmdline.StreamFactoryRegistry;
import opennlp.tools.cmdline.params.BasicFormatParams;
import opennlp.tools.sentdetect.SentenceSample;
import opennlp.tools.sentdetect.SentenceSampleStream;
+import opennlp.tools.util.InputStreamFactory;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.PlainTextByLineStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import opennlp.tools.util.MockInputStreamFactory;
/**
* Factory producing OpenNLP {@link SentenceSampleStream}s.
@@ -53,14 +51,13 @@ public class SentenceSampleStreamFactory
Parameters params = ArgumentParser.parse(args, Parameters.class);
CmdLineUtil.checkInputFile("Data", params.getData());
- FileInputStream sampleDataIn = CmdLineUtil.openInFile(params.getData());
+ InputStreamFactory sampleDataIn = CmdLineUtil.createInputStreamFactory(params.getData());
ObjectStream<String> lineStream=null;
try {
- lineStream = new PlainTextByLineStream(new MockInputStreamFactory(sampleDataIn),
-params.getEncoding());
+ lineStream = new PlainTextByLineStream(sampleDataIn, params.getEncoding());
} catch (IOException ex) {
- Logger.getLogger(SentenceSampleStreamFactory.class.getName()).log(Level.SEVERE, null, ex);
+ CmdLineUtil.handleCreateObjectStreamError(ex);
}
return new SentenceSampleStream(lineStream);
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/TokenSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/TokenSampleStreamFactory.java?rev=1565223&r1=1565222&r2=1565223&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/TokenSampleStreamFactory.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/TokenSampleStreamFactory.java Thu Feb 6 13:11:04 2014
@@ -16,21 +16,18 @@
*/
package opennlp.tools.formats;
+import java.io.IOException;
+
import opennlp.tools.cmdline.ArgumentParser;
import opennlp.tools.cmdline.CmdLineUtil;
import opennlp.tools.cmdline.StreamFactoryRegistry;
import opennlp.tools.cmdline.params.BasicFormatParams;
import opennlp.tools.tokenize.TokenSample;
import opennlp.tools.tokenize.TokenSampleStream;
+import opennlp.tools.util.InputStreamFactory;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.PlainTextByLineStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import opennlp.tools.util.MockInputStreamFactory;
-
/**
* Factory producing OpenNLP {@link TokenSampleStream}s.
*/
@@ -52,14 +49,13 @@ public class TokenSampleStreamFactory ex
Parameters params = ArgumentParser.parse(args, Parameters.class);
CmdLineUtil.checkInputFile("Data", params.getData());
- FileInputStream sampleDataIn = CmdLineUtil.openInFile(params.getData());
+ InputStreamFactory sampleDataIn = CmdLineUtil.createInputStreamFactory(params.getData());
ObjectStream<String> lineStream = null;
try {
- lineStream = new PlainTextByLineStream(new MockInputStreamFactory(sampleDataIn),
- params.getEncoding());
+ lineStream = new PlainTextByLineStream(sampleDataIn, params.getEncoding());
} catch (IOException ex) {
- throw new RuntimeException(ex);
+ CmdLineUtil.handleCreateObjectStreamError(ex);
}
return new TokenSampleStream(lineStream);
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/WordTagSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/WordTagSampleStreamFactory.java?rev=1565223&r1=1565222&r2=1565223&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/WordTagSampleStreamFactory.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/WordTagSampleStreamFactory.java Thu Feb 6 13:11:04 2014
@@ -16,10 +16,7 @@
*/
package opennlp.tools.formats;
-import java.io.FileInputStream;
import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import opennlp.tools.cmdline.ArgumentParser;
import opennlp.tools.cmdline.CmdLineUtil;
@@ -27,7 +24,7 @@ import opennlp.tools.cmdline.StreamFacto
import opennlp.tools.cmdline.params.BasicFormatParams;
import opennlp.tools.postag.POSSample;
import opennlp.tools.postag.WordTagSampleStream;
-import opennlp.tools.util.MockInputStreamFactory;
+import opennlp.tools.util.InputStreamFactory;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.PlainTextByLineStream;
@@ -52,14 +49,13 @@ public class WordTagSampleStreamFactory
Parameters params = ArgumentParser.parse(args, Parameters.class);
CmdLineUtil.checkInputFile("Data", params.getData());
- FileInputStream sampleDataIn = CmdLineUtil.openInFile(params.getData());
+ InputStreamFactory sampleDataIn = CmdLineUtil.createInputStreamFactory(params.getData());
ObjectStream<String> lineStream = null;
try {
- lineStream = new PlainTextByLineStream(new MockInputStreamFactory(sampleDataIn),
- params.getEncoding());
+ lineStream = new PlainTextByLineStream(sampleDataIn, params.getEncoding());
} catch (IOException ex) {
- throw new RuntimeException(ex);
+ CmdLineUtil.handleCreateObjectStreamError(ex);
}
return new WordTagSampleStream(lineStream);
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADChunkSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADChunkSampleStreamFactory.java?rev=1565223&r1=1565222&r2=1565223&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADChunkSampleStreamFactory.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADChunkSampleStreamFactory.java Thu Feb 6 13:11:04 2014
@@ -18,11 +18,8 @@
package opennlp.tools.formats.ad;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.nio.charset.Charset;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import opennlp.tools.chunker.ChunkSample;
import opennlp.tools.cmdline.ArgumentParser;
@@ -31,7 +28,7 @@ import opennlp.tools.cmdline.ArgumentPar
import opennlp.tools.cmdline.CmdLineUtil;
import opennlp.tools.cmdline.StreamFactoryRegistry;
import opennlp.tools.formats.LanguageSampleStreamFactory;
-import opennlp.tools.util.MockInputStreamFactory;
+import opennlp.tools.util.InputStreamFactory;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.PlainTextByLineStream;
@@ -80,14 +77,13 @@ public class ADChunkSampleStreamFactory
language = params.getLang();
- FileInputStream sampleDataIn = CmdLineUtil.openInFile(params.getData());
+ InputStreamFactory sampleDataIn = CmdLineUtil.createInputStreamFactory(params.getData());
ObjectStream<String> lineStream=null;
try {
- lineStream = new PlainTextByLineStream(new MockInputStreamFactory(sampleDataIn),
-params.getEncoding());
+ lineStream = new PlainTextByLineStream(sampleDataIn, params.getEncoding());
} catch (IOException ex) {
- Logger.getLogger(ADChunkSampleStreamFactory.class.getName()).log(Level.SEVERE, null, ex);
+ CmdLineUtil.handleCreateObjectStreamError(ex);
}
ADChunkSampleStream sampleStream = new ADChunkSampleStream(lineStream);
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADNameSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADNameSampleStreamFactory.java?rev=1565223&r1=1565222&r2=1565223&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADNameSampleStreamFactory.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADNameSampleStreamFactory.java Thu Feb 6 13:11:04 2014
@@ -18,11 +18,8 @@
package opennlp.tools.formats.ad;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.nio.charset.Charset;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import opennlp.tools.cmdline.ArgumentParser;
import opennlp.tools.cmdline.ArgumentParser.OptionalParameter;
@@ -31,7 +28,7 @@ import opennlp.tools.cmdline.CmdLineUtil
import opennlp.tools.cmdline.StreamFactoryRegistry;
import opennlp.tools.formats.LanguageSampleStreamFactory;
import opennlp.tools.namefind.NameSample;
-import opennlp.tools.util.MockInputStreamFactory;
+import opennlp.tools.util.InputStreamFactory;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.PlainTextByLineStream;
@@ -76,14 +73,14 @@ public class ADNameSampleStreamFactory e
language = params.getLang();
- FileInputStream sampleDataIn = CmdLineUtil.openInFile(params.getData());
+ InputStreamFactory sampleDataIn = CmdLineUtil.createInputStreamFactory(params.getData());
ObjectStream<String> lineStream=null;
try {
- lineStream = new PlainTextByLineStream(
-new MockInputStreamFactory(sampleDataIn), params.getEncoding());
+ lineStream = new PlainTextByLineStream(sampleDataIn, params.getEncoding());
} catch (IOException ex) {
-throw new RuntimeException(ex) ; }
+ CmdLineUtil.handleCreateObjectStreamError(ex);
+ }
return new ADNameSampleStream(lineStream, params.getSplitHyphenatedTokens());
}
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADPOSSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADPOSSampleStreamFactory.java?rev=1565223&r1=1565222&r2=1565223&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADPOSSampleStreamFactory.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADPOSSampleStreamFactory.java Thu Feb 6 13:11:04 2014
@@ -18,11 +18,8 @@
package opennlp.tools.formats.ad;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.nio.charset.Charset;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import opennlp.tools.cmdline.ArgumentParser;
import opennlp.tools.cmdline.ArgumentParser.OptionalParameter;
@@ -31,7 +28,7 @@ import opennlp.tools.cmdline.CmdLineUtil
import opennlp.tools.cmdline.StreamFactoryRegistry;
import opennlp.tools.formats.LanguageSampleStreamFactory;
import opennlp.tools.postag.POSSample;
-import opennlp.tools.util.MockInputStreamFactory;
+import opennlp.tools.util.InputStreamFactory;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.PlainTextByLineStream;
@@ -75,14 +72,13 @@ public class ADPOSSampleStreamFactory ex
language = params.getLang();
- FileInputStream sampleDataIn = CmdLineUtil.openInFile(params.getData());
+ InputStreamFactory sampleDataIn = CmdLineUtil.createInputStreamFactory(params.getData());
ObjectStream<String> lineStream=null;
try {
- lineStream = new PlainTextByLineStream(
-new MockInputStreamFactory(sampleDataIn), params.getEncoding());
+ lineStream = new PlainTextByLineStream(sampleDataIn, params.getEncoding());
} catch (IOException ex) {
- Logger.getLogger(ADPOSSampleStreamFactory.class.getName()).log(Level.SEVERE, null, ex);
+ CmdLineUtil.handleCreateObjectStreamError(ex);
}
ADPOSSampleStream sentenceStream = new ADPOSSampleStream(lineStream,
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADSentenceSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADSentenceSampleStreamFactory.java?rev=1565223&r1=1565222&r2=1565223&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADSentenceSampleStreamFactory.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADSentenceSampleStreamFactory.java Thu Feb 6 13:11:04 2014
@@ -18,11 +18,8 @@
package opennlp.tools.formats.ad;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.nio.charset.Charset;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import opennlp.tools.cmdline.ArgumentParser;
import opennlp.tools.cmdline.ArgumentParser.OptionalParameter;
@@ -31,7 +28,7 @@ import opennlp.tools.cmdline.CmdLineUtil
import opennlp.tools.cmdline.StreamFactoryRegistry;
import opennlp.tools.formats.LanguageSampleStreamFactory;
import opennlp.tools.sentdetect.SentenceSample;
-import opennlp.tools.util.MockInputStreamFactory;
+import opennlp.tools.util.InputStreamFactory;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.PlainTextByLineStream;
@@ -73,14 +70,13 @@ public class ADSentenceSampleStreamFacto
boolean includeTitle = params.getIncludeTitles();
- FileInputStream sampleDataIn = CmdLineUtil.openInFile(params.getData());
+ InputStreamFactory sampleDataIn = CmdLineUtil.createInputStreamFactory(params.getData());
ObjectStream<String> lineStream=null;
try {
- lineStream = new PlainTextByLineStream(
-new MockInputStreamFactory(sampleDataIn), params.getEncoding());
+ lineStream = new PlainTextByLineStream(sampleDataIn, params.getEncoding());
} catch (IOException ex) {
- Logger.getLogger(ADSentenceSampleStreamFactory.class.getName()).log(Level.SEVERE, null, ex);
+ CmdLineUtil.handleCreateObjectStreamError(ex);
}
ADSentenceSampleStream sentenceStream = new ADSentenceSampleStream(
@@ -88,5 +84,4 @@ new MockInputStreamFactory(sampleDataIn)
return sentenceStream;
}
-
}