This is an automated email from the git hooks/post-receive script. New commit to branch feature/3712 in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit f7cb91008ee693c89a0bd5579186db3aed344ca3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 22 21:24:14 2015 +0200 Remove attribute scope to generatePropertyChangeSupport tag value. See #3712 --- .../nuiton/topia/templates/EntityTransformer.java | 22 ++++------------------ .../org/nuiton/topia/templates/TopiaTagValues.java | 5 +++-- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java index 8928d28..836ec3d 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java @@ -105,6 +105,8 @@ public class EntityTransformer extends ObjectModelTransformerToJava { protected boolean generateBooleanGetMethods; + protected boolean generatePropertyChangeSupport; + protected TopiaTemplateHelper templateHelper; protected TopiaTagValues topiaTagValues; @@ -158,6 +160,7 @@ public class EntityTransformer extends ObjectModelTransformerToJava { } generateBooleanGetMethods = getEugeneTagValues().isGenerateBooleanGetMethods(input, aPackage, model); + generatePropertyChangeSupport = topiaTagValues.isGeneratePropertyChangeSupport(input, model); if (generateInterface) { @@ -291,7 +294,7 @@ public class EntityTransformer extends ObjectModelTransformerToJava { TopiaEntityContextable.class); } - if (topiaTagValues.isGeneratePropertyChangeSupport(input, model)) { + if (generatePropertyChangeSupport) { addInterface(interfaceAlreadyDone, outputInterface, ListenableTopiaEntity.class); @@ -837,8 +840,6 @@ public class EntityTransformer extends ObjectModelTransformerToJava { StringBuilder body = new StringBuilder(); - boolean generatePropertyChangeSupport = topiaTagValues.isGeneratePropertyChangeSupport(attribute, model); - if (generatePropertyChangeSupport) { body.append("" /*{ @@ -900,8 +901,6 @@ public class EntityTransformer extends ObjectModelTransformerToJava { StringBuilder body = new StringBuilder(); - boolean generatePropertyChangeSupport = topiaTagValues.isGeneratePropertyChangeSupport(attribute, model); - if (generatePropertyChangeSupport) { body.append("" /*{ @@ -957,8 +956,6 @@ public class EntityTransformer extends ObjectModelTransformerToJava { StringBuilder body = new StringBuilder(); - boolean generatePropertyChangeSupport = topiaTagValues.isGeneratePropertyChangeSupport(attribute, model); - if (generatePropertyChangeSupport) { body.append("" /*{ @@ -1041,8 +1038,6 @@ public class EntityTransformer extends ObjectModelTransformerToJava { StringBuilder body = new StringBuilder(); - boolean generatePropertyChangeSupport = topiaTagValues.isGeneratePropertyChangeSupport(attribute, model); - if (generatePropertyChangeSupport) { body.append("" /*{ @@ -1159,8 +1154,6 @@ public class EntityTransformer extends ObjectModelTransformerToJava { StringBuilder body = new StringBuilder(); - boolean generatePropertyChangeSupport = topiaTagValues.isGeneratePropertyChangeSupport(attribute, model); - if (generatePropertyChangeSupport) { body.append("" /*{ @@ -1213,8 +1206,6 @@ public class EntityTransformer extends ObjectModelTransformerToJava { StringBuilder body = new StringBuilder(); - boolean generatePropertyChangeSupport = topiaTagValues.isGeneratePropertyChangeSupport(attribute, model); - if (generatePropertyChangeSupport) { body.append("" /*{ @@ -1282,8 +1273,6 @@ public class EntityTransformer extends ObjectModelTransformerToJava { StringBuilder body = new StringBuilder(); - boolean generatePropertyChangeSupport = topiaTagValues.isGeneratePropertyChangeSupport(attribute, model); - if (generatePropertyChangeSupport) { body.append("" /*{ @@ -1389,9 +1378,6 @@ public class EntityTransformer extends ObjectModelTransformerToJava { ); } - - boolean generatePropertyChangeSupport = topiaTagValues.isGeneratePropertyChangeSupport(attribute, model); - if (generatePropertyChangeSupport) { body.append("" /*{ <%=collectionInterface%><<%=attrType%>> oldValue = new <%=collectionImpl%><<%=attrType%>>(this.<%=attrName%>); diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTagValues.java b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTagValues.java index ede4f42..d3a4478 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTagValues.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTagValues.java @@ -472,9 +472,10 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * Tag to specify if PropertyChangeListener support should be generated * * @see #isGeneratePropertyChangeSupport(ObjectModelAttribute, ObjectModel) + * @see #isGeneratePropertyChangeSupport(ObjectModelClass, ObjectModel) * @since 3.0 */ - @TagValueDefinition(target = {ObjectModel.class, ObjectModelPackage.class, ObjectModelClassifier.class, ObjectModelAttribute.class}, + @TagValueDefinition(target = {ObjectModel.class, ObjectModelPackage.class, ObjectModelClassifier.class}, defaultValue = "false", documentation = "To generate property change support in entities") public static final String TAG_GENERATE_PROPERTY_CHANGE_SUPPORT = "generatePropertyChangeSupport"; @@ -949,7 +950,7 @@ public class TopiaTagValues extends TagValueDefinitionProvider { ObjectModelElement clazz = attribute.getDeclaringElement(); Preconditions.checkState(clazz instanceof ObjectModelClass); ObjectModelPackage modelPackage = model.getPackage((ObjectModelClass) clazz); - boolean value = findBooleanTagValue(TAG_GENERATE_PROPERTY_CHANGE_SUPPORT, attribute, clazz, modelPackage, model); + boolean value = findBooleanTagValue(TAG_GENERATE_PROPERTY_CHANGE_SUPPORT, clazz, modelPackage, model); return value; } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.