Update of 
/cvsroot/xdoclet/xdoclet/modules/hibernate/src/xdoclet/modules/hibernate
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11678/modules/hibernate/src/xdoclet/modules/hibernate

Modified Files:
        HibernateTagsHandler.java 
Log Message:
XDT-910: Allow an interface as composite-id, take actual type from tag 
attributes instead

Index: HibernateTagsHandler.java
===================================================================
RCS file: 
/cvsroot/xdoclet/xdoclet/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** HibernateTagsHandler.java   15 Apr 2005 23:44:37 -0000      1.38
--- HibernateTagsHandler.java   20 Apr 2005 21:56:22 -0000      1.39
***************
*** 714,721 ****
              // and implement equals itself.
              // bomb if not.
-             XClass returnType = method.getReturnType().getType();
  
!             if (returnType.isA("java.io.Serializable") && 
!returnType.isAbstract() &&
!                 
!"java.lang.Object".equals(returnType.getMethod("equals(java.lang.Object)", 
true).getContainingClass().getQualifiedName())) {
                  setCurrentMethod(method);
                  generate(template);
--- 714,732 ----
              // and implement equals itself.
              // bomb if not.
  
!             XClass returnType = null;
! 
!             if (typeStr == null) {
!                 returnType = method.getReturnType().getType();
!             }
!             else {
!                 returnType = getXJavaDoc().getXClass(typeStr);
!             }
! 
!             if (returnType.isA("java.io.Serializable")
!                 && !returnType.isAbstract()
!                 && !"java.lang.Object".equals(returnType.getMethod(
!                 "equals(java.lang.Object)", true)
!                 .getContainingClass().getQualifiedName())) {
                  setCurrentMethod(method);
                  generate(template);



-------------------------------------------------------
This SF.Net email is sponsored by: New Crystal Reports XI.
Version 11 adds new functionality designed to reduce time involved in
creating, integrating, and deploying reporting solutions. Free runtime info,
new features, or free trial, at: http://www.businessobjects.com/devxi/728
_______________________________________________
xdoclet-devel mailing list
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel

Reply via email to