[Hibernate-commits] Hibernate/cirrus/hibernate/tools/codegen ClassMapping.java,1.22,1.23

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/tools/codegen
In directory sc8-pr-cvs1:/tmp/cvs-serv32208

Modified Files:
	ClassMapping.java 
Log Message:
entities implement pk equality

Index: ClassMapping.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/tools/codegen/ClassMapping.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ClassMapping.java	30 Dec 2002 11:32:49 -0000	1.22
--- ClassMapping.java	30 Dec 2002 11:55:09 -0000	1.23
***************
*** 87,101 ****
        Element id = classElement.getChild("id");
        
!       if (id != null) propertyList.add(0, id);
!       //
!       // composite id
        
        Element cmpid = classElement.getChild("composite-id");
        if (cmpid != null) {
           String cmpname = cmpid.getAttributeValue("name");
           String cmpclass = cmpid.getAttributeValue("class");
           if ( cmpclass==null || cmpclass.equals("") ) {
              //Embedded composite id
!             implementEquals();
              propertyList.addAll(0, cmpid.getChildren("key-property") );
              manyToOneList.addAll(0, cmpid.getChildren("key-many-to-one") );
--- 87,104 ----
        Element id = classElement.getChild("id");
        
!       if (id != null) {
!       	 propertyList.add(0, id);
!       	 implementEquals();
!       }
        
+       // composite id
        Element cmpid = classElement.getChild("composite-id");
        if (cmpid != null) {
+       	 implementEquals();
           String cmpname = cmpid.getAttributeValue("name");
           String cmpclass = cmpid.getAttributeValue("class");
           if ( cmpclass==null || cmpclass.equals("") ) {
              //Embedded composite id
!             //implementEquals();
              propertyList.addAll(0, cmpid.getChildren("key-property") );
              manyToOneList.addAll(0, cmpid.getChildren("key-many-to-one") );