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 2011/11/16 10:54:06 UTC
svn commit: r1202610 - in
/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools:
cmdline/ cmdline/chunker/ cmdline/dictionary/ cmdline/doccat/
cmdline/namefind/ cmdline/parser/ cmdline/postag/ cmdline/sentdetect/
cmdline/tokenizer/ formats...
Author: joern
Date: Wed Nov 16 09:54:05 2011
New Revision: 1202610
URL: http://svn.apache.org/viewvc?rev=1202610&view=rev
Log:
OPENNLP-381 Error messages for command line arguments introduced into command line tools. Thanks to Aliaksandr Autayeu for providing a patch.
Modified:
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/AbstractConverterTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/ArgumentParser.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/ObjectStreamFactory.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerCrossValidatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerEvaluatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerTrainerTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/dictionary/DictionaryBuilderTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatTrainerTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/CensusDictionaryCreatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTrainerTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ModelUpdaterTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTrainerTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerCrossValidatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerEvaluatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTrainerTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorCrossValidatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorEvaluatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorTrainerTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerCrossValidatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerMEEvaluatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerTrainerTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/BioNLP2004NameSampleStreamFactory.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/Conll02NameSampleStreamFactory.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/Conll03NameSampleStreamFactory.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ConllXPOSSampleStreamFactory.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ConllXSentenceSampleStreamFactory.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ConllXTokenSampleStreamFactory.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/LeipzigDocumentSampleStreamFactory.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/NameSampleStreamFactory.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/NameToSentenceSampleStreamFactory.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/NameToTokenSampleStreamFactory.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/POSToSentenceSampleStreamFactory.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/POSToTokenSampleStreamFactory.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/WordTagSampleStreamFactory.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADChunkSampleStreamFactory.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADNameSampleStreamFactory.java
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/AbstractConverterTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/AbstractConverterTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/AbstractConverterTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/AbstractConverterTool.java Wed Nov 16 09:54:05 2011
@@ -48,14 +48,16 @@ public abstract class AbstractConverterT
if (streamFactory == null) {
// TODO: print list of available formats
- System.err.println("Format is unkown: " + format);
+ System.err.println("Format is unknown: " + format);
throw new TerminateToolException(-1);
}
String formatArgs[] = new String[args.length - 1];
System.arraycopy(args, 1, formatArgs, 0, formatArgs.length);
-
- if (!streamFactory.validateArguments(formatArgs)) {
+
+ String errorMessage = streamFactory.validateArguments(formatArgs);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(createHelpString(format, streamFactory.getUsage()));
throw new TerminateToolException(-1);
}
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/ArgumentParser.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/ArgumentParser.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/ArgumentParser.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/ArgumentParser.java Wed Nov 16 09:54:05 2011
@@ -24,8 +24,11 @@ import java.lang.reflect.InvocationHandl
import java.lang.reflect.Method;
import java.nio.charset.Charset;
import java.nio.charset.IllegalCharsetNameException;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -255,40 +258,61 @@ public class ArgumentParser {
* Tests if the argument are correct or incorrect. Incorrect means, that mandatory arguments are missing or
* there are unknown arguments. The argument value itself can also be incorrect, but this
* is checked by the {@link ArgumentParser#parse(String[], Class)} method and reported accordingly.
- *
- * @param args
- * @param argProxyInterface
- * @return
+ *
+ * @param args command line arguments
+ * @param argProxyInterface interface with parameters description
+ * @return true, if arguments are valid
*/
public static <T> boolean validateArguments(String args[], Class<T> argProxyInterface) {
+ return null == validateArgumentsLoudly(args, argProxyInterface);
+ }
+
+ /**
+ * Tests if the arguments are correct or incorrect.
+ *
+ * @param args command line arguments
+ * @param argProxyInterface interface with parameters description
+ * @return null, if arguments are valid or error message otherwise
+ */
+ public static <T> String validateArgumentsLoudly(String args[], Class<T> argProxyInterface) {
// number of parameters must be at least 2 and always be even
- if (args.length < 2 || args.length % 2 != 0)
- return false;
+ if (args.length < 2 || args.length % 2 != 0) {
+ return "Error: Number of parameters must be at least 2 and always be even";
+ }
int argumentCount = 0;
-
+
+ List<String> parameters = new ArrayList<String>(Arrays.asList(args));
for (Method method : argProxyInterface.getMethods()) {
-
- String valueString = CmdLineUtil.getParameter(
- methodNameToParameter(method.getName()), args);
-
+ String paramName = methodNameToParameter(method.getName());
+ int paramIndex = CmdLineUtil.getParameterIndex(paramName, args);
+ String valueString = CmdLineUtil.getParameter(paramName, args);
if (valueString == null) {
OptionalParameter optionalParam = method.getAnnotation(OptionalParameter.class);
-
- // missing mandatory parameter
- if (optionalParam == null)
- return false;
+
+ if (optionalParam == null) {
+ if (-1 < paramIndex) {
+ return "Error: Missing mandatory parameter value: " + paramName;
+ } else {
+ return "Error: Missing mandatory parameter: " + paramName;
+ }
+ } else {
+ parameters.remove("-" + paramName);
+ }
}
else {
+ parameters.remove(paramName);
+ parameters.remove(valueString);
argumentCount++;
}
}
- if (args.length / 2 != argumentCount)
- return false;
+ if (args.length / 2 > argumentCount) {
+ return "Error: Unrecognized parameters encountered: " + parameters.toString();
+ }
- return true;
+ return null;
}
/**
@@ -297,10 +321,10 @@ public class ArgumentParser {
* In case an argument value cannot be parsed a {@link TerminateToolException} is
* thrown which contains an error message which explains the problems.
*
- * @param args
- * @param argProxyInterface
+ * @param args arguments
+ * @param argProxyInterface interface with parameters description
*
- * @return
+ * @return parsed parameters
*
* @throws TerminateToolException if an argument value cannot be parsed.
* @throws IllegalArgumentException if validateArguments returns false, if the proxy interface is not compatible.
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java Wed Nov 16 09:54:05 2011
@@ -214,33 +214,49 @@ public final class CmdLineUtil {
System.err.println();
}
-
+
/**
- * Retrieves the specified parameters from the given arguments.
- *
- * @param param
- * @param args
- * @return
+ * Returns the index of the parameter in the arguments, or -1 if the parameter is not found.
+ *
+ * @param param parameter name
+ * @param args arguments
+ * @return the index of the parameter in the arguments, or -1 if the parameter is not found
*/
- public static String getParameter(String param, String args[]) {
+ public static int getParameterIndex(String param, String args[]) {
for (int i = 0; i < args.length; i++) {
if (args[i].startsWith("-") && args[i].equals(param)) {
+ return i;
+ }
+ }
+
+ return -1;
+ }
+
+ /**
+ * Retrieves the specified parameter from the given arguments.
+ *
+ * @param param parameter name
+ * @param args arguments
+ * @return parameter value
+ */
+ public static String getParameter(String param, String args[]) {
+ int i = getParameterIndex(param, args);
+ if (-1 < i) {
i++;
if (i < args.length) {
return args[i];
}
}
- }
-
+
return null;
}
/**
- * Retrieves the specified parameters from the specified arguments.
+ * Retrieves the specified parameter from the specified arguments.
*
- * @param param
- * @param args
- * @return
+ * @param param parameter name
+ * @param args arguments
+ * @return parameter value
*/
public static Integer getIntParameter(String param, String args[]) {
String value = getParameter(param, args);
@@ -256,11 +272,11 @@ public final class CmdLineUtil {
}
/**
- * Retrieves the specified parameters from the specified arguments.
+ * Retrieves the specified parameter from the specified arguments.
*
- * @param param
- * @param args
- * @return
+ * @param param parameter name
+ * @param args arguments
+ * @return parameter value
*/
public static Double getDoubleParameter(String param, String args[]) {
String value = getParameter(param, args);
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/ObjectStreamFactory.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/ObjectStreamFactory.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/ObjectStreamFactory.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/ObjectStreamFactory.java Wed Nov 16 09:54:05 2011
@@ -21,15 +21,24 @@ import opennlp.tools.util.ObjectStream;
public interface ObjectStreamFactory<T> {
+ /**
+ * Returns usage help message.
+ * @return help message
+ */
String getUsage();
-
- boolean validateArguments(String args[]);
+
+ /**
+ * Validates arguments and returns null if they are valid or error message if they are not.
+ * @param args arguments
+ * @return returns null if arguments are valid or error message if they are not
+ */
+ String validateArguments(String args[]);
/**
- * Creates the <code>ObjectStream</code>
+ * Creates the <code>ObjectStream</code>.
*
- * @param args
- * @return
+ * @param args arguments
+ * @return ObjectStream instance
*/
ObjectStream<T> create(String args[]);
}
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerCrossValidatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerCrossValidatorTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerCrossValidatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerCrossValidatorTool.java Wed Nov 16 09:54:05 2011
@@ -57,7 +57,9 @@ public final class ChunkerCrossValidator
}
public void run(String[] args) {
- if (!ArgumentParser.validateArguments(args, CVToolParams.class)) {
+ String errorMessage = ArgumentParser.validateArgumentsLoudly(args, CVToolParams.class);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(getHelp());
throw new TerminateToolException(1);
}
@@ -65,7 +67,7 @@ public final class ChunkerCrossValidator
CVToolParams params = ArgumentParser.parse(args,
CVToolParams.class);
- opennlp.tools.util.TrainingParameters mlParams = CmdLineUtil
+ TrainingParameters mlParams = CmdLineUtil
.loadTrainingParameters(params.getParams(), false);
File trainingDataInFile = params.getData();
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerEvaluatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerEvaluatorTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerEvaluatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerEvaluatorTool.java Wed Nov 16 09:54:05 2011
@@ -60,7 +60,9 @@ public final class ChunkerEvaluatorTool
public void run(String[] args) {
- if (!ArgumentParser.validateArguments(args, EvaluatorParams.class)) {
+ String errorMessage = ArgumentParser.validateArgumentsLoudly(args, EvaluatorParams.class);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(getHelp());
throw new TerminateToolException(1);
}
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerTrainerTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerTrainerTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerTrainerTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerTrainerTool.java Wed Nov 16 09:54:05 2011
@@ -69,7 +69,9 @@ public class ChunkerTrainerTool implemen
public void run(String[] args) {
- if (!ArgumentParser.validateArguments(args, TrainerToolParams.class)) {
+ String errorMessage = ArgumentParser.validateArgumentsLoudly(args, TrainerToolParams.class);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(getHelp());
throw new TerminateToolException(1);
}
@@ -77,7 +79,7 @@ public class ChunkerTrainerTool implemen
TrainerToolParams params = ArgumentParser.parse(args,
TrainerToolParams.class);
- opennlp.tools.util.TrainingParameters mlParams =
+ opennlp.tools.util.TrainingParameters mlParams =
CmdLineUtil.loadTrainingParameters(params.getParams(), false);
File trainingDataInFile = params.getData();
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/dictionary/DictionaryBuilderTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/dictionary/DictionaryBuilderTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/dictionary/DictionaryBuilderTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/dictionary/DictionaryBuilderTool.java Wed Nov 16 09:54:05 2011
@@ -53,7 +53,9 @@ public class DictionaryBuilderTool imple
}
public void run(String[] args) {
- if (!ArgumentParser.validateArguments(args, Params.class)) {
+ String errorMessage = ArgumentParser.validateArgumentsLoudly(args, Params.class);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(getHelp());
throw new TerminateToolException(1);
}
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatTrainerTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatTrainerTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatTrainerTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatTrainerTool.java Wed Nov 16 09:54:05 2011
@@ -67,7 +67,9 @@ public class DoccatTrainerTool implement
}
public void run(String[] args) {
- if (!ArgumentParser.validateArguments(args, TrainerToolParams.class)) {
+ String errorMessage = ArgumentParser.validateArgumentsLoudly(args, TrainerToolParams.class);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(getHelp());
throw new TerminateToolException(1);
}
@@ -75,7 +77,7 @@ public class DoccatTrainerTool implement
TrainerToolParams params = ArgumentParser.parse(args,
TrainerToolParams.class);
- opennlp.tools.util.TrainingParameters mlParams =
+ opennlp.tools.util.TrainingParameters mlParams =
CmdLineUtil.loadTrainingParameters(params.getParams(), false);
File trainingDataInFile = params.getData();
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/CensusDictionaryCreatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/CensusDictionaryCreatorTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/CensusDictionaryCreatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/CensusDictionaryCreatorTool.java Wed Nov 16 09:54:05 2011
@@ -130,7 +130,9 @@ public class CensusDictionaryCreatorTool
*/
public void run(String[] args) {
- if (!ArgumentParser.validateArguments(args, Parameters.class)) {
+ String errorMessage = ArgumentParser.validateArgumentsLoudly(args, Parameters.class);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(getHelp());
throw new TerminateToolException(1);
}
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java Wed Nov 16 09:54:05 2011
@@ -58,7 +58,9 @@ public final class TokenNameFinderCrossV
}
public void run(String[] args) {
- if (!ArgumentParser.validateArguments(args, CVToolParams.class)) {
+ String errorMessage = ArgumentParser.validateArgumentsLoudly(args, CVToolParams.class);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(getHelp());
throw new TerminateToolException(1);
}
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java Wed Nov 16 09:54:05 2011
@@ -60,8 +60,9 @@ public final class TokenNameFinderEvalua
public void run(String[] args) {
- if (!ArgumentParser
- .validateArguments(args, EvalToolParams.class)) {
+ String errorMessage = ArgumentParser.validateArgumentsLoudly(args, EvalToolParams.class);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(getHelp());
throw new TerminateToolException(1);
}
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTrainerTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTrainerTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTrainerTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTrainerTool.java Wed Nov 16 09:54:05 2011
@@ -167,7 +167,9 @@ public final class TokenNameFinderTraine
public void run(String[] args) {
- if (!ArgumentParser.validateArguments(args, TrainerToolParams.class)) {
+ String errorMessage = ArgumentParser.validateArgumentsLoudly(args, TrainerToolParams.class);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(getHelp());
throw new TerminateToolException(1);
}
@@ -175,7 +177,7 @@ public final class TokenNameFinderTraine
TrainerToolParams params = ArgumentParser.parse(args,
TrainerToolParams.class);
- opennlp.tools.util.TrainingParameters mlParams =
+ opennlp.tools.util.TrainingParameters mlParams =
CmdLineUtil.loadTrainingParameters(params.getParams(), true);
File trainingDataInFile = params.getData();
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ModelUpdaterTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ModelUpdaterTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ModelUpdaterTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ModelUpdaterTool.java Wed Nov 16 09:54:05 2011
@@ -50,7 +50,9 @@ abstract class ModelUpdaterTool implemen
public final void run(String[] args) {
- if (!ArgumentParser.validateArguments(args, ModelUpdaterParams.class)) {
+ String errorMessage = ArgumentParser.validateArgumentsLoudly(args, ModelUpdaterParams.class);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(getHelp());
throw new TerminateToolException(1);
}
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTrainerTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTrainerTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTrainerTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTrainerTool.java Wed Nov 16 09:54:05 2011
@@ -115,7 +115,9 @@ public final class ParserTrainerTool imp
// TODO: Add param to train tree insert parser
public void run(String[] args) {
- if (!ArgumentParser.validateArguments(args, TrainerToolParams.class)) {
+ String errorMessage = ArgumentParser.validateArgumentsLoudly(args, TrainerToolParams.class);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(getHelp());
throw new TerminateToolException(1);
}
@@ -123,7 +125,7 @@ public final class ParserTrainerTool imp
TrainerToolParams params = ArgumentParser.parse(args,
TrainerToolParams.class);
- opennlp.tools.util.TrainingParameters mlParams =
+ opennlp.tools.util.TrainingParameters mlParams =
CmdLineUtil.loadTrainingParameters(params.getParams(), true);
if (mlParams != null) {
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerCrossValidatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerCrossValidatorTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerCrossValidatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerCrossValidatorTool.java Wed Nov 16 09:54:05 2011
@@ -54,14 +54,16 @@ public final class POSTaggerCrossValidat
}
public void run(String[] args) {
- if (!ArgumentParser.validateArguments(args, CVToolParams.class)) {
+ String errorMessage = ArgumentParser.validateArgumentsLoudly(args, CVToolParams.class);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(getHelp());
throw new TerminateToolException(1);
}
CVToolParams params = ArgumentParser.parse(args, CVToolParams.class);
- opennlp.tools.util.TrainingParameters mlParams = CmdLineUtil
+ TrainingParameters mlParams = CmdLineUtil
.loadTrainingParameters(params.getParams(), false);
File trainingDataInFile = params.getData();
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerEvaluatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerEvaluatorTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerEvaluatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerEvaluatorTool.java Wed Nov 16 09:54:05 2011
@@ -49,8 +49,9 @@ public final class POSTaggerEvaluatorToo
}
public void run(String[] args) {
- if (!ArgumentParser
- .validateArguments(args, EvaluatorParams.class)) {
+ String errorMessage = ArgumentParser.validateArgumentsLoudly(args, EvaluatorParams.class);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(getHelp());
throw new TerminateToolException(1);
}
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTrainerTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTrainerTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTrainerTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTrainerTool.java Wed Nov 16 09:54:05 2011
@@ -71,7 +71,9 @@ public final class POSTaggerTrainerTool
}
public void run(String[] args) {
- if (!ArgumentParser.validateArguments(args, TrainerToolParams.class)) {
+ String errorMessage = ArgumentParser.validateArgumentsLoudly(args, TrainerToolParams.class);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(getHelp());
throw new TerminateToolException(1);
}
@@ -79,7 +81,7 @@ public final class POSTaggerTrainerTool
TrainerToolParams params = ArgumentParser.parse(args,
TrainerToolParams.class);
- opennlp.tools.util.TrainingParameters mlParams =
+ opennlp.tools.util.TrainingParameters mlParams =
CmdLineUtil.loadTrainingParameters(params.getParams(), true);
if (mlParams != null && !TrainUtil.isValid(mlParams.getSettings())) {
@@ -91,7 +93,7 @@ public final class POSTaggerTrainerTool
File modelOutFile = params.getModel();
CmdLineUtil.checkOutputFile("pos tagger model", modelOutFile);
- ObjectStream<POSSample> sampleStream = openSampleData("Training", trainingDataInFile,
+ ObjectStream<POSSample> sampleStream = openSampleData("Training", trainingDataInFile,
params.getEncoding());
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorCrossValidatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorCrossValidatorTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorCrossValidatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorCrossValidatorTool.java Wed Nov 16 09:54:05 2011
@@ -55,14 +55,16 @@ public final class SentenceDetectorCross
public void run(String[] args) {
- if (!ArgumentParser.validateArguments(args, CVToolParams.class)) {
+ String errorMessage = ArgumentParser.validateArgumentsLoudly(args, CVToolParams.class);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(getHelp());
throw new TerminateToolException(1);
}
CVToolParams params = ArgumentParser.parse(args, CVToolParams.class);
- opennlp.tools.util.TrainingParameters mlParams =
+ TrainingParameters mlParams =
CmdLineUtil.loadTrainingParameters(params.getParams(), false);
File trainingDataInFile = params.getData();
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorEvaluatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorEvaluatorTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorEvaluatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorEvaluatorTool.java Wed Nov 16 09:54:05 2011
@@ -50,7 +50,9 @@ public final class SentenceDetectorEvalu
public void run(String[] args) {
- if (!ArgumentParser.validateArguments(args, EvaluatorParams.class)) {
+ String errorMessage = ArgumentParser.validateArgumentsLoudly(args, EvaluatorParams.class);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(getHelp());
throw new TerminateToolException(1);
}
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorTrainerTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorTrainerTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorTrainerTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorTrainerTool.java Wed Nov 16 09:54:05 2011
@@ -78,7 +78,9 @@ public final class SentenceDetectorTrain
}
public void run(String[] args) {
- if (!ArgumentParser.validateArguments(args, TrainerToolParams.class)) {
+ String errorMessage = ArgumentParser.validateArgumentsLoudly(args, TrainerToolParams.class);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(getHelp());
throw new TerminateToolException(1);
}
@@ -87,7 +89,7 @@ public final class SentenceDetectorTrain
TrainerToolParams.class);
- opennlp.tools.util.TrainingParameters mlParams =
+ opennlp.tools.util.TrainingParameters mlParams =
CmdLineUtil.loadTrainingParameters(params.getParams(), false);
if (mlParams != null) {
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerCrossValidatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerCrossValidatorTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerCrossValidatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerCrossValidatorTool.java Wed Nov 16 09:54:05 2011
@@ -54,7 +54,9 @@ public final class TokenizerCrossValidat
}
public void run(String[] args) {
- if (!ArgumentParser.validateArguments(args, CVToolParams.class)) {
+ String errorMessage = ArgumentParser.validateArgumentsLoudly(args, CVToolParams.class);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(getHelp());
throw new TerminateToolException(1);
}
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerMEEvaluatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerMEEvaluatorTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerMEEvaluatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerMEEvaluatorTool.java Wed Nov 16 09:54:05 2011
@@ -48,8 +48,9 @@ public final class TokenizerMEEvaluatorT
}
public void run(String[] args) {
- if (!ArgumentParser
- .validateArguments(args, EvaluatorParams.class)) {
+ String errorMessage = ArgumentParser.validateArgumentsLoudly(args, EvaluatorParams.class);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(getHelp());
throw new TerminateToolException(1);
}
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerTrainerTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerTrainerTool.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerTrainerTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerTrainerTool.java Wed Nov 16 09:54:05 2011
@@ -78,7 +78,9 @@ public final class TokenizerTrainerTool
}
public void run(String[] args) {
- if (!ArgumentParser.validateArguments(args, TrainerToolParams.class)) {
+ String errorMessage = ArgumentParser.validateArgumentsLoudly(args, TrainerToolParams.class);
+ if (null != errorMessage) {
+ System.err.println(errorMessage);
System.err.println(getHelp());
throw new TerminateToolException(1);
}
@@ -86,7 +88,7 @@ public final class TokenizerTrainerTool
TrainerToolParams params = ArgumentParser.parse(args,
TrainerToolParams.class);
- opennlp.tools.util.TrainingParameters mlParams =
+ opennlp.tools.util.TrainingParameters mlParams =
CmdLineUtil.loadTrainingParameters(params.getParams(), false);
if (mlParams != null) {
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/BioNLP2004NameSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/BioNLP2004NameSampleStreamFactory.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/BioNLP2004NameSampleStreamFactory.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/BioNLP2004NameSampleStreamFactory.java Wed Nov 16 09:54:05 2011
@@ -41,8 +41,8 @@ public class BioNLP2004NameSampleStreamF
return ArgumentParser.createUsage(Parameters.class);
}
- public boolean validateArguments(String[] args) {
- return ArgumentParser.validateArguments(args, Parameters.class);
+ public String validateArguments(String[] args) {
+ return ArgumentParser.validateArgumentsLoudly(args, Parameters.class);
}
public ObjectStream<NameSample> create(String[] args) {
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/Conll02NameSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/Conll02NameSampleStreamFactory.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/Conll02NameSampleStreamFactory.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/Conll02NameSampleStreamFactory.java Wed Nov 16 09:54:05 2011
@@ -48,8 +48,8 @@ public class Conll02NameSampleStreamFact
return ArgumentParser.createUsage(Parameters.class);
}
- public boolean validateArguments(String[] args) {
- return ArgumentParser.validateArguments(args, Parameters.class);
+ public String validateArguments(String[] args) {
+ return ArgumentParser.validateArgumentsLoudly(args, Parameters.class);
}
public ObjectStream<NameSample> create(String[] args) {
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/Conll03NameSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/Conll03NameSampleStreamFactory.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/Conll03NameSampleStreamFactory.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/Conll03NameSampleStreamFactory.java Wed Nov 16 09:54:05 2011
@@ -43,8 +43,8 @@ public class Conll03NameSampleStreamFact
return ArgumentParser.createUsage(Parameters.class);
}
- public boolean validateArguments(String[] args) {
- return ArgumentParser.validateArguments(args, Parameters.class);
+ public String validateArguments(String[] args) {
+ return ArgumentParser.validateArgumentsLoudly(args, Parameters.class);
}
public ObjectStream<NameSample> create(String[] args) {
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ConllXPOSSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ConllXPOSSampleStreamFactory.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ConllXPOSSampleStreamFactory.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ConllXPOSSampleStreamFactory.java Wed Nov 16 09:54:05 2011
@@ -47,8 +47,8 @@ public class ConllXPOSSampleStreamFactor
return ArgumentParser.createUsage(Parameters.class);
}
- public boolean validateArguments(String[] args) {
- return ArgumentParser.validateArguments(args, Parameters.class);
+ public String validateArguments(String[] args) {
+ return ArgumentParser.validateArgumentsLoudly(args, Parameters.class);
}
ObjectStream<POSSample> create(Parameters params) {
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ConllXSentenceSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ConllXSentenceSampleStreamFactory.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ConllXSentenceSampleStreamFactory.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ConllXSentenceSampleStreamFactory.java Wed Nov 16 09:54:05 2011
@@ -46,8 +46,8 @@ public class ConllXSentenceSampleStreamF
return ArgumentParser.createUsage(Parameters.class);
}
- public boolean validateArguments(String[] args) {
- return ArgumentParser.validateArguments(args, Parameters.class);
+ public String validateArguments(String[] args) {
+ return ArgumentParser.validateArgumentsLoudly(args, Parameters.class);
}
public ObjectStream<SentenceSample> create(String[] args) {
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ConllXTokenSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ConllXTokenSampleStreamFactory.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ConllXTokenSampleStreamFactory.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ConllXTokenSampleStreamFactory.java Wed Nov 16 09:54:05 2011
@@ -44,8 +44,8 @@ public class ConllXTokenSampleStreamFact
return ArgumentParser.createUsage(Parameters.class);
}
- public boolean validateArguments(String[] args) {
- return ArgumentParser.validateArguments(args, Parameters.class);
+ public String validateArguments(String[] args) {
+ return ArgumentParser.validateArgumentsLoudly(args, Parameters.class);
}
public ObjectStream<TokenSample> create(String[] args) {
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/LeipzigDocumentSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/LeipzigDocumentSampleStreamFactory.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/LeipzigDocumentSampleStreamFactory.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/LeipzigDocumentSampleStreamFactory.java Wed Nov 16 09:54:05 2011
@@ -45,8 +45,8 @@ public class LeipzigDocumentSampleStream
return ArgumentParser.createUsage(Parameters.class);
}
- public boolean validateArguments(String[] args) {
- return ArgumentParser.validateArguments(args, Parameters.class);
+ public String validateArguments(String[] args) {
+ return ArgumentParser.validateArgumentsLoudly(args, Parameters.class);
}
public ObjectStream<DocumentSample> create(String[] args) {
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/NameSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/NameSampleStreamFactory.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/NameSampleStreamFactory.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/NameSampleStreamFactory.java Wed Nov 16 09:54:05 2011
@@ -46,8 +46,8 @@ public class NameSampleStreamFactory imp
return ArgumentParser.createUsage(Parameters.class);
}
- public boolean validateArguments(String[] args) {
- return ArgumentParser.validateArguments(args, Parameters.class);
+ public String validateArguments(String[] args) {
+ return ArgumentParser.validateArgumentsLoudly(args, Parameters.class);
}
ObjectStream<NameSample> create(Parameters params) {
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/NameToSentenceSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/NameToSentenceSampleStreamFactory.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/NameToSentenceSampleStreamFactory.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/NameToSentenceSampleStreamFactory.java Wed Nov 16 09:54:05 2011
@@ -45,8 +45,8 @@ public class NameToSentenceSampleStreamF
return ArgumentParser.createUsage(Parameters.class);
}
- public boolean validateArguments(String[] args) {
- return ArgumentParser.validateArguments(args, Parameters.class);
+ public String validateArguments(String[] args) {
+ return ArgumentParser.validateArgumentsLoudly(args, Parameters.class);
}
public ObjectStream<SentenceSample> create(String[] args) {
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/NameToTokenSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/NameToTokenSampleStreamFactory.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/NameToTokenSampleStreamFactory.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/NameToTokenSampleStreamFactory.java Wed Nov 16 09:54:05 2011
@@ -44,8 +44,8 @@ public class NameToTokenSampleStreamFact
return ArgumentParser.createUsage(Parameters.class);
}
- public boolean validateArguments(String[] args) {
- return ArgumentParser.validateArguments(args, Parameters.class);
+ public String validateArguments(String[] args) {
+ return ArgumentParser.validateArgumentsLoudly(args, Parameters.class);
}
public ObjectStream<TokenSample> create(String[] args) {
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/POSToSentenceSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/POSToSentenceSampleStreamFactory.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/POSToSentenceSampleStreamFactory.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/POSToSentenceSampleStreamFactory.java Wed Nov 16 09:54:05 2011
@@ -45,8 +45,8 @@ public class POSToSentenceSampleStreamFa
return ArgumentParser.createUsage(Parameters.class);
}
- public boolean validateArguments(String[] args) {
- return ArgumentParser.validateArguments(args, Parameters.class);
+ public String validateArguments(String[] args) {
+ return ArgumentParser.validateArgumentsLoudly(args, Parameters.class);
}
public ObjectStream<SentenceSample> create(String[] args) {
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/POSToTokenSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/POSToTokenSampleStreamFactory.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/POSToTokenSampleStreamFactory.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/POSToTokenSampleStreamFactory.java Wed Nov 16 09:54:05 2011
@@ -44,8 +44,8 @@ public class POSToTokenSampleStreamFacto
return ArgumentParser.createUsage(Parameters.class);
}
- public boolean validateArguments(String[] args) {
- return ArgumentParser.validateArguments(args, Parameters.class);
+ public String validateArguments(String[] args) {
+ return ArgumentParser.validateArgumentsLoudly(args, Parameters.class);
}
public ObjectStream<TokenSample> create(String[] args) {
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/WordTagSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/WordTagSampleStreamFactory.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/WordTagSampleStreamFactory.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/WordTagSampleStreamFactory.java Wed Nov 16 09:54:05 2011
@@ -49,8 +49,8 @@ public class WordTagSampleStreamFactory
return ArgumentParser.createUsage(Parameters.class);
}
- public boolean validateArguments(String[] args) {
- return ArgumentParser.validateArguments(args, Parameters.class);
+ public String validateArguments(String[] args) {
+ return ArgumentParser.validateArgumentsLoudly(args, Parameters.class);
}
ObjectStream<POSSample> create(Parameters params) {
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADChunkSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADChunkSampleStreamFactory.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADChunkSampleStreamFactory.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADChunkSampleStreamFactory.java Wed Nov 16 09:54:05 2011
@@ -58,8 +58,8 @@ public class ADChunkSampleStreamFactory
return ArgumentParser.createUsage(Parameters.class);
}
- public boolean validateArguments(String[] args) {
- return ArgumentParser.validateArguments(args, Parameters.class);
+ public String validateArguments(String[] args) {
+ return ArgumentParser.validateArgumentsLoudly(args, Parameters.class);
}
public ObjectStream<ChunkSample> create(String[] args) {
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADNameSampleStreamFactory.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADNameSampleStreamFactory.java?rev=1202610&r1=1202609&r2=1202610&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADNameSampleStreamFactory.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADNameSampleStreamFactory.java Wed Nov 16 09:54:05 2011
@@ -49,8 +49,8 @@ public class ADNameSampleStreamFactory i
return ArgumentParser.createUsage(Parameters.class);
}
- public boolean validateArguments(String[] args) {
- return ArgumentParser.validateArguments(args, Parameters.class);
+ public String validateArguments(String[] args) {
+ return ArgumentParser.validateArgumentsLoudly(args, Parameters.class);
}
public ObjectStream<NameSample> create(String[] args) {