X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Futil%2FCommandLineArguments.java;h=f75eb691d5d78a8c1f73d03888f45642a5175104;hb=e572f0142daf64409db0461f15215288137603f8;hp=91f11bde5e5ea5327f36e4e93a56d7f969f1698d;hpb=03e51d179caedf757b09e2872f9500318bd85a53;p=jalview.git diff --git a/forester/java/src/org/forester/util/CommandLineArguments.java b/forester/java/src/org/forester/util/CommandLineArguments.java index 91f11bd..f75eb69 100644 --- a/forester/java/src/org/forester/util/CommandLineArguments.java +++ b/forester/java/src/org/forester/util/CommandLineArguments.java @@ -21,7 +21,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA // // Contact: phylosoft @ gmail . com -// WWW: www.phylosoft.org/forester +// WWW: https://sites.google.com/site/cmzmasek/home/software/forester package org.forester.util; @@ -93,7 +93,7 @@ public final class CommandLineArguments { if ( o.containsKey( option_name ) ) { final String value = o.get( option_name ); if ( !ForesterUtil.isEmpty( value ) ) { - return value; + return value.replaceAll( "\\s+", " " ).trim(); } else { throw new IllegalArgumentException( "value for \"" + option_name + "\" is not set" ); @@ -106,12 +106,16 @@ public final class CommandLineArguments { /** * Removes quotes - * + * */ public String getOptionValueAsCleanString( final String option_name ) throws IllegalArgumentException { return getOptionValue( option_name ).replaceAll( "\"", "" ).replaceAll( "\'", "" ); } + public char getOptionValueAsChar( final String option_name ) throws IllegalArgumentException { + return getOptionValue( option_name ).charAt( 0 ); + } + public double getOptionValueAsDouble( final String option_name ) throws IOException { double d = -Double.MAX_VALUE; try { @@ -220,7 +224,7 @@ public final class CommandLineArguments { // } if ( getAllOptions().containsKey( key ) ) { throw new IllegalArgumentException( "attempt to set option \"" + key + "\" mutiple times [" + option - + "]" ); + + "]" ); } options_map.put( key, value ); }