[Andromda-cvs] SF.net SVN: andromda:[14811] trunk/cartridges/andromda-hibernate/src

[<wal...@us...>]

Revision: 14811
          http://andromda.svn.sourceforge.net/andromda/?rev=14811&view=rev
Author:   walterim
Date:     2011-02-07 16:01:12 +0000 (Mon, 07 Feb 2011)

Log Message:
-----------
Templates changed to use the new identifier methods in the entity metafacade.

Modified Paths:
--------------
    trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/HibernateEntity.vsl
    trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/HibernateEntityPK.vsl
    trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/hibernate.java.vm
    trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate3/hibernate.hbm.xml.vsl
    trunk/cartridges/andromda-hibernate/src/test/expected/cartridge-output.zip

Modified: trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/HibernateEntity.vsl
===================================================================
--- trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/HibernateEntity.vsl	2011-02-07 15:58:47 UTC (rev 14810)
+++ trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/HibernateEntity.vsl	2011-02-07 16:01:12 UTC (rev 14811)
@@ -52,17 +52,15 @@
 #end
 #end
 #if($entity.compositeIdentifier)
-#set($primaryKeyType="${entity.fullyQualifiedEntityName}PK")
-#set($primaryKeyName="$stringUtils.uncapitalize($entity.name)Pk")
-    private $primaryKeyType $primaryKeyName;
+    private $entity.fullyQualifiedIdentifierTypeName $entity.identifierName;
 
-    public $primaryKeyType get${entity.name}Pk()
+    public $entity.fullyQualifiedIdentifierTypeName ${entity.identifierGetterName}()
     {
-        return this.${primaryKeyName};
+        return this.${entity.identifierName};
     }
 
-    public void set${entity.name}Pk($primaryKeyType $primaryKeyName) {
-        this.$primaryKeyName = $primaryKeyName;
+    public void ${entity.identifierSetterName}($entity.fullyQualifiedIdentifierTypeName $entity.identifierName) {
+        this.$entity.identifierName = $entity.identifierName;
     }
 
 #end

Modified: trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/HibernateEntityPK.vsl
===================================================================
--- trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/HibernateEntityPK.vsl	2011-02-07 15:58:47 UTC (rev 14810)
+++ trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/HibernateEntityPK.vsl	2011-02-07 16:01:12 UTC (rev 14811)
@@ -1,4 +1,4 @@
-#set ($generatedFile = "${entity.packagePath}/${entity.entityName}PK.java")
+#set ($generatedFile = "${entity.packagePath}/${entity.identifierTypeName}.java")
 // license-header java merge-point
 //
 // Attention: Generated code! Do not modify by hand!
@@ -8,16 +8,46 @@
 package $entity.packageName;
 #end
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-
-#set ($primaryKeyType="${entity.entityName}PK")
 /**
  * Primary key class for ${entity.entityName}
  */
-public class $primaryKeyType implements java.io.Serializable {
+public class $entity.identifierTypeName implements java.io.Serializable {
 
+    /**
+     * The serial version UID of this class. Needed for serialization.
+     */
+    private static final long serialVersionUID = ${entity.serialVersionUID}L;
+
+        public ${entity.identifierTypeName}()
+        {
+        }
+
+        public ${entity.identifierTypeName}(## no newline
+#set ($comma = "")
 #foreach($associationEnd in $entity.identifierAssociationEnds)
 #if($associationEnd.many2One)
+${comma}${associationEnd.otherEnd.type.fullyQualifiedEntityImplementationName} ${associationEnd.otherEnd.name}## no newline
+#set ($comma = ", ")
+#end
+#end
+#foreach ( $identifier in $entity.identifiers )
+${comma}${identifier.type.fullyQualifiedName} ${identifier.name}## no newline
+#set ($comma = ", ")
+#end
+)
+        {
+#foreach($associationEnd in $entity.identifierAssociationEnds)
+#if($associationEnd.many2One)
+            this.${associationEnd.otherEnd.name} = ${associationEnd.otherEnd.name}; 
+#end
+#end
+#foreach ( $identifier in $entity.identifiers )
+            this.${identifier.name} = ${identifier.name};
+#end
+        }
+
+#foreach($associationEnd in $entity.identifierAssociationEnds)
+#if($associationEnd.many2One)
     private $associationEnd.otherEnd.type.fullyQualifiedEntityImplementationName $associationEnd.otherEnd.name;
 
     public $associationEnd.otherEnd.type.fullyQualifiedEntityImplementationName ${associationEnd.otherEnd.getterName}()
@@ -56,11 +86,11 @@
         {
             return true;
         }
-        if (!(object instanceof $primaryKeyType))
+        if (!(object instanceof $entity.identifierTypeName))
         {
             return false;
         }
-        final $primaryKeyType that = ($primaryKeyType)object;
+        final $entity.identifierTypeName that = ($entity.identifierTypeName)object;
         return new org.apache.commons.lang.builder.EqualsBuilder()
 #foreach($associationEnd in $entity.identifierAssociationEnds)
 #if($associationEnd.many2One)

Modified: trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/hibernate.java.vm
===================================================================
--- trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/hibernate.java.vm	2011-02-07 15:58:47 UTC (rev 14810)
+++ trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate/hibernate.java.vm	2011-02-07 16:01:12 UTC (rev 14811)
@@ -19,8 +19,7 @@
         }
         final $className that = ($className)object;
 #if($class.compositeIdentifier)
-#set($primaryKeyName="$stringUtils.uncapitalize($className)Pk")
-        if (this.$primaryKeyName == null || that.$primaryKeyName == null || !this.${primaryKeyName}.equals(that.${primaryKeyName}))
+        if (this.$class.identifierName == null || that.$class.identifierName == null || !this.${class.identifierName}.equals(that.${class.identifierName}))
         {
             return false;
         }
@@ -66,8 +65,7 @@
         int hashCode = 0;
 #end
 #if($class.compositeIdentifier)
-#set($primaryKeyName="$stringUtils.uncapitalize($className)Pk")
-        hashCode = 29 * hashCode + (this.$primaryKeyName == null ? 0 : this.${primaryKeyName}.hashCode());
+        hashCode = 29 * hashCode + (this.$class.identifierName == null ? 0 : this.${class.identifierName}.hashCode());
 #else
 #foreach ($attribute in $attributeSet)
 #set ($attrType = $attribute.type)

Modified: trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate3/hibernate.hbm.xml.vsl
===================================================================
--- trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate3/hibernate.hbm.xml.vsl	2011-02-07 15:58:47 UTC (rev 14810)
+++ trunk/cartridges/andromda-hibernate/src/main/resources/templates/hibernate3/hibernate.hbm.xml.vsl	2011-02-07 16:01:12 UTC (rev 14811)
@@ -36,7 +36,7 @@
             </generator>
         </id>
 #else
-        <composite-id name="$stringUtils.uncapitalize($entity.name)Pk" class="${entity.fullyQualifiedEntityName}PK">
+        <composite-id name="$entity.identifierName" class="$entity.fullyQualifiedIdentifierTypeName">
 #foreach ($identifier in $entity.identifiers)
             <key-property name="$identifier.name" type="$identifier.type.fullyQualifiedHibernateType">
                 <column name="$identifier.columnName"#if ($generateDatabaseDependentCode) sql-type="$identifier.sqlType"#end not-null="true"/>

Modified: trunk/cartridges/andromda-hibernate/src/test/expected/cartridge-output.zip
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.