[richfaces-svn-commits] JBoss Rich Faces SVN: r1453 - in trunk/framework: api/src/main/java/org/ajax4jsf/application and 2 other directories.

Author: alexsmirnov Date: 2007-07-03 17:59:20 -0400 (Tue, 03 Jul 2007) New Revision: 1453 Added: trunk/framework/api/src/main/java/org/ajax4jsf/application/ trunk/framework/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java Removed: trunk/framework/api/src/main/java/org/ajax4jsf/framework/ViewHandlerWrapper.java Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java Log: packages and classes refactor Copied: trunk/framework/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java (from rev 1451, trunk/framework/api/src/main/java/org/ajax4jsf/framework/ViewHandlerWrapper.java) =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java (rev 0) +++ trunk/framework/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java 2007-07-03 21:59:20 UTC (rev 1453) @@ -0,0 +1,172 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library 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 library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.ajax4jsf.application; + +import java.io.IOException; +import java.lang.reflect.Constructor; +import java.util.Locale; + +import javax.faces.FacesException; +import javax.faces.application.ViewHandler; +import javax.faces.component.UIViewRoot; +import javax.faces.context.FacesContext; + +import org.ajax4jsf.framework.util.message.Messages; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Base wrapper for {@link javax.faces.application.ViewHandler} . By default, delegate all + * method calls to wrapped handler. + * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:12 $ + * + */ +public class ViewHandlerWrapper extends ViewHandler { + private static final String HANDLERS = "org.ajax4jsf.VIEW_HANDLERS"; + + private static final Log _log = LogFactory.getLog(ViewHandlerWrapper.class); + + /** + * Wrapped ViewHandler + */ + protected ViewHandler _handler; + + private boolean _initialized = false; + + /** + * @param handler - to wrap. + */ + public ViewHandlerWrapper(ViewHandler handler) { + _handler = handler; + } + + /* (non-Javadoc) + * @see javax.faces.application.ViewHandler#calculateLocale(javax.faces.context.FacesContext) + */ + public Locale calculateLocale(FacesContext context) { + fillChain(context); + return _handler.calculateLocale(context); + } + + /* (non-Javadoc) + * @see javax.faces.application.ViewHandler#calculateRenderKitId(javax.faces.context.FacesContext) + */ + public String calculateRenderKitId(FacesContext context) { + fillChain(context); + return _handler.calculateRenderKitId(context); + } + + /* (non-Javadoc) + * @see javax.faces.application.ViewHandler#createView(javax.faces.context.FacesContext, java.lang.String) + */ + public UIViewRoot createView(FacesContext context, String viewId) { + fillChain(context); + return _handler.createView(context, viewId); + } + + /* (non-Javadoc) + * @see javax.faces.application.ViewHandler#getActionURL(javax.faces.context.FacesContext, java.lang.String) + */ + public String getActionURL(FacesContext context, String url) { + fillChain(context); + return _handler.getActionURL(context, url); + } + + /* (non-Javadoc) + * @see javax.faces.application.ViewHandler#getResourceURL(javax.faces.context.FacesContext, java.lang.String) + */ + public String getResourceURL(FacesContext context, String url) { + fillChain(context); + return _handler.getResourceURL(context, url); + } + + /* (non-Javadoc) + * @see javax.faces.application.ViewHandler#renderView(javax.faces.context.FacesContext, javax.faces.component.UIViewRoot) + */ + public void renderView(FacesContext context, UIViewRoot root) throws IOException, FacesException { + fillChain(context); + _handler.renderView(context, root); + } + + /* (non-Javadoc) + * @see javax.faces.application.ViewHandler#restoreView(javax.faces.context.FacesContext, java.lang.String) + */ + public UIViewRoot restoreView(FacesContext context, String viewId) { + fillChain(context); + return _handler.restoreView(context, viewId); + } + + /* (non-Javadoc) + * @see javax.faces.application.ViewHandler#writeState(javax.faces.context.FacesContext) + */ + public void writeState(FacesContext context) throws IOException { + fillChain(context); + _handler.writeState(context); + } + + /** + * @return Returns the handler. + */ + protected ViewHandler getHandler() { + return _handler; + } + + /** + * Fill view-handlers chain for alternate handlers. + * @param context + */ + synchronized protected void fillChain( FacesContext context){ + if(!_initialized){ + _initialized = true; + String handlers = context.getExternalContext().getInitParameter(HANDLERS); + if(null != handlers){ + ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); + String[] classes = handlers.split(","); + for (int i = 0; i < classes.length; i++) { + String handlerClass = classes[i]; + if (_log.isDebugEnabled()) { + _log.debug(Messages.getMessage(Messages.CREATE_ALTERNATE_HANDLER, handlerClass)); + } + try { + Class clazz = classLoader.loadClass(handlerClass); + try { + Constructor constructor = clazz + .getConstructor(new Class[] { ViewHandler.class }); + _handler = (ViewHandler) constructor + .newInstance(new Object[] { _handler }); + } catch (NoSuchMethodException e) { + // No constructor with parent class - create simple instance + if (_log.isWarnEnabled()) { + _log.warn(Messages.getMessage(Messages.ALTERNATE_HANDLER_CONSTRUCTOR_WARNING)); + } + _handler = (ViewHandler) clazz.newInstance(); + } + } catch (Exception e) { + _log.error(Messages.getMessage(Messages.VIEW_HANDLER_INSTANTIATION_ERROR), e); + } + } + } + } + } + +} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/framework/ViewHandlerWrapper.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/ViewHandlerWrapper.java 2007-07-03 21:49:58 UTC (rev 1452) +++ trunk/framework/api/src/main/java/org/ajax4jsf/framework/ViewHandlerWrapper.java 2007-07-03 21:59:20 UTC (rev 1453) @@ -1,172 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library 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 library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.framework; - -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.util.Locale; - -import javax.faces.FacesException; -import javax.faces.application.ViewHandler; -import javax.faces.component.UIViewRoot; -import javax.faces.context.FacesContext; - -import org.ajax4jsf.framework.util.message.Messages; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * Base wrapper for {@link javax.faces.application.ViewHandler} . By default, delegate all - * method calls to wrapped handler. - * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:12 $ - * - */ -public class ViewHandlerWrapper extends ViewHandler { - private static final String HANDLERS = "org.ajax4jsf.VIEW_HANDLERS"; - - private static final Log _log = LogFactory.getLog(ViewHandlerWrapper.class); - - /** - * Wrapped ViewHandler - */ - protected ViewHandler _handler; - - private boolean _initialized = false; - - /** - * @param handler - to wrap. - */ - public ViewHandlerWrapper(ViewHandler handler) { - _handler = handler; - } - - /* (non-Javadoc) - * @see javax.faces.application.ViewHandler#calculateLocale(javax.faces.context.FacesContext) - */ - public Locale calculateLocale(FacesContext context) { - fillChain(context); - return _handler.calculateLocale(context); - } - - /* (non-Javadoc) - * @see javax.faces.application.ViewHandler#calculateRenderKitId(javax.faces.context.FacesContext) - */ - public String calculateRenderKitId(FacesContext context) { - fillChain(context); - return _handler.calculateRenderKitId(context); - } - - /* (non-Javadoc) - * @see javax.faces.application.ViewHandler#createView(javax.faces.context.FacesContext, java.lang.String) - */ - public UIViewRoot createView(FacesContext context, String viewId) { - fillChain(context); - return _handler.createView(context, viewId); - } - - /* (non-Javadoc) - * @see javax.faces.application.ViewHandler#getActionURL(javax.faces.context.FacesContext, java.lang.String) - */ - public String getActionURL(FacesContext context, String url) { - fillChain(context); - return _handler.getActionURL(context, url); - } - - /* (non-Javadoc) - * @see javax.faces.application.ViewHandler#getResourceURL(javax.faces.context.FacesContext, java.lang.String) - */ - public String getResourceURL(FacesContext context, String url) { - fillChain(context); - return _handler.getResourceURL(context, url); - } - - /* (non-Javadoc) - * @see javax.faces.application.ViewHandler#renderView(javax.faces.context.FacesContext, javax.faces.component.UIViewRoot) - */ - public void renderView(FacesContext context, UIViewRoot root) throws IOException, FacesException { - fillChain(context); - _handler.renderView(context, root); - } - - /* (non-Javadoc) - * @see javax.faces.application.ViewHandler#restoreView(javax.faces.context.FacesContext, java.lang.String) - */ - public UIViewRoot restoreView(FacesContext context, String viewId) { - fillChain(context); - return _handler.restoreView(context, viewId); - } - - /* (non-Javadoc) - * @see javax.faces.application.ViewHandler#writeState(javax.faces.context.FacesContext) - */ - public void writeState(FacesContext context) throws IOException { - fillChain(context); - _handler.writeState(context); - } - - /** - * @return Returns the handler. - */ - protected ViewHandler getHandler() { - return _handler; - } - - /** - * Fill view-handlers chain for alternate handlers. - * @param context - */ - synchronized protected void fillChain( FacesContext context){ - if(!_initialized){ - _initialized = true; - String handlers = context.getExternalContext().getInitParameter(HANDLERS); - if(null != handlers){ - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - String[] classes = handlers.split(","); - for (int i = 0; i < classes.length; i++) { - String handlerClass = classes[i]; - if (_log.isDebugEnabled()) { - _log.debug(Messages.getMessage(Messages.CREATE_ALTERNATE_HANDLER, handlerClass)); - } - try { - Class clazz = classLoader.loadClass(handlerClass); - try { - Constructor constructor = clazz - .getConstructor(new Class[] { ViewHandler.class }); - _handler = (ViewHandler) constructor - .newInstance(new Object[] { _handler }); - } catch (NoSuchMethodException e) { - // No constructor with parent class - create simple instance - if (_log.isWarnEnabled()) { - _log.warn(Messages.getMessage(Messages.ALTERNATE_HANDLER_CONSTRUCTOR_WARNING)); - } - _handler = (ViewHandler) clazz.newInstance(); - } - } catch (Exception e) { - _log.error(Messages.getMessage(Messages.VIEW_HANDLER_INSTANTIATION_ERROR), e); - } - } - } - } - } - -} Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java 2007-07-03 21:49:58 UTC (rev 1452) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java 2007-07-03 21:59:20 UTC (rev 1453) @@ -32,8 +32,8 @@ import javax.faces.context.ResponseWriter; import javax.servlet.http.HttpServletResponse; +import org.ajax4jsf.application.ViewHandlerWrapper; import org.ajax4jsf.context.AjaxContext; -import org.ajax4jsf.framework.ViewHandlerWrapper; import org.ajax4jsf.framework.renderer.AjaxContainerRenderer; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.RendererUtils.HTML;