[hibernate-commits] Hibernate SVN: r10481 - in trunk/HibernateExt/tools/src: java/org/hibernate/tool/hbm2x templates/dao
Author: max.andersen(a)jboss.com
Date: 2006-09-13 07:57:54 -0400 (Wed, 13 Sep 2006)
New Revision: 10481
Modified:
trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Cfg2JavaTool.java
trunk/HibernateExt/tools/src/templates/dao/daohome.ftl
Log:
HBX-748 Cfg2JavaTool can't shorten type and package names
Modified: trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Cfg2JavaTool.java
===================================================================
---
trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Cfg2JavaTool.java 2006-09-13
11:45:12 UTC (rev 10480)
+++
trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Cfg2JavaTool.java 2006-09-13
11:57:54 UTC (rev 10481)
@@ -394,7 +394,7 @@
return asArgumentList( fields.iterator() );
}
- public String asFinderArgumentList(Map parameterTypes, PersistentClass clazz) {
+ public String asFinderArgumentList(Map parameterTypes, ImportContext ctx) {
StringBuffer buf = new StringBuffer();
Iterator iter = parameterTypes.entrySet().iterator();
while ( iter.hasNext() ) {
@@ -420,7 +420,7 @@
}
typename = typeClass.getName();
}
- buf.append( typename )
+ buf.append( ctx.importType( typename ))
.append( " " )
.append( entry.getKey() );
if ( iter.hasNext() ) buf.append( ", " );
Modified: trunk/HibernateExt/tools/src/templates/dao/daohome.ftl
===================================================================
--- trunk/HibernateExt/tools/src/templates/dao/daohome.ftl 2006-09-13 11:45:12 UTC (rev
10480)
+++ trunk/HibernateExt/tools/src/templates/dao/daohome.ftl 2006-09-13 11:57:54 UTC (rev
10481)
@@ -226,7 +226,7 @@
<#foreach queryName in cfg.namedQueries.keySet()>
<#if queryName.startsWith(clazz.entityName + ".")>
<#assign methname = c2j.unqualify(queryName)>
-<#assign params = cfg.namedQueries.get(queryName).parameterTypes><#assign
argList = c2j.asFinderArgumentList(params, clazz)>
+<#assign params = cfg.namedQueries.get(queryName).parameterTypes><#assign
argList = c2j.asFinderArgumentList(params, pojo)>
<#if jdk5 && methname.startsWith("find")>
public ${pojo.importType("java.util.List")}<${declarationName}>
${methname}(${argList}) {
<#elseif methname.startsWith("count")>