Author: tchemit Date: 2009-02-19 00:26:57 +0000 (Thu, 19 Feb 2009) New Revision: 1383 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java Log: suppression de le generalisation redondante Serializable ajout des annotations Override sur les implantation du contrat de l'entite Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java 2009-02-18 23:33:29 UTC (rev 1382) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java 2009-02-19 00:26:57 UTC (rev 1383) @@ -153,7 +153,7 @@ extendClass += TopiaEntityAbstract.class.getSimpleName(); } -/*{public abstract class <%=clazzName%>Abstract extends <%=extendClass%> implements Serializable, <%=clazzName%> { +/*{public abstract class <%=clazzName%>Abstract extends <%=extendClass%> implements <%=clazzName%> { }*/ @@ -250,10 +250,12 @@ public <%=clazzName%>Abstract() { } + @Override public void update() throws TopiaException { ((TopiaContextImplementor)getTopiaContext()).getDAO(<%=clazzName%>.class).update(this); } + @Override public void delete() throws TopiaException { ((TopiaContextImplementor)getTopiaContext()).getDAO(<%=clazzName%>.class).delete(this); } @@ -266,6 +268,7 @@ * * @throws TopiaException if any pb while visit *) + @Override public void accept(EntityVisitor visitor) throws TopiaException { visitor.start(this); }*/ @@ -330,6 +333,7 @@ visitor.end(this); } + @Override public List<TopiaEntity> getAggregate() throws TopiaException { List<TopiaEntity> tmp = new ArrayList<TopiaEntity>(); @@ -362,6 +366,7 @@ return result; } + @Override public List<TopiaEntity> getComposite() throws TopiaException { List<TopiaEntity> tmp = new ArrayList<TopiaEntity>(); @@ -441,6 +446,7 @@ /*{ /* (non-Javadoc) * @see <%=clazzFQN%>#set<%=GeneratorUtil.capitalize(attrName)%>(<%=attrType%>) *) + @Override public void set<%=GeneratorUtil.capitalize(attrName)%>(<%=attrType%> value) { <%=attrType%> _oldValue = this.<%=attrName%>; fireOnPreWrite("<%=attrName%>", _oldValue, value); @@ -451,6 +457,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(attrName)%>() *) + @Override public <%=attrType%> get<%=GeneratorUtil.capitalize(attrName)%>() { fireOnPreRead("<%=attrName%>", <%=attrName%>); <%=attrType%> result = this.<%=attrName%>; @@ -465,6 +472,7 @@ /*{ /* (non-Javadoc) * @see <%=clazzFQN%>#set<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=assocClassFQN%>) *) + @Override public void set<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=assocClassFQN%> association) { <%=assocClassFQN%> _oldValue = this.<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>; fireOnPreWrite("<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>", _oldValue, association); @@ -475,6 +483,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(assocAttrName)%>() *) + @Override public <%=assocClassFQN%> get<%=GeneratorUtil.capitalize(assocAttrName)%>() { return <%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>; } @@ -488,6 +497,7 @@ /*{ /* (non-Javadoc) * @see <%=clazzFQN%>#add<%=GeneratorUtil.capitalize(attrName)%>(<%=attrType%>) *) + @Override public void add<%=GeneratorUtil.capitalize(attrName)%>(<%=attrType%> <%=attrName%>) { fireOnPreWrite("<%=attrName%>", null, <%=attrName%>); if (this.<%=attrName%> == null) { @@ -516,6 +526,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#addAll<%=GeneratorUtil.capitalize(attrName)%>(<%=collectionInterface%><<%=attrType%>>) *) + @Override public void addAll<%=GeneratorUtil.capitalize(attrName)%>(<%=collectionInterface%><<%=attrType%>> values) { if (values == null) { return; @@ -528,6 +539,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(attrName)%>ByTopiaId(String) *) + @Override public <%=attrType%> get<%=GeneratorUtil.capitalize(attrName)%>ByTopiaId(String topiaId) { return org.codelutin.topia.persistence.util.TopiaEntityHelper.getEntityByTopiaId(<%=attrName%>, topiaId); } @@ -535,6 +547,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#set<%=GeneratorUtil.capitalize(attrName)%>(<%=collectionInterface%><<%=attrType%>>) *) + @Override public void set<%=GeneratorUtil.capitalize(attrName)%>(<%=collectionInterface%><<%=attrType%>> values) { <%=collectionInterface%><<%=attrType%>> _oldValue = <%=attrName%>; fireOnPreWrite("<%=attrName%>", _oldValue, values); @@ -545,6 +558,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#remove<%=GeneratorUtil.capitalize(attrName)%>(<%=attrType%>) *) + @Override public void remove<%=GeneratorUtil.capitalize(attrName)%>(<%=attrType%> value) { fireOnPreWrite("<%=attrName%>", value, null); if ((this.<%=attrName%> == null) || (!this.<%=attrName%>.remove(value))) { @@ -568,6 +582,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#clear<%=GeneratorUtil.capitalize(attrName)%>() *) + @Override public void clear<%=GeneratorUtil.capitalize(attrName)%>() { if (this.<%=attrName%> == null) { return; @@ -601,6 +616,7 @@ /*{ /* (non-Javadoc) * @see <%=clazzFQN%>#add<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=assocClassFQN%>) *) + @Override public void add<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=assocClassFQN%> value) { fireOnPreWrite("<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>", null, value); if (this.<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%> == null) { @@ -620,6 +636,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(attrName)%>ByTopiaId(String) *) + @Override public <%=assocClassFQN%> get<%=GeneratorUtil.capitalize(assocAttrName)%>ByTopiaId(String topiaId) { return org.codelutin.topia.persistence.util.TopiaEntityHelper.getEntityByTopiaId(<%=assocAttrName%>, topiaId); } @@ -627,6 +644,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#addAll<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=collectionInterface%><<%=assocClassFQN%>>() *) + @Override public void addAll<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=collectionInterface%><<%=assocClassFQN%>> values) { if (values == null) { return; @@ -639,6 +657,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#set<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=collectionInterface%><<%=assocClassFQN%>>() *) + @Override public void set<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=collectionInterface%><<%=assocClassFQN%>> values) { // clear<%=GeneratorUtil.capitalize(assocAttrName)%>(); // addAll<%=GeneratorUtil.capitalize(assocAttrName)%>(values); @@ -652,6 +671,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#remove<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=assocClassFQN%>) *) + @Override public void remove<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=assocClassFQN%> value) { fireOnPreWrite("<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>", value, null); if ((this.<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%> == null) || (!this.<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>.remove(value))) { @@ -670,6 +690,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#clear<%=GeneratorUtil.capitalize(assocAttrName)%>() *) + @Override public void clear<%=GeneratorUtil.capitalize(assocAttrName)%>() { if (this.<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%> == null) { return; @@ -695,6 +716,7 @@ /*{ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(attrName)%>() *) + @Override public <%=collectionInterface%><<%=attrType%>> get<%=GeneratorUtil.capitalize(attrName)%>() { return <%=attrName%>; } @@ -702,6 +724,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#size<%=GeneratorUtil.capitalize(attrName)%>() *) + @Override public int size<%=GeneratorUtil.capitalize(attrName)%>() { if (<%=attrName%> == null) { return 0; @@ -716,6 +739,7 @@ /*{ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(assocAttrName)%>() *) + @Override public <%=collectionInterface%><<%=assocClassFQN%>> get<%=GeneratorUtil.capitalize(assocAttrName)%>() { return <%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>; } @@ -723,6 +747,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=attrType%>) *) + @Override public <%=assocClassFQN%> get<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=attrType%> value) { if (value == null || <%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%> == null) { return null; @@ -738,6 +763,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#size<%=GeneratorUtil.capitalize(assocAttrName)%>() *) + @Override public int size<%=GeneratorUtil.capitalize(assocAttrName)%>() { if (<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%> == null) { return 0; @@ -772,6 +798,7 @@ /*{ /* (non-Javadoc) * @see java.lang.Object#toString() *) + @Override public String toString() { String result = new ToStringBuilder(this). }*/ @@ -807,6 +834,7 @@ /*{ /** * @param value La valeur de l'attribut <%=name%> à positionner. *) + @Override public void set<%=GeneratorUtil.capitalize(name)%>(<%=type%> value) { <%=type%> _oldValue = this.<%=GeneratorUtil.toLowerCaseFirstLetter(name)%>; fireOnPreWrite("<%=name%>", _oldValue, value); @@ -817,6 +845,7 @@ /** * @return La valeur de l'attribut <%=name%>. *) + @Override public <%=type%> get<%=GeneratorUtil.capitalize(name)%>() { return <%=GeneratorUtil.toLowerCaseFirstLetter(name)%>; }