Author: alexsmirnov Date: 2007-07-03 16:06:53 -0400 (Tue, 03 Jul 2007) New Revision: 1449 Added: trunk/framework/api/src/main/java/org/ajax4jsf/context/ trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java trunk/framework/impl/src/main/java/org/ajax4jsf/component/ trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxActionComponent.java trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxInputComponent.java Removed: trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxActionComponent.java trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxContext.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxInputComponent.java Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxRegionBrige.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewRoot.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/JsfOneOneInvoker.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseXMLFilter.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxPhaseListener.java trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/ForceRender.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxCommandButton.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxCommandLink.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxForm.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxFunction.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxRegion.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxSupport.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIInclude.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIPoll.java trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIPush.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/AjaxCommandRendererBase.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxOutputPanelRenderer.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPageRenderer.java trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java trunk/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java trunk/ui/menu-components/src/main/java/org/richfaces/component/UIMenuItem.java trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java trunk/ui/suggestionbox/src/main/java/org/richfaces/component/UISuggestionBox.java trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java trunk/ui/togglePanel/src/main/java/org/richfaces/component/UIToggleControl.java Log: packages and classes refactor Copied: trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java (from rev 1448, trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxContext.java) =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java (rev 0) +++ trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -0,0 +1,125 @@ +package org.ajax4jsf.context; + +import java.io.IOException; +import java.util.Map; +import java.util.Set; + +import javax.faces.FacesException; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.el.VariableResolver; + +import org.ajax4jsf.framework.ajax.ViewIdHolder; + +public abstract class AjaxContext { + + /** + * Key for keep request state information in request-scope attributes. + */ + public static final String AJAX_CONTEXT_KEY = "ajaxContext"; + + public abstract Map getCommonAjaxParameters(); + + public abstract String getAjaxActionURL(FacesContext context); + + public abstract String getAjaxActionURL(); + + public abstract void setResponseData(Object responseData); + + public abstract Object getResponseData(); + + public abstract void setViewIdHolder(ViewIdHolder viewIdHolder); + + public abstract ViewIdHolder getViewIdHolder(); + + public abstract boolean removeRenderedArea(String id); + + public abstract void addRenderedArea(String id); + + public abstract Set getAjaxRenderedAreas(); + + public abstract void addComponentToAjaxRender(UIComponent base, String id); + + public abstract void addComponentToAjaxRender(UIComponent component); + + public abstract void addRegionsFromComponent(UIComponent component); + + public abstract Set getAjaxAreasToRender(); + + public abstract boolean isAjaxRequest(FacesContext context); + + public abstract boolean isAjaxRequest(); + + public abstract void processHeadResources(FacesContext context) + throws FacesException; + + public abstract void encodeAjaxEnd(FacesContext context, UIComponent component) + throws IOException; + + public abstract void encodeAjaxBegin(FacesContext context, UIComponent component) + throws IOException; + + public abstract void renderAjaxRegion(FacesContext context, UIComponent component, + boolean useFilterWriter) throws FacesException; + + public abstract void renderSubmittedAjaxRegion(FacesContext context, final boolean useFilterWriter); + + public abstract void renderSubmittedAjaxRegion(FacesContext context); + + public static final String SCRIPTS_PARAMETER = "org.ajax4jsf.framework.HEADER_SCRIPTS"; + public static final String STYLES_PARAMETER = "org.ajax4jsf.framework.HEADER_STYLES"; + public static final String RESPONSE_DATA_KEY = "_ajax:data"; + + /** + * Get instance of current AJAX Context. Instance get by + * {@link VariableResolver#resolveVariable(FacesContext, String)} for + * variable {@link AjaxContext#AJAX_CONTEXT_KEY} + * + * @return memento instance for current request + */ + public static AjaxContext getCurrentInstance() { + FacesContext context = FacesContext.getCurrentInstance(); + return getCurrentInstance(context); + } + + /** + * Get instance of current AJAX Context. Instance get by + * {@link VariableResolver#resolveVariable(FacesContext, String)} for + * variable {@link AjaxContext#AJAX_CONTEXT_KEY} + * + * @param context + * current FacesContext + * @return instance of AjaxContext. + */ + public static AjaxContext getCurrentInstance(FacesContext context) { + if (null == context) { + throw new NullPointerException("FacesContext is null"); + } + AjaxContext ajaxContext = (AjaxContext) context.getApplication() + .getVariableResolver().resolveVariable(context, + AJAX_CONTEXT_KEY); + if (null == ajaxContext) { + // TODO Create default implementation. +// ajaxContext = new AjaxContext(); +// context.getExternalContext().getRequestMap().put(AJAX_CONTEXT_KEY, +// ajaxContext); + } + return ajaxContext; + } + + public AjaxContext() { + super(); + } + + public abstract Map getResponseDataMap(); + + public abstract void setAjaxRequest(boolean b); + + public abstract boolean isSelfRender(); + + public abstract void setSelfRender(boolean b); + + public abstract String getSubmittedRegionClientId(FacesContext context); + + public abstract void saveViewState(FacesContext context) throws IOException; +} \ No newline at end of file Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxActionComponent.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxActionComponent.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxActionComponent.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -1,154 +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.ajax; - -import javax.faces.component.UICommand; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.event.AbortProcessingException; -import javax.faces.event.ActionEvent; -import javax.faces.event.FacesEvent; -import javax.faces.event.PhaseId; - - -/** - * @author shura (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.3 $ $Date: 2007/02/06 16:23:21 $ - * - */ -public abstract class AjaxActionComponent extends UICommand implements - AjaxComponent, AjaxSource { - - public static final String FOCUS_DATA_ID = "_A4J.AJAX.focus"; - - /* - * (non-Javadoc) - * - * @see javax.faces.component.UIComponentBase#broadcast(javax.faces.event.FacesEvent) - */ - public void broadcast(FacesEvent event) throws AbortProcessingException { - // Hack - throw exception to AjaxViewRoot, to fix state of all iterable components. - if (event instanceof AjaxSingleEvent) { - throw new AjaxSingleException(getSingleComponent()); - } - // perform default - super.broadcast(event); - if (event instanceof AjaxEvent) { - FacesContext context = getFacesContext(); - // complete re-Render fields. AjaxEvent deliver before render - // response. - setupReRender(context); - // Put data for send in response - Object data = getData(); - AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context); - if (null != data) { - ajaxContext.setResponseData(data); - } - String focus = getFocus(); - if (null != focus) { - // search for component in tree. - // TODO - use more pourful search, as in h:outputLabel component. - UIComponent focusComponent = findComponent(focus); - if(null != focusComponent){ - focus = focusComponent.getClientId(context); - } - ajaxContext.getResponseDataMap().put(FOCUS_DATA_ID, focus); - } - } - } - - /** - * Template method with old signature, for backward compability. - */ - protected void setupReRender() { - } - - /** - * Template methods for fill set of resions to render in subclasses. - * - * @param facesContext - * TODO - */ - protected void setupReRender(FacesContext facesContext) { - AjaxContext.getCurrentInstance(facesContext).addRegionsFromComponent( - this); - setupReRender(); - } - - /* - * (non-Javadoc) - * - * @see javax.faces.component.UIComponentBase#queueEvent(javax.faces.event.FacesEvent) - */ - public void queueEvent(FacesEvent event) { - if (event instanceof ActionEvent && event.getComponent() == this) { - if (isImmediate()) { - event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES); - } else if (isBypassUpdates()) { - event.setPhaseId(PhaseId.PROCESS_VALIDATIONS); - } else { - event.setPhaseId(PhaseId.INVOKE_APPLICATION); - } - getParent().queueEvent(event); - if(isAjaxSingle()){ - super.queueEvent(new AjaxSingleEvent(this)); - } - } else { - super.queueEvent(event); - } - } - - /* - * (non-Javadoc) - * - * @see org.ajax4jsf.framework.ajax.AjaxSource#addAjaxListener(org.ajax4jsf.framework.ajax.AjaxListener) - */ - public void addAjaxListener(AjaxListener listener) { - addFacesListener(listener); - } - - /* - * (non-Javadoc) - * - * @see org.ajax4jsf.framework.ajax.AjaxSource#getAjaxListeners() - */ - public AjaxListener[] getAjaxListeners() { - AjaxListener al[] = (AjaxListener[]) getFacesListeners(AjaxListener.class); - return (al); - - } - - /* - * (non-Javadoc) - * - * @see org.ajax4jsf.framework.ajax.AjaxSource#removeAjaxListener(org.ajax4jsf.framework.ajax.AjaxListener) - */ - public void removeAjaxListener(AjaxListener listener) { - removeFacesListener(listener); - - } - - protected UIComponent getSingleComponent(){ - return this; - } - -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxContext.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxContext.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxContext.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -1,123 +0,0 @@ -package org.ajax4jsf.framework.ajax; - -import java.io.IOException; -import java.util.Map; -import java.util.Set; - -import javax.faces.FacesException; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.el.VariableResolver; - -public abstract class AjaxContext { - - /** - * Key for keep request state information in request-scope attributes. - */ - public static final String AJAX_CONTEXT_KEY = "ajaxContext"; - - public abstract Map getCommonAjaxParameters(); - - public abstract String getAjaxActionURL(FacesContext context); - - public abstract String getAjaxActionURL(); - - public abstract void setResponseData(Object responseData); - - public abstract Object getResponseData(); - - public abstract void setViewIdHolder(ViewIdHolder viewIdHolder); - - public abstract ViewIdHolder getViewIdHolder(); - - public abstract boolean removeRenderedArea(String id); - - public abstract void addRenderedArea(String id); - - public abstract Set getAjaxRenderedAreas(); - - public abstract void addComponentToAjaxRender(UIComponent base, String id); - - public abstract void addComponentToAjaxRender(UIComponent component); - - public abstract void addRegionsFromComponent(UIComponent component); - - public abstract Set getAjaxAreasToRender(); - - public abstract boolean isAjaxRequest(FacesContext context); - - public abstract boolean isAjaxRequest(); - - public abstract void processHeadResources(FacesContext context) - throws FacesException; - - public abstract void encodeAjaxEnd(FacesContext context, UIComponent component) - throws IOException; - - public abstract void encodeAjaxBegin(FacesContext context, UIComponent component) - throws IOException; - - public abstract void renderAjaxRegion(FacesContext context, UIComponent component, - boolean useFilterWriter) throws FacesException; - - public abstract void renderSubmittedAjaxRegion(FacesContext context, final boolean useFilterWriter); - - public abstract void renderSubmittedAjaxRegion(FacesContext context); - - public static final String SCRIPTS_PARAMETER = "org.ajax4jsf.framework.HEADER_SCRIPTS"; - public static final String STYLES_PARAMETER = "org.ajax4jsf.framework.HEADER_STYLES"; - public static final String RESPONSE_DATA_KEY = "_ajax:data"; - - /** - * Get instance of current AJAX Context. Instance get by - * {@link VariableResolver#resolveVariable(FacesContext, String)} for - * variable {@link AjaxContext#AJAX_CONTEXT_KEY} - * - * @return memento instance for current request - */ - public static AjaxContext getCurrentInstance() { - FacesContext context = FacesContext.getCurrentInstance(); - return getCurrentInstance(context); - } - - /** - * Get instance of current AJAX Context. Instance get by - * {@link VariableResolver#resolveVariable(FacesContext, String)} for - * variable {@link AjaxContext#AJAX_CONTEXT_KEY} - * - * @param context - * current FacesContext - * @return instance of AjaxContext. - */ - public static AjaxContext getCurrentInstance(FacesContext context) { - if (null == context) { - throw new NullPointerException("FacesContext is null"); - } - AjaxContext ajaxContext = (AjaxContext) context.getApplication() - .getVariableResolver().resolveVariable(context, - AJAX_CONTEXT_KEY); - if (null == ajaxContext) { - // TODO Create default implementation. -// ajaxContext = new AjaxContext(); -// context.getExternalContext().getRequestMap().put(AJAX_CONTEXT_KEY, -// ajaxContext); - } - return ajaxContext; - } - - public AjaxContext() { - super(); - } - - public abstract Map getResponseDataMap(); - - public abstract void setAjaxRequest(boolean b); - - public abstract boolean isSelfRender(); - - public abstract void setSelfRender(boolean b); - - public abstract String getSubmittedRegionClientId(FacesContext context); - - public abstract void saveViewState(FacesContext context) throws IOException; -} \ No newline at end of file Copied: trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxActionComponent.java (from rev 1448, trunk/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxActionComponent.java) =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxActionComponent.java (rev 0) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxActionComponent.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -0,0 +1,162 @@ +/** + * 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.component; + +import javax.faces.component.UICommand; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.event.AbortProcessingException; +import javax.faces.event.ActionEvent; +import javax.faces.event.FacesEvent; +import javax.faces.event.PhaseId; + +import org.ajax4jsf.context.AjaxContext; +import org.ajax4jsf.framework.ajax.AjaxComponent; +import org.ajax4jsf.framework.ajax.AjaxEvent; +import org.ajax4jsf.framework.ajax.AjaxListener; +import org.ajax4jsf.framework.ajax.AjaxSingleEvent; +import org.ajax4jsf.framework.ajax.AjaxSingleException; +import org.ajax4jsf.framework.ajax.AjaxSource; + + +/** + * @author shura (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.3 $ $Date: 2007/02/06 16:23:21 $ + * + */ +public abstract class AjaxActionComponent extends UICommand implements + AjaxComponent, AjaxSource { + + public static final String FOCUS_DATA_ID = "_A4J.AJAX.focus"; + + /* + * (non-Javadoc) + * + * @see javax.faces.component.UIComponentBase#broadcast(javax.faces.event.FacesEvent) + */ + public void broadcast(FacesEvent event) throws AbortProcessingException { + // Hack - throw exception to AjaxViewRoot, to fix state of all iterable components. + if (event instanceof AjaxSingleEvent) { + throw new AjaxSingleException(getSingleComponent()); + } + // perform default + super.broadcast(event); + if (event instanceof AjaxEvent) { + FacesContext context = getFacesContext(); + // complete re-Render fields. AjaxEvent deliver before render + // response. + setupReRender(context); + // Put data for send in response + Object data = getData(); + AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context); + if (null != data) { + ajaxContext.setResponseData(data); + } + String focus = getFocus(); + if (null != focus) { + // search for component in tree. + // TODO - use more pourful search, as in h:outputLabel component. + UIComponent focusComponent = findComponent(focus); + if(null != focusComponent){ + focus = focusComponent.getClientId(context); + } + ajaxContext.getResponseDataMap().put(FOCUS_DATA_ID, focus); + } + } + } + + /** + * Template method with old signature, for backward compability. + */ + protected void setupReRender() { + } + + /** + * Template methods for fill set of resions to render in subclasses. + * + * @param facesContext + * TODO + */ + protected void setupReRender(FacesContext facesContext) { + AjaxContext.getCurrentInstance(facesContext).addRegionsFromComponent( + this); + setupReRender(); + } + + /* + * (non-Javadoc) + * + * @see javax.faces.component.UIComponentBase#queueEvent(javax.faces.event.FacesEvent) + */ + public void queueEvent(FacesEvent event) { + if (event instanceof ActionEvent && event.getComponent() == this) { + if (isImmediate()) { + event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES); + } else if (isBypassUpdates()) { + event.setPhaseId(PhaseId.PROCESS_VALIDATIONS); + } else { + event.setPhaseId(PhaseId.INVOKE_APPLICATION); + } + getParent().queueEvent(event); + if(isAjaxSingle()){ + super.queueEvent(new AjaxSingleEvent(this)); + } + } else { + super.queueEvent(event); + } + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.framework.ajax.AjaxSource#addAjaxListener(org.ajax4jsf.framework.ajax.AjaxListener) + */ + public void addAjaxListener(AjaxListener listener) { + addFacesListener(listener); + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.framework.ajax.AjaxSource#getAjaxListeners() + */ + public AjaxListener[] getAjaxListeners() { + AjaxListener al[] = (AjaxListener[]) getFacesListeners(AjaxListener.class); + return (al); + + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.framework.ajax.AjaxSource#removeAjaxListener(org.ajax4jsf.framework.ajax.AjaxListener) + */ + public void removeAjaxListener(AjaxListener listener) { + removeFacesListener(listener); + + } + + protected UIComponent getSingleComponent(){ + return this; + } + +} Copied: trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxInputComponent.java (from rev 1448, trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxInputComponent.java) =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxInputComponent.java (rev 0) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxInputComponent.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -0,0 +1,81 @@ +/** + * 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.component; + +import javax.faces.component.EditableValueHolder; +import javax.faces.component.UIInput; +import javax.faces.context.FacesContext; +import javax.faces.event.AbortProcessingException; +import javax.faces.event.ActionEvent; +import javax.faces.event.FacesEvent; +import javax.faces.event.PhaseId; + +import org.ajax4jsf.context.AjaxContext; +import org.ajax4jsf.framework.ajax.AjaxComponent; +import org.ajax4jsf.framework.ajax.AjaxEvent; + + +/** + * Base class for all AJAX-enabled Input components + * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/06 16:23:21 $ + * + */ +public abstract class AjaxInputComponent extends UIInput implements AjaxComponent,EditableValueHolder { + + /* (non-Javadoc) + * @see javax.faces.component.UIComponentBase#broadcast(javax.faces.event.FacesEvent) + */ + public void broadcast(FacesEvent event) throws AbortProcessingException { + // perform default + super.broadcast(event); + if (event instanceof AjaxEvent) { + // complete re-Render fields. AjaxEvent deliver before render response. + setupReRender(); + } + } + /** + * Template methods for fill set of resions to render in subclasses. + */ + protected void setupReRender() { + FacesContext context = getFacesContext(); + AjaxContext.getCurrentInstance(context).addRegionsFromComponent(this); + + } + /* (non-Javadoc) + * @see javax.faces.component.UIComponentBase#queueEvent(javax.faces.event.FacesEvent) + */ + public void queueEvent(FacesEvent event) { + if (event instanceof ActionEvent && event.getComponent()==this) { + if (isImmediate()) { + event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES); + } else if (isBypassUpdates()) { + event.setPhaseId(PhaseId.PROCESS_VALIDATIONS); + }else { + event.setPhaseId(PhaseId.INVOKE_APPLICATION); + } + } + super.queueEvent(event); + } + + +} Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -52,6 +52,7 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.xmlfilter.BaseFilter; import org.ajax4jsf.framework.ajax.xmlfilter.FilterServletResponseWrapper; import org.ajax4jsf.framework.renderer.AjaxContainerRenderer; Deleted: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxInputComponent.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxInputComponent.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxInputComponent.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -1,77 +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.ajax; - -import javax.faces.component.EditableValueHolder; -import javax.faces.component.UIInput; -import javax.faces.context.FacesContext; -import javax.faces.event.AbortProcessingException; -import javax.faces.event.ActionEvent; -import javax.faces.event.FacesEvent; -import javax.faces.event.PhaseId; - - -/** - * Base class for all AJAX-enabled Input components - * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.2 $ $Date: 2007/02/06 16:23:21 $ - * - */ -public abstract class AjaxInputComponent extends UIInput implements AjaxComponent,EditableValueHolder { - - /* (non-Javadoc) - * @see javax.faces.component.UIComponentBase#broadcast(javax.faces.event.FacesEvent) - */ - public void broadcast(FacesEvent event) throws AbortProcessingException { - // perform default - super.broadcast(event); - if (event instanceof AjaxEvent) { - // complete re-Render fields. AjaxEvent deliver before render response. - setupReRender(); - } - } - /** - * Template methods for fill set of resions to render in subclasses. - */ - protected void setupReRender() { - FacesContext context = getFacesContext(); - AjaxContext.getCurrentInstance(context).addRegionsFromComponent(this); - - } - /* (non-Javadoc) - * @see javax.faces.component.UIComponentBase#queueEvent(javax.faces.event.FacesEvent) - */ - public void queueEvent(FacesEvent event) { - if (event instanceof ActionEvent && event.getComponent()==this) { - if (isImmediate()) { - event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES); - } else if (isBypassUpdates()) { - event.setPhaseId(PhaseId.PROCESS_VALIDATIONS); - }else { - event.setPhaseId(PhaseId.INVOKE_APPLICATION); - } - } - super.queueEvent(event); - } - - -} Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxRegionBrige.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxRegionBrige.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxRegionBrige.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -31,6 +31,7 @@ import javax.faces.event.AbortProcessingException; import javax.faces.event.FacesEvent; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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 19:11:11 UTC (rev 1448) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -32,6 +32,7 @@ import javax.faces.context.ResponseWriter; import javax.servlet.http.HttpServletResponse; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ViewHandlerWrapper; import org.ajax4jsf.framework.renderer.AjaxContainerRenderer; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewRoot.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewRoot.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewRoot.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -32,6 +32,7 @@ import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.renderer.AjaxContainerRenderer; import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.collections.Buffer; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/JsfOneOneInvoker.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/JsfOneOneInvoker.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/JsfOneOneInvoker.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -27,6 +27,8 @@ import javax.faces.component.UIViewRoot; import javax.faces.context.FacesContext; +import org.ajax4jsf.context.AjaxContext; + /** * @author shura * Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseXMLFilter.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseXMLFilter.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseXMLFilter.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -38,7 +38,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.ajax4jsf.framework.ajax.AjaxContext; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxViewHandler; import org.ajax4jsf.framework.renderer.AjaxContainerRenderer; import org.ajax4jsf.framework.util.message.Messages; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -29,8 +29,8 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxContainer; -import org.ajax4jsf.framework.ajax.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxEvent; import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxPhaseListener.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxPhaseListener.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxPhaseListener.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -32,7 +32,7 @@ import javax.faces.event.PhaseId; import javax.faces.event.PhaseListener; -import org.ajax4jsf.framework.ajax.AjaxContext; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -44,9 +44,9 @@ import javax.servlet.http.HttpServletResponse; import org.ajax4jsf.ajax.UILoadBundle; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxComponent; import org.ajax4jsf.framework.ajax.AjaxContainer; -import org.ajax4jsf.framework.ajax.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxSupport; import org.ajax4jsf.framework.ajax.AjaxViewRoot; import org.ajax4jsf.framework.ajax.JavaScriptParameter; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/ForceRender.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/ForceRender.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/ForceRender.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -24,7 +24,7 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.ajax.AjaxContext; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxEvent; import org.ajax4jsf.framework.ajax.AjaxListener; import org.ajax4jsf.framework.ajax.AjaxRenderEvent; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxCommandButton.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxCommandButton.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxCommandButton.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -21,7 +21,7 @@ package org.ajax4jsf.ajax; -import org.ajax4jsf.framework.ajax.AjaxActionComponent; +import org.ajax4jsf.component.AjaxActionComponent; /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxCommandLink.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxCommandLink.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxCommandLink.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -21,7 +21,7 @@ package org.ajax4jsf.ajax; -import org.ajax4jsf.framework.ajax.AjaxActionComponent; +import org.ajax4jsf.component.AjaxActionComponent; /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxForm.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxForm.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxForm.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -29,8 +29,8 @@ import javax.faces.event.AbortProcessingException; import javax.faces.event.FacesEvent; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxComponent; -import org.ajax4jsf.framework.ajax.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxEvent; import org.ajax4jsf.framework.ajax.AjaxListener; import org.ajax4jsf.framework.ajax.AjaxSource; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxFunction.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxFunction.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxFunction.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -21,7 +21,7 @@ package org.ajax4jsf.ajax; -import org.ajax4jsf.framework.ajax.AjaxActionComponent; +import org.ajax4jsf.component.AjaxActionComponent; /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxRegion.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxRegion.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxRegion.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -34,8 +34,8 @@ import javax.faces.event.AbortProcessingException; import javax.faces.event.FacesEvent; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxContainer; -import org.ajax4jsf.framework.ajax.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxContextImpl; import org.ajax4jsf.framework.ajax.AjaxListener; import org.ajax4jsf.framework.ajax.AjaxRegionBrige; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxSupport.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxSupport.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIAjaxSupport.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -28,7 +28,7 @@ import javax.faces.context.FacesContext; import javax.faces.el.ValueBinding; -import org.ajax4jsf.framework.ajax.AjaxActionComponent; +import org.ajax4jsf.component.AjaxActionComponent; import org.ajax4jsf.framework.ajax.AjaxSupport; import org.ajax4jsf.framework.ajax.EventValueBinding; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIInclude.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIInclude.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIInclude.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -33,7 +33,7 @@ import javax.faces.event.FacesListener; import javax.faces.event.PhaseId; -import org.ajax4jsf.framework.ajax.AjaxContext; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxOutput; import org.ajax4jsf.framework.ajax.ViewIdHolder; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIPoll.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIPoll.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIPoll.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -23,8 +23,8 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.ajax.AjaxActionComponent; -import org.ajax4jsf.framework.ajax.AjaxContext; +import org.ajax4jsf.component.AjaxActionComponent; +import org.ajax4jsf.context.AjaxContext; /** * Component for periodically call AJAX events on server ( poll actions ) Modified: trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIPush.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIPush.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/core/src/main/java/org/ajax4jsf/ajax/UIPush.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -28,8 +28,8 @@ import javax.faces.el.MethodBinding; import javax.servlet.http.HttpSession; -import org.ajax4jsf.framework.ajax.AjaxActionComponent; -import org.ajax4jsf.framework.ajax.AjaxContext; +import org.ajax4jsf.component.AjaxActionComponent; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.xmlfilter.PollEventsManager; /** Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/AjaxCommandRendererBase.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/AjaxCommandRendererBase.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/AjaxCommandRendererBase.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -30,7 +30,7 @@ import javax.faces.context.FacesContext; import javax.faces.event.ActionEvent; -import org.ajax4jsf.framework.ajax.AjaxContext; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxEvent; import org.ajax4jsf.framework.renderer.AjaxComponentRendererBase; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxOutputPanelRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxOutputPanelRenderer.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxOutputPanelRenderer.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -30,7 +30,7 @@ import javax.faces.context.ResponseWriter; import org.ajax4jsf.ajax.UIAjaxOutputPanel; -import org.ajax4jsf.framework.ajax.AjaxContext; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.renderer.RendererBase; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPageRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPageRenderer.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPageRenderer.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -30,8 +30,8 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxContainer; -import org.ajax4jsf.framework.ajax.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxViewRoot; import org.ajax4jsf.framework.ajax.xmlfilter.BaseFilter; import org.ajax4jsf.framework.renderer.AjaxContainerRenderer; Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -27,10 +27,10 @@ import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; +import org.ajax4jsf.component.AjaxActionComponent; import org.ajax4jsf.dnd.Draggable; import org.ajax4jsf.dnd.event.DragEvent; import org.ajax4jsf.dnd.event.DragListener; -import org.ajax4jsf.framework.ajax.AjaxActionComponent; import org.ajax4jsf.framework.ajax.AjaxEvent; /** Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -27,10 +27,10 @@ import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; +import org.ajax4jsf.component.AjaxActionComponent; import org.ajax4jsf.dnd.Dropzone; import org.ajax4jsf.dnd.event.DropEvent; import org.ajax4jsf.dnd.event.DropListener; -import org.ajax4jsf.framework.ajax.AjaxActionComponent; import org.ajax4jsf.framework.ajax.AjaxEvent; /** Modified: trunk/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java =================================================================== --- trunk/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -34,7 +34,7 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import org.ajax4jsf.framework.ajax.AjaxContext; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase; import org.ajax4jsf.framework.util.javascript.JSFunction; import org.richfaces.component.UIDropDownMenu; Modified: trunk/ui/menu-components/src/main/java/org/richfaces/component/UIMenuItem.java =================================================================== --- trunk/ui/menu-components/src/main/java/org/richfaces/component/UIMenuItem.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/menu-components/src/main/java/org/richfaces/component/UIMenuItem.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -23,7 +23,7 @@ import javax.faces.component.ActionSource; -import org.ajax4jsf.framework.ajax.AjaxActionComponent; +import org.ajax4jsf.component.AjaxActionComponent; import org.ajax4jsf.framework.ajax.AjaxComponent; import org.ajax4jsf.framework.ajax.AjaxSource; Modified: trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java =================================================================== --- trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -21,7 +21,7 @@ package org.richfaces.component; -import org.ajax4jsf.framework.ajax.AjaxActionComponent; +import org.ajax4jsf.component.AjaxActionComponent; import org.ajax4jsf.framework.ajax.AjaxComponent; import org.ajax4jsf.framework.ajax.AjaxSource; Modified: trunk/ui/suggestionbox/src/main/java/org/richfaces/component/UISuggestionBox.java =================================================================== --- trunk/ui/suggestionbox/src/main/java/org/richfaces/component/UISuggestionBox.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/suggestionbox/src/main/java/org/richfaces/component/UISuggestionBox.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -21,8 +21,8 @@ package org.richfaces.component; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxComponent; -import org.ajax4jsf.framework.ajax.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxEvent; import org.ajax4jsf.framework.ajax.AjaxListener; import org.ajax4jsf.framework.ajax.AjaxSource; Modified: trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java =================================================================== --- trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -21,7 +21,7 @@ package org.richfaces.renderkit.html; -import org.ajax4jsf.framework.ajax.AjaxContext; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.renderer.AjaxComponentRendererBase; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.RendererBase; Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java =================================================================== --- trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -21,7 +21,7 @@ package org.richfaces.component; -import org.ajax4jsf.framework.ajax.AjaxActionComponent; +import org.ajax4jsf.component.AjaxActionComponent; import org.ajax4jsf.framework.ajax.AjaxComponent; import org.ajax4jsf.framework.ajax.AjaxSource; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; Modified: trunk/ui/togglePanel/src/main/java/org/richfaces/component/UIToggleControl.java =================================================================== --- trunk/ui/togglePanel/src/main/java/org/richfaces/component/UIToggleControl.java 2007-07-03 19:11:11 UTC (rev 1448) +++ trunk/ui/togglePanel/src/main/java/org/richfaces/component/UIToggleControl.java 2007-07-03 20:06:53 UTC (rev 1449) @@ -31,7 +31,7 @@ import javax.faces.el.MethodBinding; import javax.faces.el.ValueBinding; -import org.ajax4jsf.framework.ajax.AjaxActionComponent; +import org.ajax4jsf.component.AjaxActionComponent; import org.ajax4jsf.framework.ajax.AjaxComponent; import org.ajax4jsf.framework.ajax.AjaxSource; import org.ajax4jsf.framework.renderer.AjaxRendererUtils;