Adding ability to parse Enums for parameters.

sbliven · sbliven · commit e3baa75480e5 · 2014-12-01T13:37:39.000+01:00
diff --git a/biojava3-structure/src/main/java/org/biojava/bio/structure/align/util/CliTools.java b/biojava3-structure/src/main/java/org/biojava/bio/structure/align/util/CliTools.java
@@ -41,7 +41,7 @@ private CliTools() {
 	 *
 	 * <p>
 	 * Currently supported property types are <code>int, double,
-	 * boolean, String, File, Reader, Writer, InputStream, OutputStream</code>,
+	 * boolean, String, File, Reader, Writer, InputStream, OutputStream, Enum</code>,
 	 * plus arrays of all the above types.  In the case of arrays, the option
 	 * may appear multiple times on the command line, otherwise recurrance of
 	 * the same option is an error.
@@ -218,6 +218,29 @@ public static String[] configureBean(Object bean, String[] args)
 								throw new ConfigurationException("Can't open " + name + " for output");
 							}
 						}
+					} else if( propType.isEnum()) {
+						String name = args[++i];
+						try {
+							propVal = Enum.valueOf(propType, name);
+						} catch (Exception ex) {
+							try {
+								// Try with uppercase version, as common for enums
+								propVal = Enum.valueOf(propType, name.toUpperCase());
+							}  catch (Exception ex2) {
+								//give up
+								StringBuilder errMsg = new StringBuilder();
+								errMsg.append("Option ").append(arg);
+								errMsg.append(" requires a ").append(propType.getSimpleName());
+								errMsg.append(" parameter. One of: ");
+								for(Object val: propType.getEnumConstants() ) {
+									Enum enumVal = (Enum) val;
+									errMsg.append(enumVal.name());
+									errMsg.append(" ");
+								}
+								throw new ConfigurationException(errMsg.toString());
+							}
+						}
+
 					} else {
 						System.err.println("Unsupported optionType for " + arg + " propType:" + propType);
 						System.exit(1);
