User: leifj
Date: 08/04/17 13:41:52
Modified: andromda-jsf2/src/main/resources/templates/jsf2/forms
Form.java.vsl FormImpl.java.vsl
Log:
treat enumerations as non-complex types
Revision Changes Path
1.3 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/Form.java.vsl
Index: Form.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/Form.java.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
1.4 +7 -5 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/FormImpl.java.vsl
Index: FormImpl.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/FormImpl.java.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- FormImpl.java.vsl 3 Apr 2008 22:26:26 -0000 1.3
+++ FormImpl.java.vsl 17 Apr 2008 20:41:51 -0000 1.4
@@ -12,7 +12,7 @@
public ${action.formImplementationName}()
{
#foreach ($field in $action.formFields)
-#if (!$field.complex)
+#if (!$field.complex || $field.type.enumeration)
#renderDateTimeFormatters($field "")
#end
#foreach ($attribute in $field.attributes)
@@ -42,7 +42,7 @@
*/
public $fieldTypeName ${field.getterName}()
{
-#if ($field.complex)
+#if ($field.complex && !$field.type.enumeration)
if (this.$field.name == null)
{
this.$field.name = new ${field.type.fullyQualifiedName}();
@@ -76,12 +76,14 @@
this.$field.name = $field.name;
this.$field.formAttributeSetProperty = true;
}
-#if (!$field.complex && !$field.defaultValuePresent)
+#if ( (!$field.complex && !$field.defaultValuePresent) || $field.type.enumeration)
#renderBackingListImplSupport($field "")
#end
+#if (!$field.type.enumeration)
#foreach ($attribute in $field.attributes)
#renderBackingListImplSupport($attribute $field)
#end
+#end
#end
#if ($action.formResetRequired)
@@ -94,7 +96,7 @@
#foreach($field in $action.parameters)
#if ($field.reset)
this.$field.name = $field.type.javaNullString;
-#elseif ($field.complex)
+#elseif ($field.complex && !$field.type.enumeration)
#foreach ($attribute in $field.type.getAttributes(true))
#if ($attribute.reset)
this.${field.name}.${attribute.setterName}($attribute.type.javaNullString);
|
