Author: alexsmirnov Date: 2007-06-29 13:01:45 -0400 (Fri, 29 Jun 2007) New Revision: 1414 Added: branches/refactor1/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxSingleEvent.java branches/refactor1/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxSingleException.java branches/refactor1/framework/api/src/main/java/org/ajax4jsf/framework/util/message/ Modified: branches/refactor1/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/UIDataAdaptor.java branches/refactor1/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxActionComponent.java branches/refactor1/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/AjaxSubmitFunction.java Log: continue refactoring Modified: branches/refactor1/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/UIDataAdaptor.java =================================================================== --- branches/refactor1/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/UIDataAdaptor.java 2007-06-29 16:49:34 UTC (rev 1413) +++ branches/refactor1/framework/api/src/main/java/org/ajax4jsf/ajax/repeat/UIDataAdaptor.java 2007-06-29 17:01:45 UTC (rev 1414) @@ -362,7 +362,8 @@ AjaxRenderer childrenRenderer = (AjaxRenderer) renderer; childrenRenderer.encodeAjaxChildren(context, this, path, ids, renderedAreas); - } else { + } + /*else { // Use simple ajax children encoding for iterate other keys. final AjaxRenderer childrenRenderer = getChildrenRenderer(); final String childrenPath = path + getId() + NamingContainer.SEPARATOR_CHAR; @@ -394,7 +395,7 @@ } else { iterate(context, ajaxVisitor, null); } - } + }*/ } /** @@ -410,21 +411,21 @@ * * @return */ - protected AjaxRenderer getChildrenRenderer() { - if (_childrenRenderer == null) { - _childrenRenderer = new AjaxChildrenRenderer() { +// protected AjaxRenderer getChildrenRenderer() { +// if (_childrenRenderer == null) { +// _childrenRenderer = new AjaxChildrenRenderer() { +// +// protected Class getComponentClass() { +// return UIDataAdaptor.class; +// } +// +// }; +// +// } +// +// return _childrenRenderer; +// } - protected Class getComponentClass() { - return UIDataAdaptor.class; - } - - }; - - } - - return _childrenRenderer; - } - /** * @return Set of values for clientId's of this component, for wich was * invoked "encode" methods. Modified: branches/refactor1/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxActionComponent.java =================================================================== --- branches/refactor1/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxActionComponent.java 2007-06-29 16:49:34 UTC (rev 1413) +++ branches/refactor1/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxActionComponent.java 2007-06-29 17:01:45 UTC (rev 1414) @@ -29,7 +29,6 @@ import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; -import org.ajax4jsf.framework.renderer.AjaxRendererUtils; /** * @author shura (latest modification by $Author: alexsmirnov $) Copied: branches/refactor1/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxSingleEvent.java (from rev 1393, branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxSingleEvent.java) =================================================================== --- branches/refactor1/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxSingleEvent.java (rev 0) +++ branches/refactor1/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxSingleEvent.java 2007-06-29 17:01:45 UTC (rev 1414) @@ -0,0 +1,40 @@ +/** + * + */ +package org.ajax4jsf.framework.ajax; + +import javax.faces.component.UIComponent; +import javax.faces.event.FacesEvent; +import javax.faces.event.FacesListener; +import javax.faces.event.PhaseId; + +/** + * @author asmirnov + * + */ +public class AjaxSingleEvent extends FacesEvent { + + /** + * @param arg0 + */ + public AjaxSingleEvent(UIComponent arg0) { + super(arg0); + } + + /* (non-Javadoc) + * @see javax.faces.event.FacesEvent#isAppropriateListener(javax.faces.event.FacesListener) + */ + public boolean isAppropriateListener(FacesListener arg0) { + return false; + } + + /* (non-Javadoc) + * @see javax.faces.event.FacesEvent#processListener(javax.faces.event.FacesListener) + */ + public void processListener(FacesListener arg0) { + } + + public PhaseId getPhaseId() { + return PhaseId.APPLY_REQUEST_VALUES; + } +} Copied: branches/refactor1/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxSingleException.java (from rev 1393, branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxSingleException.java) =================================================================== --- branches/refactor1/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxSingleException.java (rev 0) +++ branches/refactor1/framework/api/src/main/java/org/ajax4jsf/framework/ajax/AjaxSingleException.java 2007-06-29 17:01:45 UTC (rev 1414) @@ -0,0 +1,31 @@ +/** + * + */ +package org.ajax4jsf.framework.ajax; + +import javax.faces.component.UIComponent; + +/** + * @author asmirnov + * + */ +public class AjaxSingleException extends RuntimeException { + + private UIComponent component; + + /** + * @param component + */ + public AjaxSingleException(UIComponent componemt) { +// super(); + this.component = componemt; + } + + /** + * @return the component + */ + public UIComponent getComponent() { + return component; + } + +} Modified: branches/refactor1/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/AjaxSubmitFunction.java =================================================================== --- branches/refactor1/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/AjaxSubmitFunction.java 2007-06-29 16:49:34 UTC (rev 1413) +++ branches/refactor1/framework/api/src/main/java/org/ajax4jsf/framework/util/javascript/AjaxSubmitFunction.java 2007-06-29 17:01:45 UTC (rev 1414) @@ -26,7 +26,6 @@ import javax.faces.component.UIComponent; -import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -57,7 +56,7 @@ */ public static final String LIMITTOLIST_ATTR_NAME = "limitToList"; - private static Log log = LogFactory.getLog(AjaxRendererUtils.class); + private static Log log = LogFactory.getLog(AjaxSubmitFunction.class); public static final String AJAX_REGIONS_ATTRIBUTE = "reRender"; Copied: branches/refactor1/framework/api/src/main/java/org/ajax4jsf/framework/util/message (from rev 1393, branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/util/message)