7:46 p.m.
Author: alexsmirnov
Date: 2008-08-15 20:46:23 -0400 (Fri, 15 Aug 2008)
New Revision: 10123
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java
trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java
trunk/framework/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java
trunk/framework/impl/src/main/resources/META-INF/faces-config.xml
trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
trunk/ui/assembly/pom.xml
trunk/ui/extendedDataTable/generatescript.xml
Log:
Remove duplicate calls in the ViewHandler. Fix JavaScript modules sequence for a assembled
script.
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java
===================================================================
---
trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java 2008-08-15
19:38:08 UTC (rev 10122)
+++
trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java 2008-08-16
00:46:23 UTC (rev 10123)
@@ -39,6 +39,7 @@
import javax.faces.FacesException;
import javax.faces.FactoryFinder;
import javax.faces.application.StateManager;
+import javax.faces.application.StateManager.SerializedView;
import javax.faces.component.UIComponentBase;
import javax.faces.component.UIViewRoot;
import javax.faces.context.ExternalContext;
@@ -233,6 +234,32 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see
javax.faces.application.StateManager#writeState(javax.faces.context.FacesContext,
+ * javax.faces.application.StateManager.SerializedView)
+ */
+ @SuppressWarnings("deprecation")
+ public void writeState(FacesContext context, SerializedView state)
+ throws IOException {
+ RenderKit renderKit = getRenderKit(context);
+ ResponseStateManager responseStateManager = renderKit
+ .getResponseStateManager();
+ Object[] stateArray;
+ if(null == state.getState() && null == state.getStructure()){
+ // MyFaces https://issues.apache.org/jira/browse/MYFACES-1753 hack
+ stateArray = new Object[]{getLogicalViewId(context),null};
+ } else {
+ stateArray = new Object[] {
+ state.getStructure(),state.getState() };
+ }
+ writeState(context, responseStateManager, stateArray);
+ if (_log.isDebugEnabled()) {
+ _log.debug("Write view state to the response");
+ }
+ }
+
/**
* @param context
* @param state
@@ -353,32 +380,6 @@
/*
* (non-Javadoc)
*
- * @see
javax.faces.application.StateManager#writeState(javax.faces.context.FacesContext,
- * javax.faces.application.StateManager.SerializedView)
- */
- @SuppressWarnings("deprecation")
- public void writeState(FacesContext context, SerializedView state)
- throws IOException {
- RenderKit renderKit = getRenderKit(context);
- ResponseStateManager responseStateManager = renderKit
- .getResponseStateManager();
- Object[] stateArray;
- if(null == state.getState() && null == state.getStructure()){
- // MyFaces https://issues.apache.org/jira/browse/MYFACES-1753 hack
- stateArray = new Object[]{getLogicalViewId(context),null};
- } else {
- stateArray = new Object[] {
- state.getStructure(),state.getState() };
- }
- writeState(context, responseStateManager, stateArray);
- if (_log.isDebugEnabled()) {
- _log.debug("Write view state to the response");
- }
- }
-
- /*
- * (non-Javadoc)
- *
* @see
javax.faces.application.StateManager#restoreView(javax.faces.context.FacesContext,
* java.lang.String, java.lang.String)
*/
@@ -419,14 +420,6 @@
}
- protected Object[] restoreStateFromSession(FacesContext context,
- String viewId, String renderKitId) {
- String id = restoreLogicalViewId(context, viewId, renderKitId);
- StateHolder stateHolder = getStateHolder(context);
- Object[] restoredState = stateHolder.getState(viewId, id);
- return restoredState;
- }
-
@SuppressWarnings("deprecation")
public SerializedView saveSerializedView(FacesContext context) {
Object[] stateViewArray;
@@ -451,7 +444,24 @@
/**
* @param context
* @return
+ * @see
javax.faces.application.StateManager#isSavingStateInClient(javax.faces.context.FacesContext)
*/
+ public boolean isSavingStateInClient(FacesContext context) {
+ return parent.isSavingStateInClient(context);
+ }
+
+ protected Object[] restoreStateFromSession(FacesContext context,
+ String viewId, String renderKitId) {
+ String id = restoreLogicalViewId(context, viewId, renderKitId);
+ StateHolder stateHolder = getStateHolder(context);
+ Object[] restoredState = stateHolder.getState(viewId, id);
+ return restoredState;
+ }
+
+ /**
+ * @param context
+ * @return
+ */
protected Object[] buildViewState(FacesContext context) {
Object[] viewStateArray = null;
UIViewRoot viewRoot = context.getViewRoot();
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java
===================================================================
---
trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java 2008-08-15
19:38:08 UTC (rev 10122)
+++
trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java 2008-08-16
00:46:23 UTC (rev 10123)
@@ -98,13 +98,13 @@
riRoot = facesContext.getViewRoot();
} else {
riRoot = super.createView(facesContext, viewId);
+ riRoot.addPhaseListener(new RenderPhaseComponentListener());
// Reset ajax request status for a navigation case.
if(null != facesContext.getViewRoot()){
ajaxContext.setAjaxRequest(false);
}
}
- riRoot.addPhaseListener(new RenderPhaseComponentListener());
return riRoot;
}
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java
===================================================================
---
trunk/framework/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java 2008-08-15
19:38:08 UTC (rev 10122)
+++
trunk/framework/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java 2008-08-16
00:46:23 UTC (rev 10123)
@@ -61,7 +61,7 @@
}
LifecycleFactory factory = (LifecycleFactory)
FactoryFinder.getFactory(FactoryFinder.LIFECYCLE_FACTORY);
- for(Iterator iter = factory.getLifecycleIds(); iter.hasNext(); ) {
+ for(Iterator<String> iter = factory.getLifecycleIds(); iter.hasNext();
) {
Lifecycle lifecycle = factory.getLifecycle((String) iter.next());
lifecycle.removePhaseListener(this);
}
Modified: trunk/framework/impl/src/main/resources/META-INF/faces-config.xml
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/faces-config.xml 2008-08-15 19:38:08
UTC (rev 10122)
+++ trunk/framework/impl/src/main/resources/META-INF/faces-config.xml 2008-08-16 00:46:23
UTC (rev 10123)
@@ -5,14 +5,16 @@
version="1.2">
<factory>
<render-kit-factory>org.ajax4jsf.renderkit.ChameleonRenderKitFactory</render-kit-factory>
+ <!--
<lifecycle-factory>org.ajax4jsf.application.DebugLifecycleFactory</lifecycle-factory>
+ -->
</factory>
<application>
<!--
<variable-resolver>org.richfaces.skin.SkinVariableResolver</variable-resolver>
<property-resolver>org.richfaces.skin.SkinPropertyResolver</property-resolver>
+ <view-handler>org.ajax4jsf.application.AjaxViewHandler</view-handler>
-->
- <view-handler>org.ajax4jsf.application.AjaxViewHandler</view-handler>
<state-manager>org.ajax4jsf.application.AjaxStateManager</state-manager>
</application>
<lifecycle>
Modified: trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2008-08-15 19:38:08 UTC
(rev 10122)
+++ trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2008-08-16 00:46:23 UTC
(rev 10123)
@@ -54,11 +54,11 @@
<context-param>
<param-name>org.richfaces.LoadStyleStrategy</param-name>
- <param-value>DEFAULT</param-value>
+ <param-value>ALL</param-value>
</context-param>
<context-param>
<param-name>org.richfaces.LoadScriptStrategy</param-name>
- <param-value>DEFAULT</param-value>
+ <param-value>ALL</param-value>
</context-param>
<filter>
Modified: trunk/ui/assembly/pom.xml
===================================================================
--- trunk/ui/assembly/pom.xml 2008-08-15 19:38:08 UTC (rev 10122)
+++ trunk/ui/assembly/pom.xml 2008-08-16 00:46:23 UTC (rev 10123)
@@ -202,6 +202,9 @@
<include>
${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/inplaceselect-min.js
</include>
+ <include>
+ ${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/common-scrollable-data-table-min.js
+ </include>
<include>**/*-min.js</include>
</includes>
<!-- files to exclude, path relative to output's directory -->
Modified: trunk/ui/extendedDataTable/generatescript.xml
===================================================================
--- trunk/ui/extendedDataTable/generatescript.xml 2008-08-15 19:38:08 UTC (rev 10122)
+++ trunk/ui/extendedDataTable/generatescript.xml 2008-08-16 00:46:23 UTC (rev 10123)
@@ -35,7 +35,7 @@
<property name="gen-script-full-name"
value="${target-dir}/${script-path}/${gen-script-name}"></property>
<concat append="false" binary="false"
destfile="${gen-script-full-name}">
<filelist dir="${resources-dir}">
- <file name="/ClientUI/controls/dataTable/ExtendedDataTable.js"/>
+ <file name="/ClientUI/controls/datatable/ExtendedDataTable.js"/>
<file
name="/ClientUI/controls/datatable/ExtendedDataTableHeader.js"/>
<file
name="/ClientUI/controls/datatable/ExtendedDataTableSelection.js"/>
</filelist>