[Andromda-cvs] SF.net SVN: andromda:[13225] trunk/cartridges/andromda-java/src

[<cat...@us...>]

Revision: 13225
          http://andromda.svn.sourceforge.net/andromda/?rev=13225&view=rev
Author:   catforce
Date:     2009-12-22 12:23:19 +0000 (Tue, 22 Dec 2009)

Log Message:
-----------
new merge points added
improved ValueObject generation

Modified Paths:
--------------
    trunk/cartridges/andromda-java/src/templates/java/ApplicationException.vsl
    trunk/cartridges/andromda-java/src/templates/java/Enumeration.vsl
    trunk/cartridges/andromda-java/src/templates/java/TypeSafeEnumeration.vsl
    trunk/cartridges/andromda-java/src/templates/java/ValueObject.vsl
    trunk/cartridges/andromda-java/src/test/expected/cartridge-output.zip

Modified: trunk/cartridges/andromda-java/src/templates/java/ApplicationException.vsl
===================================================================
--- trunk/cartridges/andromda-java/src/templates/java/ApplicationException.vsl	2009-12-21 19:09:46 UTC (rev 13224)
+++ trunk/cartridges/andromda-java/src/templates/java/ApplicationException.vsl	2009-12-22 12:23:19 UTC (rev 13225)
@@ -44,7 +44,7 @@
 {
 #if ($serializable)
     /** The serial version UID of this class. Throwable implements Serializable so declaration not needed. */
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = ${class.serialVersionUID}L;
 
 #if ($webFault)
     /** The Class with attributes populated with Exception Details, modeled as ValueObject, to fully describe the fault.

Modified: trunk/cartridges/andromda-java/src/templates/java/Enumeration.vsl
===================================================================
--- trunk/cartridges/andromda-java/src/templates/java/Enumeration.vsl	2009-12-21 19:09:46 UTC (rev 13224)
+++ trunk/cartridges/andromda-java/src/templates/java/Enumeration.vsl	2009-12-22 12:23:19 UTC (rev 13225)
@@ -336,5 +336,6 @@
         ${enumeration.name}.literals = Collections.unmodifiableList(literals);
         ${enumeration.name}.names = Collections.unmodifiableList(names);
     }
+    // enumeration-object java merge-point
 }
 #end
\ No newline at end of file

Modified: trunk/cartridges/andromda-java/src/templates/java/TypeSafeEnumeration.vsl
===================================================================
--- trunk/cartridges/andromda-java/src/templates/java/TypeSafeEnumeration.vsl	2009-12-21 19:09:46 UTC (rev 13224)
+++ trunk/cartridges/andromda-java/src/templates/java/TypeSafeEnumeration.vsl	2009-12-22 12:23:19 UTC (rev 13225)
@@ -299,5 +299,6 @@
             ${enumeration.name}.names = Collections.unmodifiableList(names);
         }
     }
+    // type-safe-enumeration-object java merge-point
 }
 #end
\ No newline at end of file

Modified: trunk/cartridges/andromda-java/src/templates/java/ValueObject.vsl
===================================================================
--- trunk/cartridges/andromda-java/src/templates/java/ValueObject.vsl	2009-12-21 19:09:46 UTC (rev 13224)
+++ trunk/cartridges/andromda-java/src/templates/java/ValueObject.vsl	2009-12-22 12:23:19 UTC (rev 13225)
@@ -85,7 +85,7 @@
 #end
 #end
 #end
-public#if($class.leaf) final#end #if($class.abstract) abstract#end class $umlUtils.getClassDeclaration($class, $enableTemplating)
+public#if($class.leaf) final#end#if($class.abstract) abstract#end class $umlUtils.getClassDeclaration($class, $enableTemplating)
 #if($class.generalization)
 ## Class should only extend another ValueObject, which already declares Serializable and Comparable
     extends $class.generalization.fullyQualifiedName
@@ -245,20 +245,15 @@
 #end
      */
     public ${class.name}(## no newline
-#set ($comma = "")
 #foreach ($property in $class.allRequiredConstructorParameters)
-##set ($propertyType = ${conversionUtils.getFullName(${property.getterSetterTypeName})})
-${comma}final ${property.getterSetterTypeName} ${property.name}In## no newline
-#set ($comma = ", ")
+final ${property.getterSetterTypeName} ${property.name}In#if(${velocityHasNext}), #end## no newline
 #end
 )
     {
 #if($class.generalization)
         super(## no newline
-#set ($comma = "")
 #foreach ($property in $class.generalization.allRequiredConstructorParameters)
-${comma}${property.name}In## no newline
-#set ($comma = ", ")
+${property.name}In#if(${velocityHasNext}), #end## no newline
 #end
 );
 #elseif($class.allRequiredConstructorParameters.empty)
@@ -281,20 +276,16 @@
 #end
      */
     public ${class.name}(## no newline
-#set ($comma = "")
 #foreach ($property in $class.allProperties)
 #set ($propertyType = $property.getterSetterTypeName)
-${comma}final $propertyType ${property.name}In## no newline
-#set ($comma = ", ")
+final $propertyType ${property.name}In#if(${velocityHasNext}), #end## no newline
 #end
 )
     {
 #if($class.generalization)
         super(## no newline
-#set ($comma = "")
 #foreach ($property in $class.generalization.allProperties)
-${comma}${property.name}In## no newline
-#set ($comma = ", ")
+${property.name}In#if(${velocityHasNext}), #end## no newline
 #end
 );
 #end
@@ -315,8 +306,10 @@
      */
     public ${class.name}(final $class.name${genericTemplate} otherBean)
     {
-        super();
-#foreach ($property in $class.allProperties)
+#if($class.generalization)
+        super(otherBean);
+#end
+#foreach ($property in $class.properties)
         this.${property.name} = otherBean.${property.getterName}();
 #end
     }
@@ -328,13 +321,17 @@
      */
     public#if($generateChainedSetters) $class.name${genericTemplate}#else void#end copy(final $class.name${genericTemplate} otherBean)
     {
-        if (otherBean != null)
+#if ($class.allProperties.empty)
+// No attributes to copy...
+#else
+        if (null != otherBean)
         {
-#foreach ($property in $class.allProperties)
+#if($class.generalization)
+            super.copy(otherBean);
+#end
+#foreach ($property in $class.properties)
             this.${property.setterName}(otherBean.${property.getterName}());
 #end
-#if ($class.allProperties.empty)
-            // No attributes to copy...
 #end
         }
 #if($generateChainedSetters)
@@ -462,11 +459,14 @@
         {
              return false;
         }
-#if (!$class.allProperties.empty)
+#if (!$class.properties.empty)
         $class.fullyQualifiedName rhs = ($class.fullyQualifiedName) object;
 #end
-        return new EqualsBuilder().appendSuper(super.equals(object))
-#foreach($attr in $class.allProperties)
+        return new EqualsBuilder()
+#if($class.generalization)
+            .appendSuper(super.equals(object))
+#end
+#foreach($attr in $class.properties)
             .append(this.${attr.getterName}(), rhs.${attr.getterName}())
 #end
             .isEquals();
@@ -491,11 +491,14 @@
         {
             return -1;
         }
-#if (!$class.allProperties.empty)
+#if (!$class.properties.empty)
         $class.fullyQualifiedName myClass = ($class.fullyQualifiedName) object;
 #end
         return new CompareToBuilder()
-#foreach($attr in $class.allProperties)
+#if($class.generalization)
+            .appendSuper(super.compareTo(object))
+#end
+#foreach($attr in $class.properties)
             .append(this.${attr.getterName}(), myClass.${attr.getterName}())
 #end
             .toComparison();
@@ -510,8 +513,11 @@
 #end
     public int hashCode()
     {
-        return new HashCodeBuilder(1249046965, -82296885).appendSuper(super.hashCode())
-#foreach($attr in $class.getAttributes(true))
+        return new HashCodeBuilder(1249046965, -82296885)
+#if($class.generalization)
+            .appendSuper(super.hashCode())
+#end
+#foreach($attr in $class.properties)
             .append(this.${attr.getterName}())
 #end
 #foreach($associationEnd in $class.associationEnds)
@@ -539,7 +545,6 @@
     public String toString()
     {
         return new ToStringBuilder(this)
-##foreach($attr in $class.getAttributes(true))
 #foreach($attr in $class.allProperties)
             .append("${attr.name}", this.${attr.getterName}())
 #end

Modified: trunk/cartridges/andromda-java/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.