Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityObjectJava.java diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityObjectJava.java:1.7 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityObjectJava.java:1.8 --- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityObjectJava.java:1.7 Tue Jun 29 10:23:26 2004 +++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityObjectJava.java Tue Jun 29 12:15:42 2004 @@ -47,7 +47,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // // @author Olivier.Heintz@nereide.biz -// @version $Revision: 1.7 $ +// @version $Revision: 1.8 $ // @since 3.1 // // This file has been generated, and will be re-generated, @@ -70,6 +70,24 @@ import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; +}*/ + for (Iterator iter=clazz.getAttributes().iterator(); iter.hasNext(); ){ + ObjectModelAttribute attribute = (ObjectModelAttribute) iter.next(); + if (! Util.isPrimaryKey(attribute) ){ + if (attribute.referenceClassifier() ){ + if (attribute.getMaxMultiplicity() == 1){ + Map relationKeyName = Util.getRelationOneFieldName(model, attribute); + ObjectModelClass classAssociated = (ObjectModelClass) ((Map) relationKeyName ).get("clazzAssociated"); + if (! clazz.getPackageName().equals(classAssociated.getPackageName() ) ){ + nameMap = Util.initPackageName(classAssociated); +/*{import org.ofbiz.<%=(String) nameMap.get("packageName")%>.<%=(String)nameMap.get("subpackageName")%>.generated.<%=classAssociated.getName()%>; +}*/ + } + } + } + } + } +/*{ public class <%=entityName%> { @@ -209,11 +227,10 @@ } } /*{ - //public <%=classAssociated.getName()%> get<%=classAssociated.getName()%>(){ - public GenericValue get<%=classAssociated.getName()%>(){ + public <%=classAssociated.getName()%> get<%=classAssociated.getName()%>(){ if (exist() ) try { - return <%=Util.toLowerCaseFirstLetter(entityName)%>.getRelatedOne("<%=classAssociated.getName()%>"); + return <%=classAssociated.getName()%>(<%=Util.toLowerCaseFirstLetter(entityName)%>.getRelatedOne("<%=classAssociated.getName()%>") ); } catch (GenericEntityException e) { Debug.logError("Error getRelatedOne in <%=entityName%>:" + e.getMessage(), module);