Author: abelevich
Date: 2008-08-01 11:15:35 -0400 (Fri, 01 Aug 2008)
New Revision: 9865
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java
Log:
fix callback function calling
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java 2008-08-01
14:54:54 UTC (rev 9864)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java 2008-08-01
15:15:35 UTC (rev 9865)
@@ -47,7 +47,6 @@
import org.ajax4jsf.Messages;
import org.ajax4jsf.context.AjaxContext;
-import org.ajax4jsf.context.AjaxContextImpl;
import org.ajax4jsf.context.InvokerCallback;
import org.ajax4jsf.context.ViewIdHolder;
import org.ajax4jsf.event.AjaxListener;
@@ -222,7 +221,7 @@
if (ajaxContext.isAjaxRequest() && submittedRegionClientId != null &&
!submittedRegionClientId.equals(JS_NULL)
&& !submittedRegionClientId.equals(getClientId(context))) {
- invokeOnComponent(context, submittedRegionClientId, callback);
+ invokeOnComponent(context, submittedRegionClientId, new
InvokerCallbackWrapper(callback));
} else {
// For a root region, call invokeRoot method, then process all
// facets and children by invoke method.
@@ -239,11 +238,12 @@
callback.invokeContextCallback(context, iter.next());
}
} else {
- invokeOnComponent(context, ajaxSingleClientId, callback);
+ InvokerCallback invokerCallback = new InvokerCallbackWrapper(callback);
+ invokeOnComponent(context, ajaxSingleClientId, invokerCallback);
Set<String> areasToProcess = ajaxContext.getAjaxAreasToProcess();
if(null != areasToProcess){
for (String areaId : areasToProcess) {
- invokeOnComponent(context, areaId, callback);
+ invokeOnComponent(context, areaId, invokerCallback);
}
}
}
@@ -406,7 +406,7 @@
public void processDecodes(FacesContext context) {
if (context == null)
throw new NullPointerException("context");
- processPhase(context, PhaseId.APPLY_REQUEST_VALUES, new
InvokerCallbackWrapper(_decodeInvoker));
+ processPhase(context, PhaseId.APPLY_REQUEST_VALUES, _decodeInvoker);
}
private InvokerCallback _updatesInvoker = new InvokerCallback() {
@@ -429,7 +429,7 @@
public void processUpdates(FacesContext context) {
if (context == null)
throw new NullPointerException("context");
- processPhase(context, PhaseId.UPDATE_MODEL_VALUES, new
InvokerCallbackWrapper(_updatesInvoker));
+ processPhase(context, PhaseId.UPDATE_MODEL_VALUES, _updatesInvoker);
}
private InvokerCallback _validatorsInvoker = new InvokerCallback() {
@@ -452,7 +452,7 @@
public void processValidators(FacesContext context) {
if (context == null)
throw new NullPointerException("context");
- processPhase(context, PhaseId.PROCESS_VALIDATIONS, new
InvokerCallbackWrapper(_validatorsInvoker));
+ processPhase(context, PhaseId.PROCESS_VALIDATIONS, _validatorsInvoker);
}
/*
Show replies by date