You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by co...@apache.org on 2011/07/12 18:41:50 UTC

svn commit: r1145668 - in /incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline: ArgumentParser.java EncodingParameter.java

Author: colen
Date: Tue Jul 12 16:41:50 2011
New Revision: 1145668

URL: http://svn.apache.org/viewvc?rev=1145668&view=rev
Log:
OPENNLP-221 Added the constant DEFAULT_CHARSET to OptionalParameter.

Modified:
    incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/ArgumentParser.java
    incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/EncodingParameter.java

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=1145668&r1=1145667&r2=1145668&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 Tue Jul 12 16:41:50 2011
@@ -46,6 +46,7 @@ public class ArgumentParser {
 
   public @Retention(RetentionPolicy.RUNTIME)
   @interface OptionalParameter {
+    public static final String DEFAULT_CHARSET = "DEFAULT_CHARSET";
     public String defaultValue() default "";
   }
   
@@ -106,7 +107,9 @@ public class ArgumentParser {
     public Object parseArgument(Method method, String argName, String charsetName) {
       
       try {
-        if (Charset.isSupported(charsetName)) {
+        if(OptionalParameter.DEFAULT_CHARSET.equals(charsetName)) {
+          return Charset.defaultCharset();
+        } else if (Charset.isSupported(charsetName)) {
           return Charset.forName(charsetName);
         } else {
           throw new TerminateToolException(-1,  String.format(INVALID_ARG, argName, charsetName) + 

Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/EncodingParameter.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/EncodingParameter.java?rev=1145668&r1=1145667&r2=1145668&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/EncodingParameter.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/EncodingParameter.java Tue Jul 12 16:41:50 2011
@@ -32,7 +32,7 @@ public interface EncodingParameter {
   @ParameterDescription(valueName = "charsetName", description = "specifies the "
       + "encoding which should be used for reading and writing text. If not specified "
       + "the system default will be used.")
-  @OptionalParameter(defaultValue = "DEFAULT_CHARSET")
+  @OptionalParameter(defaultValue = OptionalParameter.DEFAULT_CHARSET)
   Charset getEncoding();
 
 }