[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/messages messages.properties.vsl

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

  User: walterim
  Date: 08/01/28 11:19:19

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud
                        Controller.java.vsl
               andromda-jsf2/src/main/resources/templates/jsf2/messages
                        messages.properties.vsl
  Log:
  Using apache commons "isEmpty" instead of "== null". Showing message to the user when the search result is empty.
  
  Revision  Changes    Path
  1.12      +19 -5     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.11
  retrieving revision 1.12
  diff -u -w -r1.11 -r1.12
  --- Controller.java.vsl	1 Dec 2007 23:03:23 -0000	1.11
  +++ Controller.java.vsl	28 Jan 2008 19:19:18 -0000	1.12
  @@ -274,6 +274,7 @@
   
       public void doSave(${manageable.formBeanType} form) throws Exception {
   
  +#if ($manageable.create)
           if(form.${manageable.manageableIdentifier.getterName}() == null){
               ${manageable.manageableServiceAccessorCall}.create(
   #set ($comma = '')
  @@ -288,6 +289,7 @@
               );
           }
           else{
  +#end        
               ${manageable.manageableServiceAccessorCall}.update(
   #set ($comma = '')
   #foreach ($member in $manageable.manageableMembers)
  @@ -299,8 +301,9 @@
   #set ($comma = ', ')
   #end
               );
  +#if ($manageable.create)
           }
  -
  +#end
           if(form.${manageable.listGetterName}() != null) //only searches again if there was an old search
               doSearch(form); //search again to show the updated item (if it fits the search criteria)
   
  @@ -341,7 +344,15 @@
   #set ($and = '')
   #foreach ($member in $manageable.manageableMembers)
   #if(!$member.hidden)##não está funcionando($manageable.searchable($member))
  +#if($member.type.stringType)
  +            ${and} org.apache.commons.lang.StringUtils.isEmpty(form.getSearchForm().${member.getterName}())
  +#elseif($member.type.collectionType)
  +            ${and} org.apache.commons.collections.CollectionUtils.isEmpty(form.getSearchForm().${member.getterName}())
  +#elseif($member.type.arrayType)
  +            ${and} org.apache.commons.lang.ArrayUtils.isEmpty(form.getSearchForm().${member.getterName}())
  +#else
               ${and} form.getSearchForm().${member.getterName}() == null
  +#end
   #set ($and = '&&')
   #end
   #end
  @@ -361,12 +372,15 @@
           );
   
           form.${manageable.listSetterName}(list);
  -
  +        if(org.apache.commons.collections.CollectionUtils.isEmpty(list)){
  +            this.addInfoMessage(org.andromda.presentation.jsf2.Messages.get("empty.result.set", null));
   #if ($manageable.maximumListSize > 0)
  +        } else {
           if (list.size() >= $manageable.maximumListSize)
               saveMaxResultsWarning();
  -
   #end
  +        }
  +
   #if (!$manageable.manageableAssociationEnds.empty)
           final java.util.Map backingLists = ${manageable.manageableServiceAccessorCall}.readBackingLists();
   #foreach ($member in $manageable.manageableAssociationEnds)
  
  
  
  1.7       +4 -1      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/messages/messages.properties.vsl
  
  Index: messages.properties.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/messages/messages.properties.vsl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -r1.6 -r1.7
  --- messages.properties.vsl	1 Dec 2007 23:03:23 -0000	1.6
  +++ messages.properties.vsl	28 Jan 2008 19:19:19 -0000	1.7
  @@ -162,7 +162,9 @@
   #foreach ($literal in $enumeration.literals)
   #set($literalKey = $literal.name)
   #set($literalKey = $literal.defaultValue)
  -${enumeration.messageKey}.${literalKey}=${literal.name}
  +#set($literalValue = $literal.name)
  +#set($literalValue = $literal.defaultValue)
  +${enumeration.messageKey}.${literalKey}=${$literalValue}
   #end
   #end
   #end
  @@ -199,6 +201,7 @@
   maximum.results.fetched.warning=Maximum of {0} records retrieved, other records may be available. Please specify more search criteria to narrow result set.
   binary.data=[Binary]
   no.entity.found=no {0} found
  +empty.result.set=No records found
   
   #foreach ($manageable in $manageables)
   $manageable.messageKey=$manageable.messageValue