Author: alexsmirnov Date: 2007-05-15 15:56:21 -0400 (Tue, 15 May 2007) New Revision: 771 Modified: trunk/richfaces/common/src/main/java/org/richfaces/renderkit/InputRendererBase.java trunk/richfaces/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java trunk/richfaces/tree/src/main/java/org/richfaces/component/DecodesPhaseNotifiyingListener.java trunk/richfaces/tree/src/main/java/org/richfaces/component/UITree.java trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java Log: Fix http://jira.jboss.com/jira/browse/RF-44 Modified: trunk/richfaces/common/src/main/java/org/richfaces/renderkit/InputRendererBase.java =================================================================== --- trunk/richfaces/common/src/main/java/org/richfaces/renderkit/InputRendererBase.java 2007-05-15 18:07:00 UTC (rev 770) +++ trunk/richfaces/common/src/main/java/org/richfaces/renderkit/InputRendererBase.java 2007-05-15 19:56:21 UTC (rev 771) @@ -46,8 +46,8 @@ protected void doDecode(FacesContext context, UIComponent component) { String clientId = component.getClientId(context); Map requestParameterMap = context.getExternalContext().getRequestParameterMap(); - if (requestParameterMap.containsKey(clientId)) { - String newValue = (String) requestParameterMap.get(clientId); + String newValue = (String) requestParameterMap.get(clientId); + if (null != newValue) { UIInput input = (UIInput) component; input.setSubmittedValue(newValue); } Modified: trunk/richfaces/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java =================================================================== --- trunk/richfaces/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-05-15 18:07:00 UTC (rev 770) +++ trunk/richfaces/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-05-15 19:56:21 UTC (rev 771) @@ -76,8 +76,8 @@ } String tabClientId = tab.getClientId(context); - if (requestParameterMap.containsKey(tabClientId) || - requestParameterMap.containsKey(tabClientId + "_server_submit")) + if (null != requestParameterMap.get(tabClientId) || + null != requestParameterMap.get(tabClientId + "_server_submit")) { eventTab = tab; Modified: trunk/richfaces/tree/src/main/java/org/richfaces/component/DecodesPhaseNotifiyingListener.java =================================================================== --- trunk/richfaces/tree/src/main/java/org/richfaces/component/DecodesPhaseNotifiyingListener.java 2007-05-15 18:07:00 UTC (rev 770) +++ trunk/richfaces/tree/src/main/java/org/richfaces/component/DecodesPhaseNotifiyingListener.java 2007-05-15 19:56:21 UTC (rev 771) @@ -85,7 +85,7 @@ String keyName = DecodesPhaseNotifiyingListener.class.getName(); - if (!applicationMap.containsKey(keyName)) { + if (null == applicationMap.get(keyName)) { LifecycleFactory lFactory = (LifecycleFactory) FactoryFinder.getFactory(FactoryFinder.LIFECYCLE_FACTORY); Lifecycle lifecycle = lFactory.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE); Modified: trunk/richfaces/tree/src/main/java/org/richfaces/component/UITree.java =================================================================== --- trunk/richfaces/tree/src/main/java/org/richfaces/component/UITree.java 2007-05-15 18:07:00 UTC (rev 770) +++ trunk/richfaces/tree/src/main/java/org/richfaces/component/UITree.java 2007-05-15 19:56:21 UTC (rev 771) @@ -184,10 +184,10 @@ resultEvent = wrapTreeEvent(event); } else if (event instanceof TreeStateCommandEvent) { FacesContext context = FacesContext.getCurrentInstance(); - boolean afterDecodesPhase = context + boolean afterDecodesPhase = null != context .getExternalContext() .getRequestMap() - .containsKey( + .get( DecodesPhaseNotifiyingListener.DECODE_PHASE_NOTICE_NAME); if (isImmediate() && !afterDecodesPhase) { @@ -383,7 +383,7 @@ try { super.processDecodes(faces, null); - if (getAttributes().containsKey(SELECTION_INPUT_ATTRIBUTE)) { + if (null != getAttributes().get(SELECTION_INPUT_ATTRIBUTE)) { TreeState state = (TreeState) getComponentState(); if (state.setSelected(null)) { Modified: trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java =================================================================== --- trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-05-15 18:07:00 UTC (rev 770) +++ trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-05-15 19:56:21 UTC (rev 771) @@ -229,7 +229,7 @@ String toggleId = id + NamingContainer.SEPARATOR_CHAR + UITree.TOGGLE_LINK_ATTRIBUTE; - if (requestMap.containsKey(toggleId) + if (null != requestMap.get(toggleId) || toggleId.equals(tree.getAttributes().get( UITree.TOGGLE_LINK_ATTRIBUTE))) {