[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades JSFUseCaseLogicImpl.java

[Chad B. <cwb...@us...>]

  User: cwbrandon
  Date: 08/03/28 14:49:54

  Modified:    andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades
                        JSFUseCaseLogicImpl.java
  Log:
  include portlet pref message resources
  
  Revision  Changes    Path
  1.6       +20 -2     cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFUseCaseLogicImpl.java
  
  Index: JSFUseCaseLogicImpl.java
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFUseCaseLogicImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -r1.5 -r1.6
  --- JSFUseCaseLogicImpl.java	28 Mar 2008 18:37:03 -0000	1.5
  +++ JSFUseCaseLogicImpl.java	28 Mar 2008 21:49:53 -0000	1.6
  @@ -118,11 +118,12 @@
       /**
        * @see org.andromda.cartridges.jsf2.metafacades.JSFUseCase#getAllMessages()
        */
  +    @SuppressWarnings("unchecked")
       protected Map handleGetAllMessages()
       {
  -
           final boolean normalize = this.isNormalizeMessages();
  -        final Map messages = (normalize) ? (Map)new TreeMap() : (Map)new LinkedHashMap();
  +        final Map<String, String> messages = (normalize) ?
  +            (Map<String, String>)new TreeMap() : (Map<String, String>)new LinkedHashMap<String, String>();
   
           // - only retrieve the messages for the entry use case (i.e. the use case
           //   where the application begins)
  @@ -368,6 +369,23 @@
                               }
                           }
   
  +                        // - portlet preferences
  +                        final JSFPortletPreferences preferences = useCase.getPreferences();
  +                        if (preferences != null)
  +                        {
  +                            final Collection attributes = preferences.getAttributes(true);
  +                            if (!attributes.isEmpty())
  +                            {
  +                                for (final Iterator iterator = attributes.iterator(); iterator.hasNext();)
  +                                {
  +                                    final JSFAttribute attribute = (JSFAttribute)iterator.next();
  +                                    messages.put(
  +                                        attribute.getMessageKey(),
  +                                        attribute.getMessageValue());
  +                                }
  +                            }
  +                        }
  +
                           // - exception forwards
   
                           /*