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

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

Revision: 14913
          http://andromda.svn.sourceforge.net/andromda/?rev=14913&view=rev
Author:   bobfields
Date:     2011-02-24 17:57:40 +0000 (Thu, 24 Feb 2011)

Log Message:
-----------
ValueObject addNamespaceBackslash, add @XmlTransient for isSet(primitive).

Modified Paths:
--------------
    trunk/cartridges/andromda-java/src/main/resources/templates/java/ValueObject.vsl
    trunk/cartridges/andromda-java/src/test/expected/cartridge-output.zip
    trunk/cartridges/andromda-java/src/test/expected/cartridge-uml2.zip

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-24 17:56:34 UTC (rev 14912)
+++ trunk/cartridges/andromda-java/src/main/resources/templates/java/ValueObject.vsl	2011-02-24 17:57:40 UTC (rev 14913)
@@ -65,7 +65,7 @@
 #if ($XMLOutput)
 @XmlRootElement(name = "$className")
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "$className", // namespace="http://$javaUtils.reversePackage($class.packageName)/",
+@XmlType(name = "$className", // namespace="http://$javaUtils.reversePackage($class.packageName)#if($addNamespaceBackslash)/#end",
 #set ($size = $class.attributes.size() + $class.navigableConnectingEnds.size())
 #set ($count = 1)
   propOrder = {
@@ -75,7 +75,7 @@
 #set ($count = $count+1)
 #end
 #foreach ($connectingEnd in $class.navigableConnectingEnds)
-#set ($namespaceName="$javaUtils.reversePackage($connectingEnd.packageName)/")
+#set ($namespaceName="$javaUtils.reversePackage($connectingEnd.packageName)#if($addNamespaceBackslash)/#end")
     "$connectingEnd.name"#if ($count<$size),#end
 
 #set ($count = $count+1)
@@ -214,6 +214,7 @@
 #set ($returnType = $attribute.getterSetterTypeName)
     protected $returnType $attribute.name#if (!$attribute.many && $attribute.defaultValuePresent) = ${attribute.defaultValue}#end;
 #if ($attribute.type.primitive)
+    @javax.xml.bind.annotation.XmlTransient
     protected boolean set$stringUtils.capitalize($attribute.name) = false;
 #end
 #end

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

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


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