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

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

Author: vmolotkov
Date: 2008-02-06 10:41:16 -0500 (Wed, 06 Feb 2008)
New Revision: 5872

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-06 15:40:59 UTC (rev 5871)
+++ trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java	2008-02-06 15:41:16 UTC (rev 5872)
@@ -134,7 +134,8 @@
 	    Set lookupSet = PickListUtils.getSubmittedOrSelectedValuesAsSet(true, component, context, converter);
 	    List selectItemsForSelectedValues = selectItemsForSelectedList(context, component, selectItemsList, converter, lookupSet); //TODO: optimaze
 	    List selectItemsForAvailableList = selectItemsForAvailableList(context, component, selectItemsList, selectItemsForSelectedValues, converter);
-	    
+	    isSelectedList = !selectItemsForSelectedValues.isEmpty();
+	    isAvailableList = !selectItemsForAvailableList.isEmpty();
 	    List selectItemList = null;
 	    if (source) {
 	    	selectItemList = selectItemsForAvailableList;
@@ -297,9 +298,9 @@
           	boolean enable;
         	for (int i = 0; i < SHUTTLE_HELPERS.length; i++) {
         		OrderingComponentRendererBase.ControlsHelper helper = SHUTTLE_HELPERS[i];
-        	    if (helper.getDefaultText().equals(ListShuttleControlsHelper.DEFAULT_LABEL_REMOVE_ALL)) {
+        	    if (helper.getName().equals(ListShuttleControlsHelper.NAME_REMOVEALL)) {
         		enable = isSelectedList;
-        	    } else if (helper.getDefaultText().equals(ListShuttleControlsHelper.DEFAULT_LABEL_COPY_ALL)) {
+        	    } else if (helper.getName().equals(ListShuttleControlsHelper.NAME_COPYALL)) {
         		enable = isAvailableList;
         	    } else {
         		if (helper.getButtonStyleClass().equals(ListShuttleControlsHelper.DISABLED_STYLE_PREF)) {