From: <max...@us...> - 2006-02-07 16:18:16
|
Update of /cvsroot/hibernate/HibernateExt/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14545/src/org/hibernate/eclipse/mapper/extractor Modified Files: FieldPropertyHandler.java HBMInfoExtractor.java Log Message: HBX-374 Pass generated Java files to Eclipse code formatter + removal of too many non-used imports Index: FieldPropertyHandler.java =================================================================== RCS file: /cvsroot/hibernate/HibernateExt/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/FieldPropertyHandler.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- FieldPropertyHandler.java 26 Oct 2005 16:09:47 -0000 1.5 +++ FieldPropertyHandler.java 7 Feb 2006 16:17:59 -0000 1.6 @@ -8,12 +8,10 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.core.Signature; import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.hibernate.eclipse.hqleditor.CompletionHelper; import org.hibernate.eclipse.hqleditor.HibernateResultCollector; -import org.hibernate.util.StringHelper; import org.w3c.dom.Attr; import org.w3c.dom.Node; Index: HBMInfoExtractor.java =================================================================== RCS file: /cvsroot/hibernate/HibernateExt/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- HBMInfoExtractor.java 2 Dec 2005 22:23:58 -0000 1.14 +++ HBMInfoExtractor.java 7 Feb 2006 16:17:59 -0000 1.15 @@ -454,7 +454,10 @@ if(att!=null && attributeName.equals(att.getNodeName() ) ) { String typename = att.getNodeValue(); if(typename!=null && typename.indexOf('.')<0) { - typename = getPackageName(node) + "." + typename; + String packageName = getPackageName(node); + if(packageName!=null) { + typename = packageName + "." + typename; + } } return typename; } |