Author: sergeyhalipov Date: 2007-09-19 09:33:19 -0400 (Wed, 19 Sep 2007) New Revision: 3000 Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuGroup.java trunk/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuItem.java Log: http://jira.jboss.com/jira/browse/RF-967 Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuGroup.java =================================================================== --- trunk/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuGroup.java 2007-09-19 13:13:37 UTC (rev 2999) +++ trunk/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuGroup.java 2007-09-19 13:33:19 UTC (rev 3000) @@ -22,7 +22,6 @@ package org.richfaces.component; import javax.faces.component.ActionSource; -import javax.faces.component.UIInput; import javax.faces.context.FacesContext; import javax.faces.convert.BooleanConverter; import javax.faces.el.MethodBinding; @@ -32,10 +31,9 @@ import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; -import org.ajax4jsf.context.AjaxContext; -import org.ajax4jsf.event.AjaxEvent; +import org.ajax4jsf.component.AjaxInputComponent; -public abstract class UIPanelMenuGroup extends UIInput implements ActionSource{ +public abstract class UIPanelMenuGroup extends AjaxInputComponent implements ActionSource{ public static final String COMPONENT_TYPE = "org.richfaces.panelMenuGroup"; @@ -164,9 +162,6 @@ if (listener != null) { listener.processAction((ActionEvent) event); } - } else if (event instanceof AjaxEvent) { - FacesContext context = getFacesContext(); - AjaxContext.getCurrentInstance(context).addRegionsFromComponent(this); } } } Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuItem.java =================================================================== --- trunk/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuItem.java 2007-09-19 13:13:37 UTC (rev 2999) +++ trunk/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuItem.java 2007-09-19 13:33:19 UTC (rev 3000) @@ -21,16 +21,9 @@ package org.richfaces.component; -import javax.faces.component.UICommand; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.event.AbortProcessingException; -import javax.faces.event.FacesEvent; +import org.ajax4jsf.component.AjaxActionComponent; -import org.ajax4jsf.context.AjaxContext; -import org.ajax4jsf.event.AjaxEvent; - -public abstract class UIPanelMenuItem extends UICommand { +public abstract class UIPanelMenuItem extends AjaxActionComponent { public static final String COMPONENT_TYPE = "org.richfaces.panelMenuItem"; @@ -66,15 +59,4 @@ public abstract void setName(String string); public abstract String getName(); - /* (non-Javadoc) - * @see javax.faces.component.UIComponentBase#broadcast(javax.faces.event.FacesEvent) - */ - public void broadcast(FacesEvent event) throws AbortProcessingException { - super.broadcast(event); - if (event instanceof AjaxEvent) { - FacesContext context = getFacesContext(); - AjaxContext.getCurrentInstance(context).addRegionsFromComponent(this); - } - } - }