From: Chad B. <cwb...@us...> - 2007-07-05 18:46:08
|
User: cwbrandon Date: 07/07/05 11:46:10 Modified: andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades JSFUseCaseLogicImpl.java Log: minor formatting Revision Changes Path 1.3 +44 -42 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.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- JSFUseCaseLogicImpl.java 12 Feb 2007 16:54:55 -0000 1.2 +++ JSFUseCaseLogicImpl.java 5 Jul 2007 18:46:10 -0000 1.3 @@ -719,9 +719,11 @@ */ protected Collection handleGetNavigationChildren() { - return CollectionUtils.collect(getIncludes(),new Transformer() { - public Object transform(Object o) { - IncludeFacade inc = (IncludeFacade)o; + return CollectionUtils.collect(getIncludes(), new Transformer() + { + public Object transform(Object object) + { + IncludeFacade include = (IncludeFacade)object; return inc.getAddition(); } }); |
From: Chad B. <cwb...@us...> - 2007-07-05 20:20:25
|
User: cwbrandon Date: 07/07/05 13:20:28 Modified: andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades JSFUseCaseLogicImpl.java Log: typo Revision Changes Path 1.4 +9 -7 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.3 retrieving revision 1.4 diff -u -w -r1.3 -r1.4 --- JSFUseCaseLogicImpl.java 5 Jul 2007 18:46:10 -0000 1.3 +++ JSFUseCaseLogicImpl.java 5 Jul 2007 20:20:27 -0000 1.4 @@ -723,18 +723,20 @@ { public Object transform(Object object) { - IncludeFacade include = (IncludeFacade)object; - return inc.getAddition(); + final IncludeFacade include = (IncludeFacade)object; + return include.getAddition(); } }); } - private static boolean isParent(final JSFUseCase useCase0, final JSFUseCase useCase1) + private static boolean isParent(final JSFUseCase useCase1, final JSFUseCase useCase2) { - return CollectionUtils.exists(useCase1.getIncludes(),new Predicate() { - public boolean evaluate(Object o) { - final IncludeFacade inc = (IncludeFacade)o; - return inc.getAddition().equals(useCase0); + return CollectionUtils.exists(useCase2.getIncludes(), new Predicate() + { + public boolean evaluate(Object object) + { + final IncludeFacade include = (IncludeFacade)object; + return include.getAddition().equals(useCase1); } }); } |
From: Chad B. <cwb...@us...> - 2008-03-28 21:49:50
|
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 /* |