[Andromda-cvs] SF.net SVN: andromda:[15153] trunk/cartridges/andromda-jsf/src

[<wal...@us...>]

Revision: 15153
          http://andromda.svn.sourceforge.net/andromda/?rev=15153&view=rev
Author:   walterim
Date:     2011-08-11 17:10:10 +0000 (Thu, 11 Aug 2011)

Log Message:
-----------
Allow CRUD direct URL request.

Modified Paths:
--------------
    trunk/cartridges/andromda-jsf/src/main/resources/templates/jsf/flow/crud/ViewPopulator.java.vsl
    trunk/cartridges/andromda-jsf/src/test/expected/cartridge-output.zip
    trunk/cartridges/andromda-jsf/src/test/expected/cartridge-outputUML2.zip

Modified: trunk/cartridges/andromda-jsf/src/main/resources/templates/jsf/flow/crud/ViewPopulator.java.vsl
===================================================================
--- trunk/cartridges/andromda-jsf/src/main/resources/templates/jsf/flow/crud/ViewPopulator.java.vsl	2011-08-11 17:08:41 UTC (rev 15152)
+++ trunk/cartridges/andromda-jsf/src/main/resources/templates/jsf/flow/crud/ViewPopulator.java.vsl	2011-08-11 17:10:10 UTC (rev 15153)
@@ -86,13 +86,15 @@
 #end
         try
         {
+            //Keep this code out of the 'if' below to force the form creation in case it does not exist.
+            //This way the direct URL access works fine.
+            ${manageable.formBeanType} ${manageable.formBeanName} =
+                            ((${manageable.controllerName})variableResolver.resolveVariable(
+                            facesContext,
+                            "${manageable.controllerBeanName}")).getForm();
             // - populate the forms
             if (form != null && form instanceof $manageable.formBeanType)
             {
-                $manageable.formBeanType $manageable.formBeanName =
-                    (${manageable.formBeanType})variableResolver.resolveVariable(
-                    facesContext,
-                    "$manageable.formBeanName");
                 // - populate the $manageable.formBeanName with any parameters from the previous form
                 ${manageable.formBeanName}.copyFrom((${manageable.formBeanType})form);
             }

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

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


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