[richfaces-svn-commits] JBoss Rich Faces SVN: r3047 - in branches/3.1.x/ui/panelmenu/src/main: resources/org/richfaces/renderkit/html/css and 1 other directory.

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

Author: sergeyhalipov
Date: 2007-09-21 10:00:06 -0400 (Fri, 21 Sep 2007)
New Revision: 3047

Modified:
   branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuGroup.java
   branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuItem.java
   branches/3.1.x/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss
Log:
Add fixes for RF-901, RF-967 and RF-903 to branch 3.1.1

Modified: branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuGroup.java
===================================================================
--- branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuGroup.java	2007-09-21 13:58:53 UTC (rev 3046)
+++ branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuGroup.java	2007-09-21 14:00:06 UTC (rev 3047)
@@ -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: branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuItem.java
===================================================================
--- branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuItem.java	2007-09-21 13:58:53 UTC (rev 3046)
+++ branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuItem.java	2007-09-21 14:00:06 UTC (rev 3047)
@@ -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);
-		}
-	}
-
 }

Modified: branches/3.1.x/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss
===================================================================
--- branches/3.1.x/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss	2007-09-21 13:58:53 UTC (rev 3046)
+++ branches/3.1.x/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss	2007-09-21 14:00:06 UTC (rev 3047)
@@ -7,6 +7,7 @@
 	<f:verbatim>
 		.dr-pmenu-top-group {
 			height: 20px;
+			width: 100%;
 			background-repeat: repeat-x;
 			background-position: left top;
 			padding: 2px 1px 2px 2px;
@@ -92,4 +93,4 @@
 		}
 	</f:verbatim>
 	
-</f:template>
\ No newline at end of file
+</f:template>