Configurator: allowed long arrays + fixed banwidth names to match RATE

src/de/tud/kom/p2psim/impl/scenario/DefaultConfigurator.java

@@ -599,6 +599,13 @@ public class DefaultConfigurator implements Configurator {
 			param = paramList;
 		} else if (typeClass == String[].class) {
 			param = value.split(CLASS_SEPARATOR);
+		} else if (typeClass == long[].class) {
+			String[] vals = value.split(CLASS_SEPARATOR);
+			long[] lvals = new long[vals.length];
+			for (int i = 0; i < vals.length; i++) {
+				lvals[i] = parseNumber(vals[i], Long.class);
+			}
+			param = lvals;
 		} else {
 			throw new IllegalArgumentException("Parameter type " + typeClass
 					+ " is not supported");
@@ -834,15 +841,15 @@ public class DefaultConfigurator implements Configurator {
 			}
 		}
 		// Bandwidth (internally used in bit/s)
-		else if (value.matches("\\d+(Mbps|Kbps|bps)")) {
-			if (value.matches("\\d+(bps)")) {
-				factor = Rate.bit_s;
-				number = value.substring(0, value.length() - 3);
-			} else if (value.matches("\\d+(Kbps)")) {
-				factor = Rate.kbit_s;
-				number = value.substring(0, value.length() - 4);
-			} else if (value.matches("\\d+(Mbps)")) {
+		else if (value.matches("\\d+(Mbits|kbits|bits)")) {
+			if (value.matches("\\d+(Mbits)")) {
 				factor = Rate.Mbit_s;
+				number = value.substring(0, value.length() - 5);
+			} else if (value.matches("\\d+(kbits)")) {
+				factor = Rate.kbit_s;
+				number = value.substring(0, value.length() - 5);
+			} else if (value.matches("\\d+(bits)")) {
+				factor = Rate.bit_s;
 				number = value.substring(0, value.length() - 4);
 			} else {
 				throw new IllegalStateException("Invalid bandwidth unit.");