Author: athimel Date: 2014-02-07 15:28:01 +0100 (Fri, 07 Feb 2014) New Revision: 3006 Url: http://nuiton.org/projects/topia/repository/revisions/3006 Log: fixes #3070 Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java 2014-02-04 16:38:15 UTC (rev 3005) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java 2014-02-07 14:28:01 UTC (rev 3006) @@ -1197,11 +1197,7 @@ ); } } else if (attr.hasAssociationClass()) { - String assocAttrName = TopiaGeneratorUtil.getAssocAttrName( - attr); - String assocClassFQN = TopiaGeneratorUtil.getSimpleName( - attr.getAssociationClass().getQualifiedName()); - String assocConcreteDaoClassName = assocClassFQN + "TopiaDao"; + String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); String ref = "e." + getJavaBeanMethodName("get", assocAttrName); if (!TopiaGeneratorUtil.isNMultiplicity(attr)) { body.append("" @@ -1225,12 +1221,19 @@ // tmp.addAll(<%=ref%>); // } + String assocClassFQN = attr.getAssociationClass().getQualifiedName(); + String assocClassName = TopiaGeneratorUtil.getSimpleName(assocClassFQN); + String assocConcreteDaoClassFQN = TopiaGeneratorUtil.getConcreteDaoFqn(attr.getAssociationClass()); + String assocConcreteDaoClassName = TopiaGeneratorUtil.getSimpleName(assocConcreteDaoClassFQN); + addImport(outputAbstract, assocClassFQN); + addImport(outputAbstract, assocConcreteDaoClassFQN); + body.append("" /*{ { <%=assocConcreteDaoClassName%> dao = topiaDaoSupplier - .getDao(<%=assocClassFQN%>.class, <%=assocConcreteDaoClassName%>.class); - List<<%=assocClassFQN%>> findAllByProperties = dao.forProperties("<%=reverseAttrName%>", entity).findAll(); + .getDao(<%=assocClassName%>.class, <%=assocConcreteDaoClassName%>.class); + List<<%=assocClassName%>> findAllByProperties = dao.forProperties("<%=reverseAttrName%>", entity).findAll(); if (findAllByProperties != null) { tmp.addAll(findAllByProperties); }