From 0e54cf526b4c4f6a52732aae751d4dc32d2704a6 Mon Sep 17 00:00:00 2001
From: Marcel Kronfeld <makron@gmx.net>
Date: Mon, 11 Apr 2011 07:45:25 +0000
Subject: [PATCH] Fixed bug in argument parsing

---
 src/eva2/tools/StringTools.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/eva2/tools/StringTools.java b/src/eva2/tools/StringTools.java
index 209c8693..5c331112 100644
--- a/src/eva2/tools/StringTools.java
+++ b/src/eva2/tools/StringTools.java
@@ -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. 
 	 * 
 	 * @param key
@@ -180,6 +180,13 @@ public class StringTools {
 	 */
 	public static String checkSingleStringArg(String key, Object object, int i) {
 		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[]) {
 			String[] arr = (String[])object;
 			if (i<arr.length) return arr[i];
@@ -188,7 +195,7 @@ public class StringTools {
 				return null;
 			}
 		} else {
-			System.err.println("Invalid argument: " + key + " " + BeanInspector.toString(object));
+			System.err.println("Invalid argument; " + key + " " + BeanInspector.toString(object));
 			return null;
 		}
 	}