Author: nbelaevski Date: 2007-11-29 20:16:54 -0500 (Thu, 29 Nov 2007) New Revision: 4369 Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentControlsHelper.java branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java Log: http://jira.jboss.com/jira/browse/RF-1428 Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentControlsHelper.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentControlsHelper.java 2007-11-30 00:50:10 UTC (rev 4368) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentControlsHelper.java 2007-11-30 01:16:54 UTC (rev 4369) @@ -65,6 +65,8 @@ private final static String CONTROL_ID_BOTTOM = "last"; + public static final String CONTROL_LABEL_ATTRIBUTE_SUFFIX = "ControlLabel"; + private final static String DEFAULT_LABEL_TOP = "First"; private final static String DEFAULT_LABEL_UP = "Up"; private final static String DEFAULT_LABEL_DOWN = "Down"; @@ -73,7 +75,7 @@ protected static final OrderingComponentRendererBase.ControlsHelper[] HELPERS = new OrderingComponentRendererBase.ControlsHelper[] { new OrderingComponentRendererBase.ControlsHelper("top", "TOP_LABEL", DEFAULT_LABEL_TOP, OrderingListIconTop.class.getName(), FACET_TOP, "-top", ATTRIBUTE_CLASS_TOP_CONTROL, "", - CONTROL_ID_TOP, ATTRIBUTE_CE_ONTOPCLICK, true) { + CONTROL_ID_TOP, ATTRIBUTE_CE_ONTOPCLICK, true, "top".concat(CONTROL_LABEL_ATTRIBUTE_SUFFIX)) { public boolean isRendered(FacesContext context, UIOrderingBaseComponent list) { return list.isFastOrderControlsVisible(); @@ -82,7 +84,7 @@ }, new OrderingComponentRendererBase.ControlsHelper("disabledTop", "TOP_LABEL", DEFAULT_LABEL_TOP, OrderingListIconTopDisabled.class.getName(), FACET_DIS_TOP, "-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, "-disabled", - DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_TOP), null, false) { + DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_TOP), null, false, "top".concat(CONTROL_LABEL_ATTRIBUTE_SUFFIX)) { public boolean isRendered(FacesContext context, UIOrderingBaseComponent list) { return list.isFastOrderControlsVisible(); @@ -91,7 +93,7 @@ }, new OrderingComponentRendererBase.ControlsHelper("up", "UP_LABEL", DEFAULT_LABEL_UP, OrderingListIconUp.class.getName(), FACET_UP, "-up", ATTRIBUTE_CLASS_UP_CONTROL, "", - CONTROL_ID_UP, ATTRIBUTE_CE_ONUPCLICK ,true) { + CONTROL_ID_UP, ATTRIBUTE_CE_ONUPCLICK ,true, "up".concat(CONTROL_LABEL_ATTRIBUTE_SUFFIX)) { public boolean isRendered(FacesContext context, UIOrderingBaseComponent list) { return list.isOrderControlsVisible(); @@ -100,7 +102,7 @@ }, new OrderingComponentRendererBase.ControlsHelper("disabledUp", "UP_LABEL", DEFAULT_LABEL_UP, OrderingListIconUpDisabled.class.getName(), FACET_DIS_UP, "-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, "-disabled", - DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_UP), null, false) { + DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_UP), null, false, "up".concat(CONTROL_LABEL_ATTRIBUTE_SUFFIX)) { public boolean isRendered(FacesContext context, UIOrderingBaseComponent list) { return list.isOrderControlsVisible(); @@ -109,7 +111,7 @@ }, new OrderingComponentRendererBase.ControlsHelper("down", "DOWN_LABEL", DEFAULT_LABEL_DOWN, OrderingListIconDown.class.getName(), FACET_DOWN, "-down", ATTRIBUTE_CLASS_DOWN_CONTROL, "", - CONTROL_ID_DOWN, ATTRIBUTE_CE_ONDOWNCLICK, true) { + CONTROL_ID_DOWN, ATTRIBUTE_CE_ONDOWNCLICK, true, "down".concat(CONTROL_LABEL_ATTRIBUTE_SUFFIX)) { public boolean isRendered(FacesContext context, UIOrderingBaseComponent list) { return list.isOrderControlsVisible(); @@ -118,7 +120,7 @@ }, new OrderingComponentRendererBase.ControlsHelper("disabledDown", "DOWN_LABEL", DEFAULT_LABEL_DOWN, OrderingListIconDownDisabled.class.getName(), FACET_DIS_DOWN, "-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, "-disabled", - DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_DOWN), null, false) { + DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_DOWN), null, false, "down".concat(CONTROL_LABEL_ATTRIBUTE_SUFFIX)) { public boolean isRendered(FacesContext context, UIOrderingBaseComponent list) { return list.isOrderControlsVisible(); @@ -127,7 +129,7 @@ }, new OrderingComponentRendererBase.ControlsHelper("bottom", "BOTTOM_LABEL", DEFAULT_LABEL_BOTTOM, OrderingListIconBottom.class.getName(), FACET_BOTTOM, "-bottom", ATTRIBUTE_CLASS_BOTTOM_CONTROL, "", - CONTROL_ID_BOTTOM, ATTRIBUTE_CE_ONBOTTOMCLICK, true) { + CONTROL_ID_BOTTOM, ATTRIBUTE_CE_ONBOTTOMCLICK, true, "bottom".concat(CONTROL_LABEL_ATTRIBUTE_SUFFIX)) { public boolean isRendered(FacesContext context, UIOrderingBaseComponent list) { return list.isFastOrderControlsVisible(); @@ -136,7 +138,7 @@ }, new OrderingComponentRendererBase.ControlsHelper("disabledBottom", "BOTTOM_LABEL", DEFAULT_LABEL_BOTTOM, OrderingListIconBottomDisabled.class.getName(), FACET_DIS_BOTTOM, "-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, "-disabled", - DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_BOTTOM), null, false) { + DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_BOTTOM), null, false, "bottom".concat(CONTROL_LABEL_ATTRIBUTE_SUFFIX)) { public boolean isRendered(FacesContext context, UIOrderingBaseComponent list) { return list.isFastOrderControlsVisible(); Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-11-30 00:50:10 UTC (rev 4368) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-11-30 01:16:54 UTC (rev 4369) @@ -70,7 +70,7 @@ public ControlsHelper(String name, String bundlePropertyName, String defaultText, String imageURI, String facetName, String styleClassName, String styleFromAttribute, String buttonStyleClass, - String idSuffix, String customEvent, boolean isEnable) { + String idSuffix, String customEvent, boolean isEnable, String labelAttributeName) { super(); this.name = name; this.bundlePropertyName = bundlePropertyName; @@ -83,7 +83,7 @@ this.customEvent = customEvent; this.buttonStyleClass = buttonStyleClass; this.enable = isEnable; - this.labelAttributeName = name + "ControlLabel"; + this.labelAttributeName = labelAttributeName; } public String getName() {