Author: Alex.Kolonitsky Date: 2010-08-18 12:47:14 -0400 (Wed, 18 Aug 2010) New Revision: 18767 Modified: trunk/examples/output-demo/src/main/java/org/richfaces/TogglePanelBean.java trunk/examples/output-demo/src/main/webapp/examples/togglePanel-ajax.xhtml trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java Log: RF-9014 Toggle panel: active item cannot be an expression Modified: trunk/examples/output-demo/src/main/java/org/richfaces/TogglePanelBean.java =================================================================== --- trunk/examples/output-demo/src/main/java/org/richfaces/TogglePanelBean.java 2010-08-18 16:22:19 UTC (rev 18766) +++ trunk/examples/output-demo/src/main/java/org/richfaces/TogglePanelBean.java 2010-08-18 16:47:14 UTC (rev 18767) @@ -13,6 +13,8 @@ private String name; + private String value = "name2"; + public TogglePanelBean() { LOGGER.info("post construct: initialize"); name = "John"; @@ -26,6 +28,15 @@ this.name = name; } + public String getValue() { + System.out.println("value = " + value); + return value; + } + + public void setValue(String value) { + this.value = value; + } + public void itemChangeActionListener() { LOGGER.info("TogglePanelBean.itemChangeActionListener"); } Modified: trunk/examples/output-demo/src/main/webapp/examples/togglePanel-ajax.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/togglePanel-ajax.xhtml 2010-08-18 16:22:19 UTC (rev 18766) +++ trunk/examples/output-demo/src/main/webapp/examples/togglePanel-ajax.xhtml 2010-08-18 16:47:14 UTC (rev 18767) @@ -14,7 +14,7 @@ <ui:define name="body"> <f:view> <h:form id="f"> - <pn:togglePanel id="panel" activeItem="name1" switchType="ajax" + <pn:togglePanel id="panel" activeItem="#{togglePanelBean.value}" switchType="ajax" itemChangeListener="#{togglePanelBean.itemChangeActionListener}" > <pn:togglePanelItem name="name1">hello name1</pn:togglePanelItem> <pn:togglePanelItem name="name2">hello name2</pn:togglePanelItem> Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2010-08-18 16:22:19 UTC (rev 18766) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2010-08-18 16:47:14 UTC (rev 18767) @@ -537,6 +537,15 @@ setValue(value); } + @Override + public void setValueExpression(String name, ValueExpression binding) { + if ("activeItem".equals(name)) { + super.setValueExpression("value", binding); + } else { + super.setValueExpression(name, binding); + } + } + public abstract SwitchType getSwitchType(); public abstract boolean isBypassUpdates();