From: <bob...@us...> - 2011-03-07 06:03:53
|
Revision: 14945 http://andromda.svn.sourceforge.net/andromda/?rev=14945&view=rev Author: bobfields Date: 2011-03-07 06:03:46 +0000 (Mon, 07 Mar 2011) Log Message: ----------- Fix compiler warnings, unused imports. Modified Paths: -------------- trunk/cartridges/andromda-java/src/main/resources/templates/java/ApplicationException.vsl trunk/cartridges/andromda-java/src/main/resources/templates/java/ExceptionUtils.vm trunk/cartridges/andromda-java/src/main/resources/templates/java/ExceptionUtilsImports.vm trunk/cartridges/andromda-java/src/main/resources/templates/java/TypeSafeEnumeration.vsl trunk/cartridges/andromda-java/src/main/resources/templates/java/UnexpectedException.vsl 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/ApplicationException.vsl =================================================================== --- trunk/cartridges/andromda-java/src/main/resources/templates/java/ApplicationException.vsl 2011-03-01 04:47:49 UTC (rev 14944) +++ trunk/cartridges/andromda-java/src/main/resources/templates/java/ApplicationException.vsl 2011-03-07 06:03:46 UTC (rev 14945) @@ -32,7 +32,7 @@ @XmlAccessorType(XmlAccessType.FIELD) #if ($webFault) @XmlType(name="$stringUtils.uncapitalize($faultClass)") - @WebFault( name="$faultClass", targetNamespace="http://$javaUtils.reversePackage($class.packageName)/") + @javax.xml.ws.WebFault( name="$faultClass", targetNamespace="http://$javaUtils.reversePackage($class.packageName)#if($addNamespaceBackslash)/#end") #else @XmlType(name="$stringUtils.uncapitalize($class.name)") #end @@ -80,22 +80,22 @@ /** * Constructs a new instance of $class.name * - * @param message the throwable message. + * @param messageIn the throwable message. */ - public ${class.name}(String message) + public ${class.name}(String messageIn) { - super(message); + super(messageIn); } /** * Constructs a new instance of $class.name * - * @param message the throwable message. + * @param messageIn the throwable message. * @param throwable the parent of this Throwable. */ - public ${class.name}(String message, Throwable throwable) + public ${class.name}(String messageIn, Throwable throwable) { - super(message, findRootCause(throwable)); + super(messageIn, findRootCause(throwable)); } private Object[] messageArguments; @@ -104,22 +104,22 @@ * Gets the message arguments that can be used by message resources (in * something like the presentation tier) * - * @return + * @return messageArguments */ public Object[] getMessageArguments() { - return messageArguments; + return this.messageArguments; } /** * Sets the message arguments that can be used by message resources (in * something like the presentation tier) * - * @param messageArguments + * @param messageArgumentsIn */ - public void setMessageArguments(Object[] messageArguments) + public void setMessageArguments(Object[] messageArgumentsIn) { - this.messageArguments = messageArguments; + this.messageArguments = messageArgumentsIn; } #if ($webFault) @@ -138,25 +138,25 @@ /** * Constructs a new instance of $class.name with WebFault details * - * @param message the throwable message. + * @param messageIn the throwable message. * @param detailsIn $faultDetails WebFault details */ - public ${class.name}(String message, $faultDetails detailsIn) + public ${class.name}(String messageIn, $faultDetails detailsIn) { - super(message); + super(messageIn); this.details = detailsIn; } /** * Constructs a new instance of $class.name with WebFault details * - * @param message the throwable message. + * @param messageIn the throwable message. * @param throwable the parent of this Throwable. * @param detailsIn $faultDetails WebFault details */ - public ${class.name}(String message, Throwable throwable, $faultDetails detailsIn) + public ${class.name}(String messageIn, Throwable throwable, $faultDetails detailsIn) { - super(message, findRootCause(throwable)); + super(messageIn, findRootCause(throwable)); this.details = detailsIn; } Modified: trunk/cartridges/andromda-java/src/main/resources/templates/java/ExceptionUtils.vm =================================================================== --- trunk/cartridges/andromda-java/src/main/resources/templates/java/ExceptionUtils.vm 2011-03-01 04:47:49 UTC (rev 14944) +++ trunk/cartridges/andromda-java/src/main/resources/templates/java/ExceptionUtils.vm 2011-03-07 06:03:46 UTC (rev 14945) @@ -71,7 +71,7 @@ * @see java.lang.Throwable#setStackTrace(StackTraceElement[]) */ @Override - @XmlTransient + @javax.xml.bind.annotation.XmlTransient public void setStackTrace(StackTraceElement[] element) { super.setStackTrace(element); Modified: trunk/cartridges/andromda-java/src/main/resources/templates/java/ExceptionUtilsImports.vm =================================================================== --- trunk/cartridges/andromda-java/src/main/resources/templates/java/ExceptionUtilsImports.vm 2011-03-01 04:47:49 UTC (rev 14944) +++ trunk/cartridges/andromda-java/src/main/resources/templates/java/ExceptionUtilsImports.vm 2011-03-07 06:03:46 UTC (rev 14945) @@ -4,7 +4,5 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; -import javax.xml.ws.WebFault; #end Modified: trunk/cartridges/andromda-java/src/main/resources/templates/java/TypeSafeEnumeration.vsl =================================================================== --- trunk/cartridges/andromda-java/src/main/resources/templates/java/TypeSafeEnumeration.vsl 2011-03-01 04:47:49 UTC (rev 14944) +++ trunk/cartridges/andromda-java/src/main/resources/templates/java/TypeSafeEnumeration.vsl 2011-03-07 06:03:46 UTC (rev 14945) @@ -35,13 +35,6 @@ #end #set ($namesTemplateType = "<String>") #end -#else -##set ($cast = "") -#set ($namesTemplateType = "") -#set ($valuesTemplateType = "") -#set ($literalsTemplateType = "") -##else -##set ($cast = "($enumeration.name)") #end #set ($hasMemberVariables = !(${enumeration.memberVariables.empty()})) #set ($members = "") Modified: trunk/cartridges/andromda-java/src/main/resources/templates/java/UnexpectedException.vsl =================================================================== --- trunk/cartridges/andromda-java/src/main/resources/templates/java/UnexpectedException.vsl 2011-03-01 04:47:49 UTC (rev 14944) +++ trunk/cartridges/andromda-java/src/main/resources/templates/java/UnexpectedException.vsl 2011-03-07 06:03:46 UTC (rev 14945) @@ -32,7 +32,7 @@ @XmlAccessorType(XmlAccessType.FIELD) #if ($webFault) @XmlType(name="$stringUtils.uncapitalize($faultClass)") - @WebFault( name="$faultClass", targetNamespace="http://$javaUtils.reversePackage($class.packageName)/") + @javax.xml.ws.WebFault( name="$faultClass", targetNamespace="http://$javaUtils.reversePackage($class.packageName)#if($addNamespaceBackslash)/#end") #else @XmlType(name="$stringUtils.uncapitalize($class.name)") #end Modified: trunk/cartridges/andromda-java/src/main/resources/templates/java/ValueObject.vsl =================================================================== --- trunk/cartridges/andromda-java/src/main/resources/templates/java/ValueObject.vsl 2011-03-01 04:47:49 UTC (rev 14944) +++ trunk/cartridges/andromda-java/src/main/resources/templates/java/ValueObject.vsl 2011-03-07 06:03:46 UTC (rev 14945) @@ -2,11 +2,10 @@ // license-header java merge-point // /** - * @author GENERATED CODE! Do not modify by hand! + * @author Generated on $javaUtils.date Do not modify by hand! * * TEMPLATE: ValueObject.vsl in andromda-java-cartridge. * MODEL CLASS: $class.validationName - * METAFACADE: org.andromda.metafacades.uml.ValueObject #foreach ($stereotype in $class.stereotypes) * STEREOTYPE: $stereotype.name #end @@ -18,14 +17,10 @@ #if ($serializable && !$class.generalization) import java.io.Serializable; #end -#set ($XMLOutput=$XMLBindingAnnotations&&!$class.hasStereotype("NoXml")) +#set ($XMLOutput=$XMLBindingAnnotations && !$class.hasStereotype("NoXml")) #if ($XMLOutput) import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -#if ($xmlAttributes) -import javax.xml.bind.annotation.XmlAttribute; -#end -import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; #end @@ -175,7 +170,7 @@ #set ($type=$attribute.type.name) #if ($useAttributes) ## defaultValue not supported in @XmlAttribute annotation - annoying - @XmlAttribute(name = "$attribute.name"#if ($attribute.required), required=true#end) + @javax.xml.bind.annotation.XmlAttribute(name = "$attribute.name"#if ($attribute.required), required=true#end) #else ## Custom JAXB binding to use Date instead of XMLGregorianCalendar. Custom DateParser/printer class wraps CXF bindings #if (($type.equals("DateTime") && $stringUtils.isNotBlank($XMLDateTimeAdapter)) || ($type.equals("Time") && $stringUtils.isNotBlank($XMLTimeAdapter))|| ($type.equals("Date") && $stringUtils.isNotBlank($XMLDateAdapter))|| ($type.equals("Integer") && $stringUtils.isNotBlank($XMLIntegerAdapter))|| ($type.equals("Decimal") && $stringUtils.isNotBlank($XMLDecimalAdapter))) @@ -183,7 +178,7 @@ #else #set ($elementType="") #end - @XmlElement(name = "$attribute.name"##No newline + @javax.xml.bind.annotation.XmlElement(name = "$attribute.name"##No newline #if ($type.equals("String")) #if (!$attribute.many && $stringUtils.isNotBlank($attribute.defaultValue)), defaultValue=$attribute.defaultValue#end$elementType) #elseif ($type.equals("Character") || $type.equals("char")) @@ -214,6 +209,9 @@ #set ($returnType = $attribute.getterSetterTypeName) protected $returnType $attribute.name#if (!$attribute.many && $attribute.defaultValuePresent) = ${attribute.defaultValue}#end; #if ($attribute.type.primitive) + /** + * boolean setter for primitive attribute, so we can tell if it's initialized + */ #if ($XMLOutput) @javax.xml.bind.annotation.XmlTransient #end @@ -226,7 +224,7 @@ // Class associationEnds #foreach ($connectingEnd in $class.navigableConnectingEnds) #if ($XMLOutput) - @XmlElement(name="$connectingEnd.name"#if ($connectingEnd.required), required=true#end) + @javax.xml.bind.annotation.XmlElement(name="$connectingEnd.name"#if ($connectingEnd.required), required=true#end) #end protected $connectingEnd.getterSetterTypeName $connectingEnd.name; #end @@ -335,6 +333,9 @@ this.set$stringUtils.capitalize($property.name) = true; #end #end +#if ($class.allProperties.empty) + // documented empty block - avoid compiler warning +#end } /** @@ -347,7 +348,7 @@ public#if($generateChainedSetters) $className${genericTemplate}#else void#end copy(final $className${genericTemplate} otherBean) { #if ($class.allProperties.empty) -// No attributes to copy... + // No attributes to copy... #else if (null != otherBean) { @@ -634,6 +635,8 @@ #if ($class.generalization) return super.equalProperties(that) #set ($operator = "&& ") +#elseif ($class.properties.empty) + return true #else return #set ($operator = "") @@ -685,4 +688,4 @@ #end // ${class.fullyQualifiedName} value-object java merge-point } -#end \ No newline at end of file +#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. |