sventon subversion web client - http://www.sventon.org
[show recent changes]
 
  Help
HEAD
Rev: 26014 - http://anonsvn.icesoft.org/repo / icefaces2 / tags / icefaces-core-2.1.0.BETA2 / icefaces / core / src / main / java / org / icefaces / util / EnvUtils.java
Unified Diff View - EnvUtils.java
/icefaces2/tags/icefaces-core-2.1.0.BETA2/icefaces/core/src/main/java/org/icefaces/util/EnvUtils.java @ revision 26013
/icefaces2/tags/icefaces-core-2.1.0.BETA2/icefaces/core/src/main/java/org/icefaces/util/EnvUtils.java @ revision 26014
@@ -374,26 +374,20 @@         return EnvConfig.getEnvConfig(facesContext).windowScopeExpiration;     } -    public static String getMandatoryResourceOverride(FacesContext facesContext) { -        UIViewRoot viewRoot = facesContext.getViewRoot(); -        Map viewMap = viewRoot.getViewMap(); -        String mandatoryResourceConfig = (String) viewMap -                .get(MANDATORY_RESOURCE_CONFIG); -        //pad with spaces to allow String.contains checking -        if (null != mandatoryResourceConfig) { -            mandatoryResourceConfig = " " + mandatoryResourceConfig + " "; -        } -        return mandatoryResourceConfig; -    } -     public static String getMandatoryResourceConfig(FacesContext facesContext) {         String configValue = EnvConfig.getEnvConfig(facesContext)                 .mandatoryResourceConfig; -        if ("all".equalsIgnoreCase(configValue)) { -            //restore previous default behavior to load all components -            configValue = null; +        String result = configValue; +        UIViewRoot viewRoot = facesContext.getViewRoot(); +        Map viewMap = viewRoot.getViewMap(); +        String overValue = (String) viewMap.get(MANDATORY_RESOURCE_CONFIG); +        if (null != overValue) { +            result = overValue;         } -        return configValue; +        if (null != result) { +            result = result.trim(); +        } +        return result;     }     public static boolean isUniqueResourceURLs(FacesContext facesContext) {


feed icon

sventon 2.5.1