Author: nbelaevski Date: 2010-09-17 14:15:10 -0400 (Fri, 17 Sep 2010) New Revision: 19248 Added: trunk/core/impl/src/main/java/org/richfaces/application/GlobalResourcesViewHandler.java trunk/core/impl/src/main/resources/META-INF/global-resources.faces-config.xml Removed: trunk/core/impl/src/main/java/org/richfaces/context/SkinningResourcesPhaseListener.java trunk/core/impl/src/main/resources/META-INF/skinning-resources-listener.faces-config.xml Log: https://jira.jboss.org/browse/RF-8937 Added: trunk/core/impl/src/main/java/org/richfaces/application/GlobalResourcesViewHandler.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/application/GlobalResourcesViewHandler.java (rev 0) +++ trunk/core/impl/src/main/java/org/richfaces/application/GlobalResourcesViewHandler.java 2010-09-17 18:15:10 UTC (rev 19248) @@ -0,0 +1,187 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.application; + +import java.io.ObjectStreamException; +import java.util.List; + +import javax.el.ELContext; +import javax.el.ValueExpression; +import javax.faces.application.Application; +import javax.faces.application.ViewHandler; +import javax.faces.application.ViewHandlerWrapper; +import javax.faces.component.UIComponent; +import javax.faces.component.UIOutput; +import javax.faces.component.UIViewRoot; +import javax.faces.context.FacesContext; + +import org.richfaces.application.configuration.ConfigurationService; +import org.richfaces.el.BaseReadOnlyValueExpression; + +/** + * @author Nick Belaevski + * + */ +public class GlobalResourcesViewHandler extends ViewHandlerWrapper { + + private static final String SKINNING_RESOURCE_ID = "__rf_skinning_resource"; + + private static final String CLASSES_ECSS = "_classes.ecss"; + + private static final String ECSS = ".ecss"; + + private static final String BOTH_ECSS = "_both.ecss"; + + private static final String CONTROLS_SKINNING; + + private static final String BOTH_SKINNING; + + private static final String CLASSES_SKINNING; + + private static final String HEAD = "head"; + + static { + String skinningName = "skinning"; + + CONTROLS_SKINNING = skinningName + ECSS; + BOTH_SKINNING = skinningName + BOTH_ECSS; + CLASSES_SKINNING = skinningName + CLASSES_ECSS; + + } + + private ViewHandler viewHandler; + + public GlobalResourcesViewHandler(ViewHandler viewHandler) { + super(); + this.viewHandler = viewHandler; + } + + @Override + public ViewHandler getWrapped() { + return viewHandler; + } + + private static final class SkinningResourceNameExpression extends BaseReadOnlyValueExpression { + + public static final ValueExpression INSTANCE = new SkinningResourceNameExpression(); + + private static final long serialVersionUID = 7520575496522682120L; + + private SkinningResourceNameExpression() { + super(String.class); + } + + @Override + public Object getValue(ELContext context) { + FacesContext facesContext = getFacesContext(context); + + ConfigurationService configurationService = ServiceTracker.getService(ConfigurationService.class); + + boolean controls = configurationService.getBooleanValue(facesContext, CoreConfiguration.Items.standardControlsSkinning); + boolean classes = configurationService.getBooleanValue(facesContext, CoreConfiguration.Items.standardControlsSkinningClasses); + + if (controls && classes) { + return BOTH_SKINNING; + } + + if (classes) { + return CLASSES_SKINNING; + } + + return CONTROLS_SKINNING; + } + + private Object readResolve() throws ObjectStreamException { + return INSTANCE; + } + + } + + private static final class SkinningResourceRenderedExpression extends BaseReadOnlyValueExpression { + + public static final ValueExpression INSTANCE = new SkinningResourceRenderedExpression(); + + private static final long serialVersionUID = -1579256471133808739L; + + private SkinningResourceRenderedExpression() { + super(Boolean.TYPE); + } + + @Override + public Object getValue(ELContext context) { + FacesContext facesContext = getFacesContext(context); + + ConfigurationService configurationService = ServiceTracker.getService(ConfigurationService.class); + + return configurationService.getBooleanValue(facesContext, CoreConfiguration.Items.standardControlsSkinning) || + configurationService.getBooleanValue(facesContext, CoreConfiguration.Items.standardControlsSkinningClasses); + } + + private Object readResolve() throws ObjectStreamException { + return INSTANCE; + } + } + + private UIComponent createComponentResource(FacesContext context) { + Application application = context.getApplication(); + + //renderkit id is not set on FacesContext at this point, so calling + //application.createComponent(context, componentType, rendererType) causes NPE + UIComponent resourceComponent = application.createComponent(UIOutput.COMPONENT_TYPE); + + String rendererType = application.getResourceHandler().getRendererTypeForResourceName(BOTH_SKINNING); + resourceComponent.setRendererType(rendererType); + + return resourceComponent; + } + + @Override + public UIViewRoot createView(FacesContext context, String viewId) { + UIViewRoot viewRoot = super.createView(context, viewId); + + boolean skinningResourceFound = false; + List<UIComponent> resources = viewRoot.getComponentResources(context, HEAD); + for (UIComponent resource : resources) { + if (SKINNING_RESOURCE_ID.equals(resource.getId())) { + skinningResourceFound = true; + break; + } + } + + if (!skinningResourceFound) { + //it's important for skinning resources to come *before* any users/components stylesheet, + //that's why they are *always* added here + UIComponent basic = createComponentResource(context); + basic.setValueExpression("name", SkinningResourceNameExpression.INSTANCE); + basic.setValueExpression("rendered", SkinningResourceRenderedExpression.INSTANCE); + basic.setId(SKINNING_RESOURCE_ID); + + //workaround for Mojarra: RF-8937 + boolean initialProcessingEvents = context.isProcessingEvents(); + context.setProcessingEvents(false); + viewRoot.addComponentResource(context, basic); + context.setProcessingEvents(initialProcessingEvents); + } + + return viewRoot; + } +} Deleted: trunk/core/impl/src/main/java/org/richfaces/context/SkinningResourcesPhaseListener.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/context/SkinningResourcesPhaseListener.java 2010-09-17 18:10:07 UTC (rev 19247) +++ trunk/core/impl/src/main/java/org/richfaces/context/SkinningResourcesPhaseListener.java 2010-09-17 18:15:10 UTC (rev 19248) @@ -1,167 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.richfaces.context; - -import java.util.List; - -import javax.el.ELContext; -import javax.faces.application.Application; -import javax.faces.component.UIComponent; -import javax.faces.component.UIOutput; -import javax.faces.component.UIViewRoot; -import javax.faces.context.FacesContext; -import javax.faces.event.PhaseEvent; -import javax.faces.event.PhaseId; -import javax.faces.event.PhaseListener; - -import org.richfaces.application.CoreConfiguration; -import org.richfaces.application.ServiceTracker; -import org.richfaces.application.configuration.ConfigurationService; -import org.richfaces.el.BaseReadOnlyValueExpression; - -/** - * @author Nick Belaevski - * - */ -public class SkinningResourcesPhaseListener implements PhaseListener { - - private static final long serialVersionUID = 7430448731396547419L; - - private static final String SKINNING_RESOURCE_MARKER = SkinningResourcesPhaseListener.class.getName(); - - private static final String CLASSES_ECSS = "_classes.ecss"; - - private static final String ECSS = ".ecss"; - - private static final String BOTH_ECSS = "_both.ecss"; - - private static final String CONTROLS_SKINNING; - - private static final String BOTH_SKINNING; - - private static final String CLASSES_SKINNING; - - private static final String HEAD = "head"; - - static { - String skinningName = "skinning"; - - CONTROLS_SKINNING = skinningName + ECSS; - BOTH_SKINNING = skinningName + BOTH_ECSS; - CLASSES_SKINNING = skinningName + CLASSES_ECSS; - - } - - private static final class SkinningResourceNameExpression extends BaseReadOnlyValueExpression { - - private static final long serialVersionUID = 7520575496522682120L; - - public SkinningResourceNameExpression() { - super(String.class); - } - - @Override - public Object getValue(ELContext context) { - FacesContext facesContext = getFacesContext(context); - - ConfigurationService configurationService = ServiceTracker.getService(ConfigurationService.class); - - boolean controls = configurationService.getBooleanValue(facesContext, CoreConfiguration.Items.standardControlsSkinning); - boolean classes = configurationService.getBooleanValue(facesContext, CoreConfiguration.Items.standardControlsSkinningClasses); - - if (controls && classes) { - return BOTH_SKINNING; - } - - if (classes) { - return CLASSES_SKINNING; - } - - return CONTROLS_SKINNING; - } - - } - - private static final class SkinningResourceRenderedExpression extends BaseReadOnlyValueExpression { - - private static final long serialVersionUID = -1579256471133808739L; - - public SkinningResourceRenderedExpression() { - super(Boolean.TYPE); - } - - @Override - public Object getValue(ELContext context) { - FacesContext facesContext = getFacesContext(context); - - ConfigurationService configurationService = ServiceTracker.getService(ConfigurationService.class); - - return configurationService.getBooleanValue(facesContext, CoreConfiguration.Items.standardControlsSkinning) || - configurationService.getBooleanValue(facesContext, CoreConfiguration.Items.standardControlsSkinningClasses); - } - - } - - private UIComponent createComponentResource(FacesContext context) { - Application application = context.getApplication(); - String rendererType = application.getResourceHandler().getRendererTypeForResourceName(BOTH_SKINNING); - UIComponent resourceComponent = application.createComponent(context, UIOutput.COMPONENT_TYPE, rendererType); - - return resourceComponent; - } - - public void afterPhase(PhaseEvent event) { - //not used - } - - public void beforePhase(PhaseEvent event) { - //it's important for skinning resources to come *before* any users/components stylesheet, - //that's why they are added via phase listener - - FacesContext context = event.getFacesContext(); - UIViewRoot viewRoot = context.getViewRoot(); - - assert viewRoot != null; - - boolean skinnigResourceFound = false; - List<UIComponent> resources = viewRoot.getComponentResources(context, HEAD); - for (UIComponent resource : resources) { - if (resource.getAttributes().get(SKINNING_RESOURCE_MARKER) != null) { - skinnigResourceFound = true; - break; - } - } - - if (!skinnigResourceFound) { - UIComponent basic = createComponentResource(context); - basic.setValueExpression("name", new SkinningResourceNameExpression()); - basic.setValueExpression("rendered", new SkinningResourceRenderedExpression()); - basic.getAttributes().put(SKINNING_RESOURCE_MARKER, Boolean.TRUE); - - viewRoot.addComponentResource(context, basic); - } - } - - public PhaseId getPhaseId() { - return PhaseId.RENDER_RESPONSE; - } -} Copied: trunk/core/impl/src/main/resources/META-INF/global-resources.faces-config.xml (from rev 19202, trunk/core/impl/src/main/resources/META-INF/skinning-resources-listener.faces-config.xml) =================================================================== --- trunk/core/impl/src/main/resources/META-INF/global-resources.faces-config.xml (rev 0) +++ trunk/core/impl/src/main/resources/META-INF/global-resources.faces-config.xml 2010-09-17 18:15:10 UTC (rev 19248) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" version="2.0"> + <name>richfaces</name> + + <application> + <view-handler>org.richfaces.application.GlobalResourcesViewHandler</view-handler> + </application> + +</faces-config> \ No newline at end of file Deleted: trunk/core/impl/src/main/resources/META-INF/skinning-resources-listener.faces-config.xml =================================================================== --- trunk/core/impl/src/main/resources/META-INF/skinning-resources-listener.faces-config.xml 2010-09-17 18:10:07 UTC (rev 19247) +++ trunk/core/impl/src/main/resources/META-INF/skinning-resources-listener.faces-config.xml 2010-09-17 18:15:10 UTC (rev 19248) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<faces-config xmlns="http://java.sun.com/xml/ns/javaee" version="2.0"> - <name>richfaces</name> - <lifecycle> - <phase-listener>org.richfaces.context.SkinningResourcesPhaseListener</phase-listener> - </lifecycle> -</faces-config> \ No newline at end of file