This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository eugene. See http://git.nuiton.org/eugene.git commit 3a7474376133d66636d8d8683a18fb9ea57e570e Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 15 13:41:14 2015 +0200 Usage of new exception when tag value of stereotype is not found. See #3749 --- .../eugene/java/AbstractJavaBeanTransformer.java | 35 ++++++++++------------ 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java index c5ffe48..bf282fc 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java @@ -38,6 +38,7 @@ import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelPackage; +import org.nuiton.eugene.models.tagvalue.MissingTagValueException; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -843,18 +844,15 @@ public abstract class AbstractJavaBeanTransformer extends ObjectModelTransformer if (!notInClassPath) { boolean canOverride = getJavaTemplatesTagValues().isOverrideAbstractClasses(aclass, aPackage, model); - String packageName = aclass.getPackageName(); - String fqn = packageName + "." + abstractClassName; + String fqn = aclass.getPackageName() + "." + abstractClassName; if (!canOverride) { - String message = "\n=========================================================================================="; - message += "\nCan not override abstract class " + fqn + ", already found in classpath"; + String message = "Can not override abstract class " + fqn + ", already found in classpath"; message += "\n\nTo remove this check, add a tag value *overrideAbstractClasses* on model, package or class."; - message += "\n\nmodel.tagvalue.overrideAbstractClasses=true"; - message += "\npackage." + packageName + ".tagvalue.overrideAbstractClasses=true"; - message += "\n" + packageName + "." + aclass.getName() + ".class.tagvalue.overrideAbstractClasses=true"; - message += "\n=========================================================================================="; - - throw new IllegalStateException(message); + MissingTagValueException exception = new MissingTagValueException("overrideAbstractClasses", "true", message, aPackage, aclass); + if (log.isErrorEnabled()) { + log.error(exception.toString()); + } + throw exception; } if (log.isWarnEnabled()) { log.warn("Will not generate abstract class: " + fqn); @@ -872,18 +870,17 @@ public abstract class AbstractJavaBeanTransformer extends ObjectModelTransformer if (!noMethods) { boolean canOverride = getJavaTemplatesTagValues().isAcceptBeanWithMethods(aclass, aPackage, model); - String packageName = aclass.getPackageName(); - String fqn = packageName + "." + className; + String fqn = aclass.getPackageName() + "." + className; if (!canOverride) { - String message = "\n=========================================================================================="; - message += "\nConcrete class " + fqn + " contains some methods, the current generator does not accept it."; + String message = "Concrete class " + fqn + " contains some methods, the current generator does not accept it."; message += "\n\nSuch methods are not made to be designed, you should directly write them in the concrete class."; message += "\n\nTo remove this check, add a tag value *acceptBeanWithMethods* on model, package or class:"; - message += "\n\nmodel.tagvalue.acceptBeanWithMethods=true"; - message += "\npackage." + packageName + ".tagvalue.acceptBeanWithMethods=true"; - message += "\n" + packageName + "." + aclass.getName() + ".class.tagvalue.acceptBeanWithMethods=true"; - message += "\n=========================================================================================="; - throw new IllegalStateException(message); + MissingTagValueException exception = new MissingTagValueException("acceptBeanWithMethods", "true", message, aPackage, aclass); + if (log.isErrorEnabled()) { + log.error(exception.toString()); + } + throw exception; + } if (log.isWarnEnabled()) { log.warn("Will generate class (but designed methods won't be generated): " + fqn); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.