Index: maven-commandline-plugin/src/java/org/codelutin/util/Generator.java diff -u maven-commandline-plugin/src/java/org/codelutin/util/Generator.java:1.2 maven-commandline-plugin/src/java/org/codelutin/util/Generator.java:1.3 --- maven-commandline-plugin/src/java/org/codelutin/util/Generator.java:1.2 Thu Nov 29 22:27:22 2007 +++ maven-commandline-plugin/src/java/org/codelutin/util/Generator.java Thu Nov 29 23:37:47 2007 @@ -346,20 +346,20 @@ // add a boolean getter addMethod(impl, prefix, - buildMethodName(optionArgumentDefinition, true, argumentKeyCap), + buildMethodName(true, argumentKeyCap), "return Boolean.valueOf(\"" + argumentKey + "\".equals(getConstantArgumentValue(" + position + ")));"); break; case namedAndValued: // add a typed getter T getArgument addMethod(impl, prefix, - buildMethodName(optionArgumentDefinition,isBooleanValueType, argumentKeyCap), + buildMethodName(isBooleanValueType, argumentKeyCap), "return (" + typeAsStr + ") getNamedAndValuedArgumentValue(" + positionTypeKeyParameters+ ");"); if (multi) { // add a typed getter T[] getArguments addMethod(impl, prefix+"[]", - buildMethodName(optionArgumentDefinition, false, argumentKeyCap + "s"), + buildMethodName(false, argumentKeyCap + "s"), "return (" + typeAsStr + "[]) getNamedAndValuedArgumentValues(" + positionTypeKeyParameters+ ");"); } break; @@ -367,13 +367,13 @@ // add a typed getter T getArgument addMethod(impl, prefix, - buildMethodName(optionArgumentDefinition, isBooleanValueType, argumentKeyCap), + buildMethodName(isBooleanValueType, argumentKeyCap), "return (" + typeAsStr + ") getValuedArgumentValue(" + positionTypeParameters + ");"); if (multi) { // add a typed getter T[] getArguments addMethod(impl, prefix+"[]", - buildMethodName(optionArgumentDefinition, false, argumentKeyCap+"s"), + buildMethodName(false, argumentKeyCap+"s"), "return (" + typeAsStr + "[]) getValuedArgumentValues(" + positionTypeParameters + ");"); } break; @@ -390,18 +390,15 @@ } } - private String buildMethodName(OptionArgumentDefinition definition, boolean booleanValueType, String methodName) { + private String buildMethodName(boolean booleanValueType, String methodName) { methodName = (booleanValueType?"is":"get")+methodName; - if (definition.isMandatory()) { - methodName = methodName+ definition.getPos(); - } return methodName; } private void addMethod(CtClass impl, String prefix, String methodName, String body) throws CannotCompileException { CtMethod method; String b = prefix + " " + methodName + "() {" + body + "}"; - log.info(b); + log.debug(b); method = CtMethod.make(b, impl); impl.addMethod(method); }