branch develop updated (9b087fd -> 15640b3)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git from 9b087fd fixes #3950 Merge branch 'feature/3950' into develop new f7cb910 Remove attribute scope to generatePropertyChangeSupport tag value. new 23f0d43 Suppression méthodes qu'on utilise plus new 15640b3 Fixes #3712 (ToPIA claims that using tagValue generatePropertyChangeSupport on an attribute or a single class works but it doesn't) Merge branch 'feature/3712' into develop The 3 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 15640b3f5fa2f819618143e42b84b39e63347558 Merge: 9b087fd 23f0d43 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 1 17:25:12 2016 +0200 Fixes #3712 (ToPIA claims that using tagValue generatePropertyChangeSupport on an attribute or a single class works but it doesn't) Merge branch 'feature/3712' into develop commit 23f0d43fbbcd2d15a08b3f4d0d000c3198970dc4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 1 17:24:51 2016 +0200 Suppression méthodes qu'on utilise plus 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 Summary of changes: .../nuiton/topia/templates/EntityTransformer.java | 22 ++++------------------ .../org/nuiton/topia/templates/TopiaTagValues.java | 13 ++----------- 2 files changed, 6 insertions(+), 29 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 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>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit 23f0d43fbbcd2d15a08b3f4d0d000c3198970dc4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 1 17:24:51 2016 +0200 Suppression méthodes qu'on utilise plus --- .../main/java/org/nuiton/topia/templates/TopiaTagValues.java | 10 ---------- 1 file changed, 10 deletions(-) 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 d3a4478..075b13f 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 @@ -24,7 +24,6 @@ package org.nuiton.topia.templates; * #L% */ -import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; @@ -471,7 +470,6 @@ 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 */ @@ -946,14 +944,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { return value; } - public boolean isGeneratePropertyChangeSupport(ObjectModelAttribute attribute, ObjectModel model) { - ObjectModelElement clazz = attribute.getDeclaringElement(); - Preconditions.checkState(clazz instanceof ObjectModelClass); - ObjectModelPackage modelPackage = model.getPackage((ObjectModelClass) clazz); - boolean value = findBooleanTagValue(TAG_GENERATE_PROPERTY_CHANGE_SUPPORT, clazz, modelPackage, model); - return value; - } - public boolean isGeneratePropertyChangeSupport(ObjectModelClass clazz, ObjectModel model) { ObjectModelPackage modelPackage = model.getPackage(clazz); boolean value = findBooleanTagValue(TAG_GENERATE_PROPERTY_CHANGE_SUPPORT, clazz, modelPackage, model); -- 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 topia. See https://gitlab.nuiton.org/nuiton/topia.git commit 15640b3f5fa2f819618143e42b84b39e63347558 Merge: 9b087fd 23f0d43 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 1 17:25:12 2016 +0200 Fixes #3712 (ToPIA claims that using tagValue generatePropertyChangeSupport on an attribute or a single class works but it doesn't) Merge branch 'feature/3712' into develop .../nuiton/topia/templates/EntityTransformer.java | 22 ++++------------------ .../org/nuiton/topia/templates/TopiaTagValues.java | 13 ++----------- 2 files changed, 6 insertions(+), 29 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm