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

Added enum handling to CLI mode.

Browse Source
This commit is contained in:
Fabian Becker
2014-11-02 16:10:44 +01:00
parent 83ee77f5af
commit 6bb4616763
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/eva2/cli/OptimizationBuilder.java
View File

@@ -69,7 +69,7 @@ public final class OptimizationBuilder {
} }
} }
} }
System.out.println(argumentMap.toString());
ArgumentTree argumentTree = new ArgumentTree(); ArgumentTree argumentTree = new ArgumentTree();
for (String key : argumentMap.keySet()) { for (String key : argumentMap.keySet()) {
insertIntoArgumentTree(argumentTree, key, argumentMap.get(key)); insertIntoArgumentTree(argumentTree, key, argumentMap.get(key));
@@ -137,7 +137,7 @@ public final class OptimizationBuilder {
Method setter = pd.getWriteMethod(); Method setter = pd.getWriteMethod();
Class<?> type = pd.getPropertyType(); Class<?> type = pd.getPropertyType();
// We skip non-existing setters or setters that are hidden by annotation // We skip non-existing setters or setters that are hidden by annotation
if (setter == null || setter.isAnnotationPresent(Hidden.class)) { if (getter == null || setter == null || setter.isAnnotationPresent(Hidden.class)) {
continue; continue;
} }
System.out.println(name + " = " + " type = " + type); System.out.println(name + " = " + " type = " + type);
@@ -156,9 +156,15 @@ public final class OptimizationBuilder {
*/ */
if (tree.containsKey(name)) { if (tree.containsKey(name)) {
foundParameters++; foundParameters++;
Object obj; Object obj = null;
if (type.isPrimitive() && ((ArgumentTree)tree.get(name)).getValue() != null) { if (type.isPrimitive() && ((ArgumentTree)tree.get(name)).getValue() != null) {
obj = BeanInspector.stringToPrimitive((String)((ArgumentTree) tree.get(name)).getValue(), type); obj = BeanInspector.stringToPrimitive((String) ((ArgumentTree) tree.get(name)).getValue(), type);
} else if (type.isArray() && ((ArgumentTree)tree.get(name)).getValue() != null) {
} else if (type.isEnum() && ((ArgumentTree)tree.get(name)).getValue() != null) {
int enumIndex = Integer.parseInt((String)((ArgumentTree)tree.get(name)).getValue());
// ToDo: Properly check
obj = type.getEnumConstants()[enumIndex];
} else { } else {
// The subtree has the name of the class // The subtree has the name of the class
String className = (String)((ArgumentTree)tree.get(name)).getValue(); String className = (String)((ArgumentTree)tree.get(name)).getValue();