[richfaces-svn-commits] JBoss Rich Faces SVN: r452 - in trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces: renderkit/html and 1 other directory.

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

Author: d.bulahov
Date: 2007-04-19 10:42:14 -0400 (Thu, 19 Apr 2007)
New Revision: 452

Modified:
   trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java
   trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java
Log:
http://jira.jboss.com/jira/browse/RF-107

Modified: trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java
===================================================================
--- trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java	2007-04-19 14:40:54 UTC (rev 451)
+++ trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java	2007-04-19 14:42:14 UTC (rev 452)
@@ -66,12 +66,13 @@
         return true;
     }
 
-    public void broadcast(FacesEvent facesEvent) throws AbortProcessingException {
-        FacesContext facesContext = FacesContext.getCurrentInstance();
-        if (AjaxRendererUtils.isAjaxRequest(facesContext) && this.getSwitchType().equals(AJAX_SWITCH_TYPE)) {
-            AjaxRendererUtils.addRegionByName(facesContext,
-                    this,
-                    this.getId());
-        }
-    }
+    //public void broadcast(FacesEvent facesEvent) throws AbortProcessingException {
+    //   super.broadcast(facesEvent);
+    //    FacesContext facesContext = FacesContext.getCurrentInstance();
+    //    if (AjaxRendererUtils.isAjaxRequest(facesContext) && this.getSwitchType().equals(AJAX_SWITCH_TYPE)) {
+    //        AjaxRendererUtils.addRegionByName(facesContext,
+    //                this,
+    //                this.getId());
+    //    }
+    //}
 }

Modified: trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java
===================================================================
--- trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java	2007-04-19 14:40:54 UTC (rev 451)
+++ trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java	2007-04-19 14:42:14 UTC (rev 452)
@@ -70,7 +70,7 @@
         if (clnId != null) {
             // enqueue event here for this component or for component with Id
             // taken fro forId attribute
-
+            
             String switchType = panel.getSwitchType();
             if (!(UISimpleTogglePanel.CLIENT_SWITCH_TYPE.equals(switchType))) {
 
@@ -81,28 +81,39 @@
                     //xxxx by nick - denis - use constants, please!
                     panel.setOpened(UISimpleTogglePanel.EXPANDED);
                 }
-
+                SimpleToggleEvent event = new SimpleToggleEvent(panel, (panel.isOpened()));
+                if (panel.isImmediate()) {
+                    event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
+                } else {
+                    event.setPhaseId(PhaseId.INVOKE_APPLICATION);
+                }
+                event.queue();
+                
             } else {
+                if (panel.isOpened()!= new Boolean((String) clnId).booleanValue()){
+                    SimpleToggleEvent event = new SimpleToggleEvent(panel, (panel.isOpened()));
+                    if (panel.isImmediate()) {
+                        event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
+                    } else {
+                        event.setPhaseId(PhaseId.INVOKE_APPLICATION);
+                    }
+                    event.queue();
+                }                
                 panel.setOpened(new Boolean((String) clnId).booleanValue());
             }
+            
 
 
-            SimpleToggleEvent event = new SimpleToggleEvent(panel, (panel.isOpened()));
-            if (panel.isImmediate()) {
-                event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
-            } else {
-                event.setPhaseId(PhaseId.INVOKE_APPLICATION);
-            }
-            event.queue();
-
-            //xxx by nick - denis - same as in ToggleControlRenderer
-            if (!UISimpleTogglePanel.AJAX_SWITCH_TYPE.equals(panel.getSwitchType()))
-            {
-                ActionEvent actionEvent = new ActionEvent(component);
-                component.queueEvent(actionEvent);
-            }
         }
+        
+        
+         if (AjaxRendererUtils.isAjaxRequest(context) && panel.getSwitchType().equals(UISimpleTogglePanel.AJAX_SWITCH_TYPE)) {
+                AjaxRendererUtils.addRegionByName(context,
+                        panel,
+                        panel.getId());
+         }
 
+
     }
 
     public String getdivdisplay(FacesContext context, UIComponent component) {