Index: LayoutViewHandler.java =================================================================== RCS file: /cvs/jsftemplating/src/java/com/sun/jsftemplating/layout/LayoutViewHan dler.java,v retrieving revision 1.41 diff -c -r1.41 LayoutViewHandler.java *** LayoutViewHandler.java 24 Mar 2008 18:00:34 -0000 1.41 --- LayoutViewHandler.java 25 Mar 2008 06:54:13 -0000 *************** *** 34,39 **** --- 34,41 ---- import java.util.Locale; import java.util.Map; import java.util.Stack; + import java.util.Set; + import java.util.HashSet; import javax.faces.FactoryFinder; import javax.faces.application.StateManager; *************** *** 423,441 **** * specified, then the {@link #DEFAULT_RESOURCE_PREFIX} will be * used.

! public List getResourcePrefixes() { if (_resourcePrefix == null) { ! ArrayList list = new ArrayList(); ! // Check to see if it's specified by a context param // Get context parameter map (initParams in JSF are context params) String initParam = (String) FacesContext.getCurrentInstance(). getExternalContext().getInitParameterMap().get(RESOURCE_PREFIX); if (initParam != null) { ! list.add(initParam); } - // FIXME: Support more... - // Add default... list.add(DEFAULT_RESOURCE_PREFIX); _resourcePrefix = list; --- 425,442 ---- * specified, then the {@link #DEFAULT_RESOURCE_PREFIX} will be * used.

*/ ! public Set getResourcePrefixes() { if (_resourcePrefix == null) { ! HashSet list = new HashSet(); // Check to see if it's specified by a context param // Get context parameter map (initParams in JSF are context params) String initParam = (String) FacesContext.getCurrentInstance(). getExternalContext().getInitParameterMap().get(RESOURCE_PREFIX); if (initParam != null) { ! for(String token: initParam.split(",")) { ! list.add(token.trim()); ! } } // Add default... list.add(DEFAULT_RESOURCE_PREFIX); _resourcePrefix = list; ! public void setResourcePrefixes(Set prefix) { _resourcePrefix = prefix; } *************** *** 858,864 **** public static final String RESOURCE_PREFIX = "com.sun.jsftemplating.RESOURCE_PREFIX"; ! private List _resourcePrefix = null; //private transient java.util.Date _time = null; private ViewHandler _oldViewHandler = null; --- 859,865 ---- public static final String RESOURCE_PREFIX = "com.sun.jsftemplating.RESOURCE_PREFIX"; ! private Set _resourcePrefix = null;