[richfaces-svn-commits] JBoss Rich Faces SVN: r5904 - trunk/ui/pickList/src/main/java/org/richfaces/renderkit.

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

Author: vmolotkov
Date: 2008-02-07 06:00:43 -0500 (Thu, 07 Feb 2008)
New Revision: 5904

Modified:
   trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java
Log:
http://jira.jboss.com/jira/browse/RF-2183

Modified: trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java
===================================================================
--- trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java	2008-02-07 10:36:55 UTC (rev 5903)
+++ trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java	2008-02-07 11:00:43 UTC (rev 5904)
@@ -291,13 +291,24 @@
 			String clientId = component.getClientId(context);
            	ResponseWriter writer = context.getResponseWriter();
           	int divider = SHUTTLE_HELPERS.length / 2;
-          	boolean enable;
+          	boolean enable = false;
         	for (int i = 0; i < SHUTTLE_HELPERS.length; i++) {
-        		OrderingComponentRendererBase.ControlsHelper helper = SHUTTLE_HELPERS[i];
-        	    if (helper.getName().equals(ListShuttleControlsHelper.DEFAULT_LABEL_COPY_ALL)) {
+        	    OrderingComponentRendererBase.ControlsHelper helper = SHUTTLE_HELPERS[i];
+        	    boolean isDisabled = helper.getButtonStyleClass().equals(ListShuttleControlsHelper.DISABLED_STYLE_PREF);
+        	    if (helper.getBundlePropertyName().equals(ListShuttleControlsHelper.BUNDLE_REMOVE_ALL_LABEL)) {
         		enable = isSelectedList;
-        	    } else if (helper.getName().equals(ListShuttleControlsHelper.NAME_COPYALL)) {
+        		if ((!enable && isDisabled) || (enable && !isDisabled)) {
+        		    enable = true;
+        		} else {
+        		    enable = false;
+        		}
+        	    } else if (helper.getBundlePropertyName().equals(ListShuttleControlsHelper.BUNDLE_COPY_ALL_LABEL)) {
         		enable = isAvailableList;
+        		if ((!enable && isDisabled) || (enable && !isDisabled)) {
+        		    enable = true;
+        		} else {
+        		    enable = false;
+        		}
         	    } else {
         		if (helper.getButtonStyleClass().equals(ListShuttleControlsHelper.DISABLED_STYLE_PREF)) {
         		    enable = true;