branch develop updated (516171f -> bbcd104)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-config. See https://gitlab.nuiton.org/nuiton/nuiton-config.git from 516171f Be able to configure where configuration can get options (Fixes #3491) Merge branch 'feature/3491' into develop new bbcd104 Fix scanPath without package + set name method on generated provider The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit bbcd1047aae9ff0e8d22c5b415c55c6e2c862a94 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 30 19:54:41 2016 +0200 Fix scanPath without package + set name method on generated provider Summary of changes: .../templates/ApplicationConfigTransformer.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-config. See https://gitlab.nuiton.org/nuiton/nuiton-config.git commit bbcd1047aae9ff0e8d22c5b415c55c6e2c862a94 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 30 19:54:41 2016 +0200 Fix scanPath without package + set name method on generated provider --- .../templates/ApplicationConfigTransformer.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/templates/ApplicationConfigTransformer.java b/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/templates/ApplicationConfigTransformer.java index 76964dd..7df3939 100644 --- a/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/templates/ApplicationConfigTransformer.java +++ b/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/templates/ApplicationConfigTransformer.java @@ -88,10 +88,10 @@ public class ApplicationConfigTransformer extends ObjectModelTransformerToJava { if (generateProvider != null && Boolean.TRUE.equals(Boolean.valueOf(generateProvider))) { String abstractProviderClassName = "Generated" + className + "Provider"; - generateAbstractProvider(packageName, abstractProviderClassName, optionClassName, actionClassName); + generateAbstractProvider(packageName, abstractProviderClassName, className, optionClassName, actionClassName); String providerClassName = className + "Provider"; - if (canGenerate(providerClassName)) { + if (canGenerate(packageName + "." + providerClassName)) { generateProvider(packageName, abstractProviderClassName, providerClassName, className); @@ -99,7 +99,7 @@ public class ApplicationConfigTransformer extends ObjectModelTransformerToJava { } } - private void generateAbstractProvider(String packageName, String providerClassName, String optionClassName, String actionClassName) { + private void generateAbstractProvider(String packageName, String providerClassName, String className, String optionClassName, String actionClassName) { ObjectModelClass output = createAbstractClass(providerClassName, packageName); addInterface(output, ApplicationConfigProvider.class); @@ -108,6 +108,15 @@ public class ApplicationConfigTransformer extends ObjectModelTransformerToJava { log.info("Generate " + output.getQualifiedName()); } + ObjectModelOperation getName = addOperation( + output, "getName", String.class, ObjectModelJavaModifier.PUBLIC); + addAnnotation(output, getName, Override.class); + setOperationBody(getName, "" + /*{ + return "<%=className%>"; + }*/ + ); + String optionClassSimpleName = GeneratorUtil.getSimpleName(optionClassName); ObjectModelOperation getOptions = addOperation( @@ -156,15 +165,6 @@ public class ApplicationConfigTransformer extends ObjectModelTransformerToJava { log.info("Generate " + output.getQualifiedName()); } - ObjectModelOperation getName = addOperation( - output, "getName", String.class, ObjectModelJavaModifier.PUBLIC); - addAnnotation(output, getName, Override.class); - setOperationBody(getName, "" - /*{ - return "<%=className%>"; - }*/ - ); - ObjectModelOperation getDescription = addOperation( output, "getDescription", String.class, ObjectModelJavaModifier.PUBLIC); addParameter(getDescription, Locale.class, "locale"); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm