[richfaces-svn-commits] JBoss Rich Faces SVN: r3086 - in trunk/ui/togglePanel/src/main: java/org/richfaces/renderkit/html and 1 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: a.izobov
Date: 2007-09-25 04:21:58 -0400 (Tue, 25 Sep 2007)
New Revision: 3086

Modified:
   trunk/ui/togglePanel/src/main/java/org/richfaces/component/UITogglePanel.java
   trunk/ui/togglePanel/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java
   trunk/ui/togglePanel/src/main/templates/togglePanel.jspx
Log:
http://jira.jboss.com/jira/browse/RF-935

Modified: trunk/ui/togglePanel/src/main/java/org/richfaces/component/UITogglePanel.java
===================================================================
--- trunk/ui/togglePanel/src/main/java/org/richfaces/component/UITogglePanel.java	2007-09-25 01:22:01 UTC (rev 3085)
+++ trunk/ui/togglePanel/src/main/java/org/richfaces/component/UITogglePanel.java	2007-09-25 08:21:58 UTC (rev 3086)
@@ -39,8 +39,14 @@
 	public static final String COMPONENT_FAMILY = "org.richfaces.TogglePanel";
     public static final String COMPONENT_TYPE = "org.richfaces.TogglePanel";
     
-    public abstract void setValue(Object  value);
-    public abstract Object getValue();
+    public Object getValue() {
+    	return super.getValue();
+    }
+    
+    public void setValue(Object value) {
+    	super.setValue(value);
+    }
+    
     public abstract void setInitialState(String  initialState);
     public abstract String getInitialState();
     public abstract void setStateOrder(String  stateOrder);

Modified: trunk/ui/togglePanel/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java
===================================================================
--- trunk/ui/togglePanel/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java	2007-09-25 01:22:01 UTC (rev 3085)
+++ trunk/ui/togglePanel/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java	2007-09-25 08:21:58 UTC (rev 3086)
@@ -152,6 +152,7 @@
 				out.endElement("div");
 			}
 		}
+		panel.setValue(state);
 	}
 
 	private static final String CLIENT_SCRIPT = "<script type=\"text/javascript\">TogglePanelManager.add(new TogglePanel(\"{0}\", $A([\"{1}\"]), \"{2}\"));</script>";
@@ -163,13 +164,13 @@
 		return true;
 	}
     
-    public void setValue(FacesContext context, UIComponent component) {
-        UITogglePanel panel = (UITogglePanel) component;
-        Object value = panel.getValue();
-        if (value == null) {
-            value = panel.getStateOrderList().size() > 0 
-            ? panel.getStateOrderList().get(0) : "";
-            panel.setValue(value);
-        }
-    }
+//    public void setValue(FacesContext context, UIComponent component) {
+//        UITogglePanel panel = (UITogglePanel) component;
+//        Object value = panel.getValue();
+//        if (value == null) {
+//            value = panel.getStateOrderList().size() > 0 
+//            ? panel.getStateOrderList().get(0) : "";
+//            panel.setValue(value);
+//        }
+//    }
 }
\ No newline at end of file

Modified: trunk/ui/togglePanel/src/main/templates/togglePanel.jspx
===================================================================
--- trunk/ui/togglePanel/src/main/templates/togglePanel.jspx	2007-09-25 01:22:01 UTC (rev 3085)
+++ trunk/ui/togglePanel/src/main/templates/togglePanel.jspx	2007-09-25 08:21:58 UTC (rev 3086)
@@ -21,6 +21,5 @@
 	<div id="#{clientId}">
 		<vcp:body/>
 		<f:call name="handleFacets"/>
-		<f:call name="setValue"/>
 	</div>
 </f:root>
\ No newline at end of file