From e5b2d4f2220b6f35e19211ee85c6b68c98f4672c Mon Sep 17 00:00:00 2001 From: "Benjamin J. Culkin" Date: Thu, 20 Sep 2018 12:16:56 -0300 Subject: Named parameters are always uppercase Named parameters are always converted to uppercase now. --- .../src/main/java/bjc/utils/ioutils/format/CLParameters.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'clformat') diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/CLParameters.java b/clformat/src/main/java/bjc/utils/ioutils/format/CLParameters.java index 4699059..3364738 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/CLParameters.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/CLParameters.java @@ -54,8 +54,8 @@ public class CLParameters { } public void mapIndex(String opt, int idx) { - if (params.length <= idx) System.err.printf("WARN: Mapping invalid index %d (max %d) to \"%s\"\n", idx, params.length, opt); - nameIndices.put(opt, idx); + if (params.length <= idx) System.err.printf("WARN: Mapping invalid index %d (max %d) to \"%s\"\n", idx, params.length, opt.toUpperCase()); + nameIndices.put(opt.toUpperCase(), idx); } public String getRaw(int idx) { @@ -151,7 +151,7 @@ public class CLParameters { String actVal = parseParam(paramVal, dirParams); - namedParams.put(paramName, actVal); + namedParams.put(paramName.toUpperCase(), actVal); if (setIndex) parameters.add(actVal); } else { @@ -205,8 +205,10 @@ public class CLParameters { } private String resolveKey(String key) { - if (nameIndices.containsKey(key)) return params[nameIndices.get(key)]; - else if (namedParams.containsKey(key)) return namedParams.get(key); + String actKey = key.toUpperCase(); + + if (nameIndices.containsKey(actKey)) return params[nameIndices.get(actKey)]; + else if (namedParams.containsKey(actKey)) return namedParams.get(actKey); return ""; } -- cgit v1.2.3