[Andromda-cvs] SF.net SVN: andromda:[14926] trunk/cartridges/andromda-java/src/main/ resources/templates/java/ValueObject.vsl

[<bob...@us...>]

Revision: 14926
          http://andromda.svn.sourceforge.net/andromda/?rev=14926&view=rev
Author:   bobfields
Date:     2011-02-26 07:27:14 +0000 (Sat, 26 Feb 2011)

Log Message:
-----------
ValueObject: Fix addNamespaceBackslash, fix @XmlTransient only for Xml output, fix .equal(Object, Object) output.

Modified Paths:
--------------
    trunk/cartridges/andromda-java/src/main/resources/templates/java/ValueObject.vsl

Modified: trunk/cartridges/andromda-java/src/main/resources/templates/java/ValueObject.vsl
===================================================================
--- trunk/cartridges/andromda-java/src/main/resources/templates/java/ValueObject.vsl	2011-02-25 20:44:36 UTC (rev 14925)
+++ trunk/cartridges/andromda-java/src/main/resources/templates/java/ValueObject.vsl	2011-02-26 07:27:14 UTC (rev 14926)
@@ -171,7 +171,7 @@
 #set ($type=$stringUtils.substring($attribute.type.fullyQualifiedName, 0, 9))
 ## Primitive types and type wrappers will have empty package name
 #set ($useAttributes = $xmlAttributes && !$attribute.many && $attribute.type.name!='Object' && ($stringUtils.isBlank($attribute.type.packageName) || $attribute.type.packageName.equals("java.lang") || $type.equals("java.util") || $type.equals("java.math") || $attribute.type.packageName.equals("PrimitiveTypes")))
-#set ($namespaceName="$javaUtils.reversePackage($attribute.packageName)/")
+#set ($namespaceName="$javaUtils.reversePackage($attribute.packageName)#if($addNamespaceBackslash)/#end")
 #set ($type=$attribute.type.name)
 #if ($useAttributes)
 ## defaultValue not supported in @XmlAttribute annotation - annoying
@@ -214,7 +214,9 @@
 #set ($returnType = $attribute.getterSetterTypeName)
     protected $returnType $attribute.name#if (!$attribute.many && $attribute.defaultValuePresent) = ${attribute.defaultValue}#end;
 #if ($attribute.type.primitive)
+#if ($XMLOutput)
     @javax.xml.bind.annotation.XmlTransient
+#end
     protected boolean set$stringUtils.capitalize($attribute.name) = false;
 #end
 #end
@@ -646,6 +648,7 @@
         ;
     }
 
+#end
 #if (!$class.generalization)
     /**
      * This is a convenient helper method which is able to detect whether or not two values are equal. Two values
@@ -680,7 +683,6 @@
     }
 
 #end
-#end
     // ${class.fullyQualifiedName} value-object java merge-point
 }
 #end
\ No newline at end of file


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