Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityServicesJava.java diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityServicesJava.java:1.6 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityServicesJava.java:1.7 --- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityServicesJava.java:1.6 Tue Jun 29 10:23:26 2004 +++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityServicesJava.java Mon Jul 5 17:05:29 2004 @@ -87,6 +87,11 @@ String packageName = (String) nameMap.get("packageName"); String subpackageName = (String)nameMap.get("subpackageName"); String entityName = clazz.getName(); + ObjectModelAttribute AttrComposite = Util.isComposition(model, clazz); + ObjectModelClass classComposite = null; + if (AttrComposite != null){ + classComposite = (ObjectModelClass) AttrComposite.getDeclaringElement(); + } /*{// // Copyright (c) 2004 Olivier Heintz - olivier.heintz@nereide.biz @@ -108,7 +113,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // // @author Olivier.Heintz@nereide.biz -// @version $Revision: 1.6 $ +// @version $Revision: 1.7 $ // @since 3.1 // // This file has been generated, and will be re-generated, @@ -144,6 +149,15 @@ import org.ofbiz.service.ModelService; import org.ofbiz.service.ServiceUtil; +}*/ + if (AttrComposite != null){ + nameMap = Util.initPackageName(classComposite); + String classCompositeName = classComposite.getName(); +/*{import org.ofbiz.<%=(String) nameMap.get("packageName")%>.<%=(String)nameMap.get("subpackageName")%>.developed.<%=classCompositeName%>; +}*/ + } +/*{import org.ofbiz.<%=(String) nameMap.get("packageName")%>.<%=(String)nameMap.get("subpackageName")%>.developed.<%=entityName%>; + public class <%=entityName%>Services { @@ -169,7 +183,6 @@ if (actionForm.startsWith("commit") ){ actionForm = actionForm.substring(6); }*/ - ObjectModelAttribute AttrComposite = Util.isComposition(model, clazz); String ident = " "; // code generation for retreiving objetc generateRetreiveObject(output, clazz, AttrComposite, ident);