[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud ControllerImpl.java.vsl Controller.java.vsl

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

  User: walterim
  Date: 07/02/20 02:14:55

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/configuration
                        faces-config.xml.vsl
               andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud
                        Controller.java.vsl
  Added:       andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud
                        ControllerImpl.java.vsl
  Log:
  Added the controller implementation to allow overriding the default controller behaviour.
  
  Revision  Changes    Path
  1.7       +2 -2      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/faces-config.xml.vsl
  
  Index: faces-config.xml.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/faces-config.xml.vsl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -r1.6 -r1.7
  --- faces-config.xml.vsl	12 Feb 2007 16:54:55 -0000	1.6
  +++ faces-config.xml.vsl	20 Feb 2007 10:14:55 -0000	1.7
  @@ -54,8 +54,8 @@
   
   #foreach ($manageable in $manageables)
       <managed-bean>
  -        <managed-bean-name>$manageable.controllerBeanName</managed-bean-name>
  -        <managed-bean-class>$manageable.controllerType</managed-bean-class>
  +        <managed-bean-name>${manageable.controllerBeanName}</managed-bean-name>
  +        <managed-bean-class>${manageable.controllerType}Impl</managed-bean-class>
           <managed-bean-scope>application</managed-bean-scope>
       </managed-bean>
   #end
  
  
  
  1.4       +12 -15    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.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- Controller.java.vsl	18 Jan 2007 10:11:10 -0000	1.3
  +++ Controller.java.vsl	20 Feb 2007 10:14:55 -0000	1.4
  @@ -41,18 +41,18 @@
   	}
   	
   	public void doInit(${manageable.formBeanType} form) throws Exception {
  -## does not preload the data anymore... testing.	 
  -###if ($manageable.preload)
  -##        final java.util.List list = ${manageable.manageableServiceAccessorCall}.readAll();
  -##        
  -##        form.${manageable.listSetterName}(list);
  -##
  -###if ($manageable.maximumListSize > 0)
  -##        if (list.size() >= $manageable.maximumListSize)
  -##            saveMaxResultsWarning();
  -##
  -###end
  -###end
  +	
  +#if ($manageable.preload)
  +        final java.util.List list = ${manageable.manageableServiceAccessorCall}.readAll();
  +        
  +        form.${manageable.listSetterName}(list);
  +
  +#if ($manageable.maximumListSize > 0)
  +        if (list.size() >= $manageable.maximumListSize)
  +            saveMaxResultsWarning();
  +
  +#end
  +#end
   #if (!$manageable.manageableAssociationEnds.empty)
           final java.util.Map backingLists = ${manageable.manageableServiceAccessorCall}.readBackingLists();
   #foreach ($member in $manageable.manageableAssociationEnds)
  @@ -315,9 +315,6 @@
           
           form.${manageable.listSetterName}(list);
   
  -		if(list.size() == 0)
  -			addWarningMessage(org.andromda.presentation.jsf2.Messages.get("no.entity.found", new Object[]{org.andromda.presentation.jsf2.Messages.get("$manageable.messageKey",null)}));
  -
   #if ($manageable.maximumListSize > 0)
           if (list.size() >= $manageable.maximumListSize)
               saveMaxResultsWarning();
  
  
  
  1.1                  cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/ControllerImpl.java.vsl
  
  Index: ControllerImpl.java.vsl
  ===================================================================
  #set ($generatedFile = "${manageable.controllerFullPath}Impl.java")
  // license-header java merge-point
  package $manageable.manageablePackageName;
  
  /**
   * @see $controller.fullyQualifiedName
   */
  public class ${manageable.controllerName}Impl
      extends ${manageable.controllerName}
  {
  
  }