Author: ishabalov Date: 2007-07-24 22:03:59 -0400 (Tue, 24 Jul 2007) New Revision: 1834 Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragIndicator.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/use-with-data-table.xhtml Log: Added tab state saving code Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java 2007-07-24 18:20:16 UTC (rev 1833) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java 2007-07-25 02:03:59 UTC (rev 1834) @@ -18,10 +18,19 @@ private List components = null; private ComponentDescriptor currentComponent; private List componentGroups = null; + private Object activeTab; + + public Object getActiveTab() { + return activeTab; + } + public void setActiveTab(Object activeTab) { + this.activeTab = activeTab; + } public ComponentDescriptor getCurrentComponent() { String id = getComponentParam(); if (id!=null) { + setActiveTab(null); setCurrentComponent(findComponentById(id)); } return currentComponent; Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam.xhtml 2007-07-24 18:20:16 UTC (rev 1833) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam.xhtml 2007-07-25 02:03:59 UTC (rev 1834) @@ -7,7 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Action Parameter</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> + <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> <rich:tab label="Usage"> <ui:include src="/richfaces/actionparam/usage.xhtml"/> </rich:tab> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes.xhtml 2007-07-24 18:20:16 UTC (rev 1833) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes.xhtml 2007-07-25 02:03:59 UTC (rev 1834) @@ -7,7 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Attributes</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> + <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> <rich:tab label="Usage"> <ui:include src="/richfaces/ajaxAttributes/usage.xhtml"/> </rich:tab> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton.xhtml 2007-07-24 18:20:16 UTC (rev 1833) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton.xhtml 2007-07-25 02:03:59 UTC (rev 1834) @@ -7,7 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Form</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> + <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> <rich:tab label="Usage"> <ui:include src="/richfaces/commandButton/usage.xhtml"/> </rich:tab> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider.xhtml 2007-07-24 18:20:16 UTC (rev 1833) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider.xhtml 2007-07-25 02:03:59 UTC (rev 1834) @@ -7,7 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Data FIlter Slider</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> + <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> <rich:tab label="Usage"> <ui:include src="/richfaces/dataFilterSlider/usage.xhtml"/> </rich:tab> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml 2007-07-24 18:20:16 UTC (rev 1833) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml 2007-07-25 02:03:59 UTC (rev 1834) @@ -7,7 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Data table</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> + <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> <rich:tab label="Usage"> <ui:include src="/richfaces/dataTable/usage.xhtml"/> </rich:tab> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller.xhtml 2007-07-24 18:20:16 UTC (rev 1833) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller.xhtml 2007-07-25 02:03:59 UTC (rev 1834) @@ -7,7 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Data Table Scroller</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> + <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> <rich:tab label="Usage"> <ui:include src="/richfaces/dataTableScroller/usage.xhtml"/> </rich:tab> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragIndicator.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragIndicator.xhtml 2007-07-24 18:20:16 UTC (rev 1833) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragIndicator.xhtml 2007-07-25 02:03:59 UTC (rev 1834) @@ -7,7 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - Drag-n-Drop. Drag Indicator</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> + <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> <rich:tab label="Usage"> <ui:include src="/richfaces/dragSupport/usage.xhtml"/> </rich:tab> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel.xhtml 2007-07-24 18:20:16 UTC (rev 1833) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel.xhtml 2007-07-25 02:03:59 UTC (rev 1834) @@ -9,7 +9,7 @@ <ui:define name="title">RichFaces - Open Source Rich JSF Components - Panel</ui:define> <ui:define name="current">panel</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> + <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> <rich:tab label="Usage"> <ui:include src="/richfaces/panel/usage.xhtml"/> </rich:tab> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel.xhtml 2007-07-24 18:20:16 UTC (rev 1833) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel.xhtml 2007-07-25 02:03:59 UTC (rev 1834) @@ -7,7 +7,7 @@ <ui:composition template="/templates/main.xhtml"> <ui:define name="title">RichFaces - Open Source Rich JSF Components - TabPanel</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> + <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> <rich:tab label="Usage"> <ui:include src="/richfaces/tabPanel/usage.xhtml"/> </rich:tab> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/use-with-data-table.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/use-with-data-table.xhtml 2007-07-24 18:20:16 UTC (rev 1833) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/use-with-data-table.xhtml 2007-07-25 02:03:59 UTC (rev 1834) @@ -50,7 +50,7 @@ <h:outputText value="Make"/> </f:facet> <h:outputText id="make" value="#{vehicle.make}" > - <rich:toolTip direction="top-right" mode="ajax" styleClass="tooltip"> + <rich:toolTip direction="top-right" mode="ajax" delay="1000" styleClass="tooltip" immediate="true"> <a4j:actionparam name="key" value="#{row}" assignTo="#{toolTipData.currentVehicleIndex}" /> <f:facet name="defaultContent"> <strong>Wait...</strong> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.xhtml 2007-07-24 18:20:16 UTC (rev 1833) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.xhtml 2007-07-25 02:03:59 UTC (rev 1834) @@ -9,7 +9,7 @@ <ui:define name="title">RichFaces - Open Source Rich JSF Components - PanelBar</ui:define> <ui:define name="current">panel</ui:define> <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> + <rich:tabPanel switchType="ajax" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> <rich:tab label="Usage"> <ui:include src="/richfaces/toolTip/usage.xhtml"/> </rich:tab>