Author: fdesbois Date: 2009-11-03 18:17:20 +0100 (Tue, 03 Nov 2009) New Revision: 691 Modified: branches/eugene-2.0/eugene-test/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java Log: Improve type generation Modified: branches/eugene-2.0/eugene-test/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java =================================================================== --- branches/eugene-2.0/eugene-test/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java 2009-11-03 17:07:29 UTC (rev 690) +++ branches/eugene-2.0/eugene-test/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java 2009-11-03 17:17:20 UTC (rev 691) @@ -5,8 +5,6 @@ import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.*; -import java.beans.PropertyChangeListener; -import java.io.Serializable; import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -70,6 +68,7 @@ if (attr.isNavigable()/* || attr.hasAssociationClass()*/) { String attrType = attr.getType(); + String simpleType = GeneratorUtil.getSimpleName(attrType); String attrName = attr.getName(); String attrNameCapitalized = StringUtils.capitalize(attrName); @@ -83,7 +82,7 @@ addParameter(getChild, "int", "index"); setOperationBody(getChild, "" /*{ - <%=attrType%> o = getChild(<%=attrName%>, index); + <%=simpleType%> o = getChild(<%=attrName%>, index); return o; }*/ ); @@ -102,7 +101,7 @@ addParameter(getChildEntity, String.class.getName(), "topiaId"); setOperationBody(getChildEntity, "" /*{ - <%=attrType%> o = getEntity(<%=attrName%>, topiaId); + <%=simpleType%> o = getEntity(<%=attrName%>, topiaId); return o; }*/ ); @@ -142,6 +141,7 @@ } else { attrType = Collection.class.getName() + "<" + attrType + ">"; } + simpleType = GeneratorUtil.getSimpleName(attrType); } if (attr.hasAssociationClass()) { @@ -169,7 +169,7 @@ addParameter(setter, attrType, "newValue"); setOperationBody(setter, "" /*{ - <%=attrType%> oldValue = get<%=attrNameCapitalized%>(); + <%=simpleType%> oldValue = get<%=attrNameCapitalized%>(); this.<%=attrName%> = newValue; firePropertyChange("<%=attrName%>", oldValue, newValue); }*/ @@ -241,7 +241,7 @@ // Add Serializable implements for DTO generation if (inputClass.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_DTO)) { - addInterface(resultClass, Serializable.class.getName()); + addInterface(resultClass, "java.io.Serializable"); } String svUID = TopiaGeneratorUtil.findTagValue("dto-serialVersionUID", inputClass, getModel()); @@ -264,7 +264,7 @@ ); // Add PropertyListener - String propType = PropertyChangeListener.class.getName(); + String propType = "java.beans.PropertyChangeListener"; String strType = String.class.getName(); String objectType = Object.class.getName();