Author: nbelaevski Date: 2009-05-05 10:38:33 -0400 (Tue, 05 May 2009) New Revision: 14021 Modified: trunk/ui/contextMenu/src/main/config/component/contextMenu.xml trunk/ui/contextMenu/src/main/java/org/richfaces/component/UIContextMenu.java Log: https://jira.jboss.org/jira/browse/RF-3532 Modified: trunk/ui/contextMenu/src/main/config/component/contextMenu.xml =================================================================== --- trunk/ui/contextMenu/src/main/config/component/contextMenu.xml 2009-05-05 13:54:14 UTC (rev 14020) +++ trunk/ui/contextMenu/src/main/config/component/contextMenu.xml 2009-05-05 14:38:33 UTC (rev 14021) @@ -56,9 +56,9 @@ <name>disableDefaultMenu</name> <classname>boolean</classname> <description> - Forbids default handling for adjusted event. Default value &quot;true&quot;. + Forbids default handling for adjusted event. Default value &quot;false&quot;. </description> - <defaultvalue><![CDATA[getEvent().equalsIgnoreCase("onContextMenu")]]></defaultvalue> + <defaultvalue><![CDATA[false]]></defaultvalue> </property> <property> <name>showDelay</name> Modified: trunk/ui/contextMenu/src/main/java/org/richfaces/component/UIContextMenu.java =================================================================== --- trunk/ui/contextMenu/src/main/java/org/richfaces/component/UIContextMenu.java 2009-05-05 13:54:14 UTC (rev 14020) +++ trunk/ui/contextMenu/src/main/java/org/richfaces/component/UIContextMenu.java 2009-05-05 14:38:33 UTC (rev 14021) @@ -21,11 +21,7 @@ package org.richfaces.component; -import javax.el.ELException; -import javax.el.ValueExpression; -import javax.faces.FacesException; import javax.faces.component.UIComponentBase; -import javax.faces.context.FacesContext; /** * @author Maksim Kaszynski @@ -37,9 +33,6 @@ public static final String ON_CONTEXT_MENU = "onContextMenu"; public static final String DISABLE_DEFAULT_MENU = "disableDefaultMenu"; - private boolean disableDefaultMenu = false; - private boolean disableDefaultMenuSet = false; - public abstract boolean isAttached(); public abstract void setAttached(boolean b); @@ -55,45 +48,7 @@ public abstract void setShowDelay(Integer showDelay); public abstract Integer getShowDelay(); - public boolean isDisableDefaultMenu() { - if (this.disableDefaultMenuSet) { - return this.disableDefaultMenu; - } - - ValueExpression ve = getValueExpression(DISABLE_DEFAULT_MENU); - if (ve != null) { - try { - Boolean value = (Boolean) ve.getValue(getFacesContext().getELContext()); - if (value != null) { - return value; - } - } catch (ELException e) { - throw new FacesException(e); - } - } - - return ON_CONTEXT_MENU.equalsIgnoreCase(getEvent()); - } + public abstract boolean isDisableDefaultMenu(); + public abstract void setDisableDefaultMenu(boolean disableDefault); - public void setDisableDefaultMenu(boolean disableDefault) { - this.disableDefaultMenu = disableDefault; - this.disableDefaultMenuSet = true; - } - - @Override - public Object saveState(FacesContext context) { - Object[] state = new Object[9]; - state[0] = super.saveState(context); - state[1] = isDisableDefaultMenu(); - state[2] = disableDefaultMenuSet; - return state; - } - - @Override - public void restoreState(FacesContext context, Object state) { - Object[] states = (Object[]) state; - super.restoreState(context, states[0]); - disableDefaultMenu = (Boolean) states[1]; - disableDefaultMenuSet = (Boolean) states[2]; - } }