User: walterim
Date: 08/03/13 06:12:07
Modified: andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud
Controller.java.vsl ControllerImpl.java.vsl
Log:
Added a merge point. The serializable stuff moved to the Impl
Revision Changes Path
1.14 +15 -10 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl
Index: Controller.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- Controller.java.vsl 2 Mar 2008 20:59:16 -0000 1.13
+++ Controller.java.vsl 13 Mar 2008 13:12:06 -0000 1.14
@@ -2,13 +2,8 @@
// license-header java merge-point
package $manageable.manageablePackageName;
-public class ${manageable.controllerName}
- implements java.io.Serializable
+public abstract class ${manageable.controllerName}
{
- /**
- * The serial version UID of this class. Needed for serialization.
- */
- private static final long serialVersionUID = ${manageable.actionSerialVersionUID}L;
public String init(){
final ${managedBeansPackage}.AdfFacesContextWrapper contextWrapper = new ${managedBeansPackage}.AdfFacesContextWrapper();
@@ -49,6 +44,9 @@
saveMaxResultsWarning();
#end
+#else
+ form.${manageable.listSetterName}(null);
+
#end
#if (!$useAutocompleteLookup)
#if (!$manageable.manageableAssociationEnds.empty)
@@ -257,16 +255,20 @@
#if ($manageable.create)
if(form.${manageable.manageableIdentifier.getterName}() == null){
+ form.${manageable.manageableIdentifier.setterName}(
${manageable.manageableServiceAccessorCall}.create(
#set ($comma = '')
#foreach ($member in $manageable.manageableMembers)
-#if ($member.inputFile)
+#if ($member.name == $manageable.manageableIdentifier.name)
+ ${comma}null
+#elseif ($member.inputFile)
${comma}form.${member.getterName}()==null?null:org.apache.commons.io.IOUtils.toByteArray(form.${member.getterName}().getInputStream())
#else
${comma}form.${member.getterName}()
#end
#set ($comma = ', ')
#end
+ ).${manageable.manageableIdentifier.getterName}()
);
}
else{
@@ -666,4 +668,7 @@
}
}
}
+
+ // crud-controller merge-point
+
}
\ No newline at end of file
1.2 +8 -2 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/ControllerImpl.java.vsl
Index: ControllerImpl.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/ControllerImpl.java.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ControllerImpl.java.vsl 20 Feb 2007 10:14:55 -0000 1.1
+++ ControllerImpl.java.vsl 13 Mar 2008 13:12:07 -0000 1.2
@@ -3,10 +3,16 @@
package $manageable.manageablePackageName;
/**
- * @see $controller.fullyQualifiedName
+ * @see ${manageable.manageablePackageName}.${manageable.controllerName}
*/
public class ${manageable.controllerName}Impl
extends ${manageable.controllerName}
+ implements java.io.Serializable
{
+ /**
+ * The serial version UID of this class. Needed for serialization.
+ */
+ private static final long serialVersionUID = ${manageable.actionSerialVersionUID}L;
+
}
|
