halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed bug in argument parsing

Browse Source
This commit is contained in:
Marcel Kronfeld 2011-04-11 07:45:25 +00:00
parent aeda5a83a3
commit 0e54cf526b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/eva2/tools/StringTools.java
View File

@ -170,7 +170,7 @@ public class StringTools {
} }
/** /**
* Check whether an object is a valid String array and if so return the i-th String. * Check whether an object is a valid String of String array and if so return the i-th String.
* Returns null otherwise. * Returns null otherwise.
* *
* @param key * @param key
@ -180,6 +180,13 @@ public class StringTools {
*/ */
public static String checkSingleStringArg(String key, Object object, int i) { public static String checkSingleStringArg(String key, Object object, int i) {
if (object==null) return null; if (object==null) return null;
if (object instanceof String) {
if (i==0) return (String)object;
else {
System.err.println("Invalid argument; cannot access element " + i + " for " + key + " as only one was given.");
return null;
}
}
if (object instanceof String[]) { if (object instanceof String[]) {
String[] arr = (String[])object; String[] arr = (String[])object;
if (i<arr.length) return arr[i]; if (i<arr.length) return arr[i];
@ -188,7 +195,7 @@ public class StringTools {
return null; return null;
} }
} else { } else {
System.err.println("Invalid argument: " + key + " " + BeanInspector.toString(object)); System.err.println("Invalid argument; " + key + " " + BeanInspector.toString(object));
return null; return null;
} }
} }