Author: konstantin.mishin Date: 2010-12-01 12:50:52 -0500 (Wed, 01 Dec 2010) New Revision: 20275 Added: sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/renderkit/ sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java Modified: sandbox/trunk/ui/fileupload/ui/pom.xml sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/component/AbstractFileUpload.java sandbox/trunk/ui/fileupload/ui/src/main/templates/fileupload.template.xml Log: RF-9497 Modified: sandbox/trunk/ui/fileupload/ui/pom.xml =================================================================== --- sandbox/trunk/ui/fileupload/ui/pom.xml 2010-12-01 17:28:01 UTC (rev 20274) +++ sandbox/trunk/ui/fileupload/ui/pom.xml 2010-12-01 17:50:52 UTC (rev 20275) @@ -56,10 +56,6 @@ <artifactId>richfaces-ui-common-ui</artifactId> </dependency> <dependency> - <groupId>org.richfaces.ui.output</groupId> - <artifactId>richfaces-ui-output-ui</artifactId> - </dependency> - <dependency> <groupId>org.richfaces.ui.fileupload</groupId> <artifactId>richfaces-ui-fileupload-api</artifactId> <version>${project.version}</version> Modified: sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/component/AbstractFileUpload.java =================================================================== --- sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/component/AbstractFileUpload.java 2010-12-01 17:28:01 UTC (rev 20274) +++ sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/component/AbstractFileUpload.java 2010-12-01 17:50:52 UTC (rev 20275) @@ -28,7 +28,6 @@ import javax.faces.context.FacesContext; import javax.faces.event.AbortProcessingException; import javax.faces.event.ComponentSystemEvent; -import javax.faces.event.ComponentSystemEventListener; import javax.faces.event.ListenerFor; import javax.faces.event.PostAddToViewEvent; @@ -39,7 +38,6 @@ import org.richfaces.cdk.annotations.Tag; import org.richfaces.context.FileUploadPartialViewContextFactory; import org.richfaces.event.FileUploadListener; -import org.richfaces.event.UploadEvent; import org.richfaces.request.MultipartRequest; /** @@ -50,7 +48,7 @@ renderer = @JsfRenderer(type = "org.richfaces.FileUploadRenderer"), attributes = {"events-props.xml", "core-props.xml", "i18n-props.xml"}) @ListenerFor(systemEventClass = PostAddToViewEvent.class) -public abstract class AbstractFileUpload extends UIComponentBase implements ComponentSystemEventListener { +public abstract class AbstractFileUpload extends UIComponentBase { @Attribute public abstract String getAcceptedTypes(); @@ -68,29 +66,25 @@ public abstract String getOnuploadcomplete(); @Override - public void decode(FacesContext context) { - super.decode(context); - Object request = context.getExternalContext().getRequest(); - if (request instanceof MultipartRequest) { - queueEvent(new UploadEvent(this, ((MultipartRequest) request).getUploadItems())); - } - } - public void processEvent(ComponentSystemEvent event) throws AbortProcessingException { + super.processEvent(event); FacesContext context = getFacesContext(); Map<String, UIComponent> facets = getFacets(); UIComponent component = facets.get("progress"); if (component == null) { - component = context.getApplication().createComponent(context, AbstractProgressBar.COMPONENT_TYPE, + component = context.getApplication().createComponent(context, "org.richfaces.ProgressBar", "org.richfaces.ProgressBarRenderer"); - component.setId(getId() + "_pb"); - facets.put("progress", component); + if (component != null) { + component.setId(getId() + "_pb"); + facets.put("progress", component); + } } - component.setValueExpression("value", context.getApplication().getExpressionFactory() - .createValueExpression(context.getELContext(), - "#{" + MultipartRequest.PERCENT_BEAN_NAME + "[param['" - + FileUploadPartialViewContextFactory.UID_KEY + "']]}", Integer.class)); - + if (component != null) { + component.setValueExpression("value", context.getApplication().getExpressionFactory() + .createValueExpression(context.getELContext(), + "#{" + MultipartRequest.PERCENT_BEAN_NAME + "[param['" + + FileUploadPartialViewContextFactory.UID_KEY + "']]}", Integer.class)); + } } /** Added: sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java =================================================================== --- sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java (rev 0) +++ sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2010-12-01 17:50:52 UTC (rev 20275) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, 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.renderkit; + +import javax.faces.component.UIComponent; +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; + +import org.richfaces.event.UploadEvent; +import org.richfaces.request.MultipartRequest; + +/** + * @author Konstantin Mishin + * + */ +public class FileUploadRendererBase extends RendererBase { + + @Override + protected void doDecode(FacesContext context, UIComponent component) { + ExternalContext externalContext = context.getExternalContext(); + Object request = externalContext.getRequest(); + if (request instanceof MultipartRequest + && externalContext.getRequestParameterMap().containsKey(component.getClientId(context))) { + component.queueEvent(new UploadEvent(component, ((MultipartRequest) request).getUploadItems())); + } + } +} Modified: sandbox/trunk/ui/fileupload/ui/src/main/templates/fileupload.template.xml =================================================================== --- sandbox/trunk/ui/fileupload/ui/src/main/templates/fileupload.template.xml 2010-12-01 17:28:01 UTC (rev 20274) +++ sandbox/trunk/ui/fileupload/ui/src/main/templates/fileupload.template.xml 2010-12-01 17:50:52 UTC (rev 20275) @@ -28,7 +28,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude"> <cc:interface> <cdk:class>org.richfaces.renderkit.html.FileUploadRenderer</cdk:class> - <cdk:superclass>org.richfaces.renderkit.RendererBase</cdk:superclass> + <cdk:superclass>org.richfaces.renderkit.FileUploadRendererBase</cdk:superclass> <cdk:component-family>org.richfaces.FileUpload</cdk:component-family> <cdk:renderer-type>org.richfaces.FileUploadRenderer</cdk:renderer-type> <cdk:resource-dependency library="org.richfaces" name="fileupload.ecss" />