[richfaces-svn-commits] JBoss Rich Faces SVN: r4232 - in branches/3.1.x/ui/orderingList/src/main/java/org/richfaces: renderkit and 1 other directory.

Author: vmolotkov Date: 2007-11-23 12:02:50 -0500 (Fri, 23 Nov 2007) New Revision: 4232 Added: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentControlsHelper.java Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 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/OrderingListRendererBase.java Log: control rendering was changed Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java 2007-11-23 17:01:25 UTC (rev 4231) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java 2007-11-23 17:02:50 UTC (rev 4232) @@ -74,6 +74,12 @@ protected abstract void restoreIterationSubmittedState(Object object); protected abstract Object saveIterationSubmittedState(); + + public abstract boolean isOrderControlsVisible(); + public abstract void setOrderControlsVisible(boolean visible); + + public abstract boolean isFastOrderControlsVisible(); + public abstract void setFastOrderControlsVisible(boolean visible); protected void setTranslatedState() { this.editableState.translated = true; Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2007-11-23 17:01:25 UTC (rev 4231) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2007-11-23 17:02:50 UTC (rev 4232) @@ -995,11 +995,11 @@ this.localActiveItemSet = true; } - public abstract boolean isOrderControlsVisible(); + /*public abstract boolean isOrderControlsVisible(); public abstract void setOrderControlsVisible(boolean visible); public abstract boolean isFastOrderControlsVisible(); - public abstract void setFastOrderControlsVisible(boolean visible); + public abstract void setFastOrderControlsVisible(boolean visible);*/ public abstract String getControlsType(); public abstract void setControlsType(String type); Added: 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 (rev 0) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentControlsHelper.java 2007-11-23 17:02:50 UTC (rev 4232) @@ -0,0 +1,152 @@ +package org.richfaces.renderkit; + +import javax.faces.context.FacesContext; + +import org.richfaces.component.UIOrderingBaseComponent; +import org.richfaces.component.UIOrderingList; +import org.richfaces.renderkit.html.images.OrderingListIconBottom; +import org.richfaces.renderkit.html.images.OrderingListIconBottomDisabled; +import org.richfaces.renderkit.html.images.OrderingListIconDown; +import org.richfaces.renderkit.html.images.OrderingListIconDownDisabled; +import org.richfaces.renderkit.html.images.OrderingListIconTop; +import org.richfaces.renderkit.html.images.OrderingListIconTopDisabled; +import org.richfaces.renderkit.html.images.OrderingListIconUp; +import org.richfaces.renderkit.html.images.OrderingListIconUpDisabled; + +public class OrderingComponentControlsHelper { + + private final static String FACET_TOP = "topControl"; + + private final static String FACET_BOTTOM = "bottomControl"; + + private final static String FACET_UP = "upControl"; + + private final static String FACET_DOWN = "downControl"; + + private final static String FACET_DIS_TOP = "topControlDisabled"; + + private final static String FACET_DIS_BOTTOM = "bottomControlDisabled"; + + private final static String FACET_DIS_UP = "upControlDisabled"; + + private final static String FACET_DIS_DOWN = "downControlDisabled"; + + public final static String FACET_CAPTION = "caption"; + + private final static String ATTRIBUTE_CE_ONORDERCHANGED = "onorderchanged"; + + private final static String ATTRIBUTE_CE_ONTOPCLICK = "ontopclick"; + + private final static String ATTRIBUTE_CE_ONDOWNCLICK = "ondownclick"; + + private final static String ATTRIBUTE_CE_ONUPCLICK = "onupclick"; + + private final static String ATTRIBUTE_CE_ONBOTTOMCLICK = "onbottomclick"; + + public final static String ATTRIBUTE_CAPTION_LABEL = "captionLabel"; + + private final static String ATTRIBUTE_CLASS_TOP_CONTROL = "topControlClass"; + + private final static String ATTRIBUTE_CLASS_BOTTOM_CONTROL = "bottomControlClass"; + + private final static String ATTRIBUTE_CLASS_DOWN_CONTROL = "downControlClass"; + + private final static String ATTRIBUTE_CLASS_UP_CONTROL = "upControlClass"; + + private final static String ATTRIBUTE_CLASS_DISABLED_CONTROL = "disabledControlClass"; + + private final static String STYLE_SKIN_CONTROL_BUTTON = "ol_button_control"; + + private final static String DIS_CONTROL_ID_PREFIX = "dis"; + + private final static String CONTROL_ID_UP = "up"; + + private final static String CONTROL_ID_DOWN = "down"; + + private final static String CONTROL_ID_TOP = "first"; + + private final static String CONTROL_ID_BOTTOM = "last"; + + private final static String DEFAULT_LABEL_TOP = "First"; + private final static String DEFAULT_LABEL_UP = "Up"; + private final static String DEFAULT_LABEL_DOWN = "Down"; + private final static String DEFAULT_LABEL_BOTTOM = "Last"; + + private final static String ATTRIBUTE_CLASS_BUTTON = "ol_button"; + private final static String ATTRIBUTE_CLASS_BUTTON_DISABLED = "ol_button_disabled"; + + protected static final OrderingComponentRendererBase.ControlsHelper[] HELPERS = new OrderingComponentRendererBase.ControlsHelper[] { + new OrderingComponentRendererBase.ControlsHelper("top", "TOP_LABEL", DEFAULT_LABEL_TOP, OrderingListIconTop.class.getName(), FACET_TOP, + " rich-ordering-control-top", ATTRIBUTE_CLASS_TOP_CONTROL, ATTRIBUTE_CLASS_BUTTON, + CONTROL_ID_TOP, ATTRIBUTE_CE_ONTOPCLICK, true, "topControlLabel") { + + public boolean isRendered(FacesContext context, UIOrderingBaseComponent list) { + return list.isFastOrderControlsVisible(); + } + + }, + new OrderingComponentRendererBase.ControlsHelper("disabledTop", "TOP_LABEL", DEFAULT_LABEL_TOP, OrderingListIconTopDisabled.class.getName(), FACET_DIS_TOP, + " rich-ordering-control-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, ATTRIBUTE_CLASS_BUTTON_DISABLED, + DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_TOP), null, false, "topControlLabel") { + + public boolean isRendered(FacesContext context, UIOrderingBaseComponent list) { + return list.isFastOrderControlsVisible(); + } + + }, + new OrderingComponentRendererBase.ControlsHelper("up", "UP_LABEL", DEFAULT_LABEL_UP, OrderingListIconUp.class.getName(), FACET_UP, + " rich-ordering-control-up", ATTRIBUTE_CLASS_UP_CONTROL, ATTRIBUTE_CLASS_BUTTON, + CONTROL_ID_UP, ATTRIBUTE_CE_ONUPCLICK ,true, "upControlLabel") { + + public boolean isRendered(FacesContext context, UIOrderingBaseComponent list) { + return list.isOrderControlsVisible(); + } + + }, + new OrderingComponentRendererBase.ControlsHelper("disabledUp", "UP_LABEL", DEFAULT_LABEL_UP, OrderingListIconUpDisabled.class.getName(), FACET_DIS_UP, + " rich-ordering-control-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, ATTRIBUTE_CLASS_BUTTON_DISABLED, + DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_UP), null, false, "upControlLabel") { + + public boolean isRendered(FacesContext context, UIOrderingBaseComponent list) { + return list.isOrderControlsVisible(); + } + + }, + new OrderingComponentRendererBase.ControlsHelper("down", "DOWN_LABEL", DEFAULT_LABEL_DOWN, OrderingListIconDown.class.getName(), FACET_DOWN, + " rich-ordering-control-down", ATTRIBUTE_CLASS_DOWN_CONTROL, ATTRIBUTE_CLASS_BUTTON, + CONTROL_ID_DOWN, ATTRIBUTE_CE_ONDOWNCLICK, true, "downControlLabel") { + + public boolean isRendered(FacesContext context, UIOrderingBaseComponent list) { + return list.isOrderControlsVisible(); + } + + }, + new OrderingComponentRendererBase.ControlsHelper("disabledDown", "DOWN_LABEL", DEFAULT_LABEL_DOWN, OrderingListIconDownDisabled.class.getName(), FACET_DIS_DOWN, + " rich-ordering-control-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, ATTRIBUTE_CLASS_BUTTON_DISABLED, + DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_DOWN), null, false, "downControlLabel") { + + public boolean isRendered(FacesContext context, UIOrderingBaseComponent list) { + return list.isOrderControlsVisible(); + } + + }, + new OrderingComponentRendererBase.ControlsHelper("bottom", "BOTTOM_LABEL", DEFAULT_LABEL_BOTTOM, OrderingListIconBottom.class.getName(), FACET_BOTTOM, + " rich-ordering-control-bottom", ATTRIBUTE_CLASS_BOTTOM_CONTROL, ATTRIBUTE_CLASS_BUTTON, + CONTROL_ID_BOTTOM, ATTRIBUTE_CE_ONBOTTOMCLICK, true, "bottomControlLabel") { + + public boolean isRendered(FacesContext context, UIOrderingBaseComponent list) { + return list.isFastOrderControlsVisible(); + } + + }, + new OrderingComponentRendererBase.ControlsHelper("disabledBottom", "BOTTOM_LABEL", DEFAULT_LABEL_BOTTOM, OrderingListIconBottomDisabled.class.getName(), FACET_DIS_BOTTOM, + " rich-ordering-control-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, ATTRIBUTE_CLASS_BUTTON_DISABLED, + DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_BOTTOM), null, false, "bottomControlLabel") { + + 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-23 17:01:25 UTC (rev 4231) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-11-23 17:02:50 UTC (rev 4232) @@ -62,7 +62,7 @@ private String labelAttributeName; - public abstract boolean isRendered(FacesContext context, UIOrderingList list); + public abstract boolean isRendered(FacesContext context, UIOrderingBaseComponent list); public ControlsHelper(String name, String bundlePropertyName, String defaultText, String imageURI, String facetName, String styleClassName, String styleFromAttribute, String buttonStyleClass, @@ -141,7 +141,7 @@ public void encodeCaption(FacesContext context, UIComponent component) throws IOException { - encodeCaption(context, component, OrderingListRendererBase.FACET_CAPTION, "ol_label ol_out_label rich-ordering-list-caption"); + encodeCaption(context, component, OrderingComponentControlsHelper.FACET_CAPTION, "ol_label ol_out_label rich-ordering-list-caption"); } @@ -150,7 +150,7 @@ ResponseWriter writer = context.getResponseWriter(); UIComponent facetEl = component.getFacet(facetCaption); boolean renderFacet = ((facetEl != null) && facetEl.isRendered()); - String captionAttr = (String) component.getAttributes().get(OrderingListRendererBase.ATTRIBUTE_CAPTION_LABEL); + String captionAttr = (String) component.getAttributes().get(OrderingComponentControlsHelper.ATTRIBUTE_CAPTION_LABEL); if (renderFacet || (captionAttr != null)) { writer.startElement(HTML.DIV_ELEM, component); @@ -191,7 +191,7 @@ } protected void renderDefaultControl(FacesContext context, - UIOrderingList orderingList, ResponseWriter writer, + UIOrderingBaseComponent orderingList, ResponseWriter writer, boolean useFacet, OrderingComponentRendererBase.ControlsHelper helper, String clientId, ResourceBundle bundle, boolean enabled) throws IOException { UIComponent facet = orderingList.getFacet(helper.getFacetName()); @@ -312,7 +312,7 @@ } protected void encodeControlFacet(FacesContext context, - UIOrderingList orderingList, OrderingComponentRendererBase.ControlsHelper helper, + UIOrderingBaseComponent orderingList, OrderingComponentRendererBase.ControlsHelper helper, String clientId, ResponseWriter writer, boolean enabled) throws IOException { Locale locale = null; @@ -346,6 +346,4 @@ helper, clientId, bundle ,enabled); } } - - } Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-23 17:01:25 UTC (rev 4231) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-23 17:02:50 UTC (rev 4232) @@ -43,141 +43,8 @@ private final static String ITEM_SEPARATOR = ","; - private final static String FACET_TOP = "topControl"; + protected static final OrderingComponentRendererBase.ControlsHelper[] HELPERS = OrderingComponentControlsHelper.HELPERS; - private final static String FACET_BOTTOM = "bottomControl"; - - private final static String FACET_UP = "upControl"; - - private final static String FACET_DOWN = "downControl"; - - private final static String FACET_DIS_TOP = "topControlDisabled"; - - private final static String FACET_DIS_BOTTOM = "bottomControlDisabled"; - - private final static String FACET_DIS_UP = "upControlDisabled"; - - private final static String FACET_DIS_DOWN = "downControlDisabled"; - - public final static String FACET_CAPTION = "caption"; - - private final static String ATTRIBUTE_CE_ONORDERCHANGED = "onorderchanged"; - - private final static String ATTRIBUTE_CE_ONTOPCLICK = "ontopclick"; - - private final static String ATTRIBUTE_CE_ONDOWNCLICK = "ondownclick"; - - private final static String ATTRIBUTE_CE_ONUPCLICK = "onupclick"; - - private final static String ATTRIBUTE_CE_ONBOTTOMCLICK = "onbottomclick"; - - public final static String ATTRIBUTE_CAPTION_LABEL = "captionLabel"; - - private final static String ATTRIBUTE_CLASS_TOP_CONTROL = "topControlClass"; - - private final static String ATTRIBUTE_CLASS_BOTTOM_CONTROL = "bottomControlClass"; - - private final static String ATTRIBUTE_CLASS_DOWN_CONTROL = "downControlClass"; - - private final static String ATTRIBUTE_CLASS_UP_CONTROL = "upControlClass"; - - private final static String ATTRIBUTE_CLASS_DISABLED_CONTROL = "disabledControlClass"; - - private final static String STYLE_SKIN_CONTROL_BUTTON = "ol_button_control"; - - private final static String DIS_CONTROL_ID_PREFIX = "dis"; - - private final static String CONTROL_ID_UP = "up"; - - private final static String CONTROL_ID_DOWN = "down"; - - private final static String CONTROL_ID_TOP = "first"; - - private final static String CONTROL_ID_BOTTOM = "last"; - - private final static String DEFAULT_LABEL_TOP = "First"; - private final static String DEFAULT_LABEL_UP = "Up"; - private final static String DEFAULT_LABEL_DOWN = "Down"; - private final static String DEFAULT_LABEL_BOTTOM = "Last"; - - private final static String ATTRIBUTE_CLASS_BUTTON = "ol_button"; - private final static String ATTRIBUTE_CLASS_BUTTON_DISABLED = "ol_button_disabled"; - - protected static final OrderingComponentRendererBase.ControlsHelper[] HELPERS = new OrderingComponentRendererBase.ControlsHelper[] { - new OrderingComponentRendererBase.ControlsHelper("top", "TOP_LABEL", DEFAULT_LABEL_TOP, OrderingListIconTop.class.getName(), FACET_TOP, - " rich-ordering-control-top", ATTRIBUTE_CLASS_TOP_CONTROL, ATTRIBUTE_CLASS_BUTTON, - CONTROL_ID_TOP, ATTRIBUTE_CE_ONTOPCLICK, true, "topControlLabel") { - - public boolean isRendered(FacesContext context, UIOrderingList list) { - return list.isFastOrderControlsVisible(); - } - - }, - new OrderingComponentRendererBase.ControlsHelper("disabledTop", "TOP_LABEL", DEFAULT_LABEL_TOP, OrderingListIconTopDisabled.class.getName(), FACET_DIS_TOP, - " rich-ordering-control-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, ATTRIBUTE_CLASS_BUTTON_DISABLED, - DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_TOP), null, false, "topControlLabel") { - - public boolean isRendered(FacesContext context, UIOrderingList list) { - return list.isFastOrderControlsVisible(); - } - - }, - new OrderingComponentRendererBase.ControlsHelper("up", "UP_LABEL", DEFAULT_LABEL_UP, OrderingListIconUp.class.getName(), FACET_UP, - " rich-ordering-control-up", ATTRIBUTE_CLASS_UP_CONTROL, ATTRIBUTE_CLASS_BUTTON, - CONTROL_ID_UP, ATTRIBUTE_CE_ONUPCLICK ,true, "upControlLabel") { - - public boolean isRendered(FacesContext context, UIOrderingList list) { - return list.isOrderControlsVisible(); - } - - }, - new OrderingComponentRendererBase.ControlsHelper("disabledUp", "UP_LABEL", DEFAULT_LABEL_UP, OrderingListIconUpDisabled.class.getName(), FACET_DIS_UP, - " rich-ordering-control-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, ATTRIBUTE_CLASS_BUTTON_DISABLED, - DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_UP), null, false, "upControlLabel") { - - public boolean isRendered(FacesContext context, UIOrderingList list) { - return list.isOrderControlsVisible(); - } - - }, - new OrderingComponentRendererBase.ControlsHelper("down", "DOWN_LABEL", DEFAULT_LABEL_DOWN, OrderingListIconDown.class.getName(), FACET_DOWN, - " rich-ordering-control-down", ATTRIBUTE_CLASS_DOWN_CONTROL, ATTRIBUTE_CLASS_BUTTON, - CONTROL_ID_DOWN, ATTRIBUTE_CE_ONDOWNCLICK, true, "downControlLabel") { - - public boolean isRendered(FacesContext context, UIOrderingList list) { - return list.isOrderControlsVisible(); - } - - }, - new OrderingComponentRendererBase.ControlsHelper("disabledDown", "DOWN_LABEL", DEFAULT_LABEL_DOWN, OrderingListIconDownDisabled.class.getName(), FACET_DIS_DOWN, - " rich-ordering-control-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, ATTRIBUTE_CLASS_BUTTON_DISABLED, - DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_DOWN), null, false, "downControlLabel") { - - public boolean isRendered(FacesContext context, UIOrderingList list) { - return list.isOrderControlsVisible(); - } - - }, - new OrderingComponentRendererBase.ControlsHelper("bottom", "BOTTOM_LABEL", DEFAULT_LABEL_BOTTOM, OrderingListIconBottom.class.getName(), FACET_BOTTOM, - " rich-ordering-control-bottom", ATTRIBUTE_CLASS_BOTTOM_CONTROL, ATTRIBUTE_CLASS_BUTTON, - CONTROL_ID_BOTTOM, ATTRIBUTE_CE_ONBOTTOMCLICK, true, "bottomControlLabel") { - - public boolean isRendered(FacesContext context, UIOrderingList list) { - return list.isFastOrderControlsVisible(); - } - - }, - new OrderingComponentRendererBase.ControlsHelper("disabledBottom", "BOTTOM_LABEL", DEFAULT_LABEL_BOTTOM, OrderingListIconBottomDisabled.class.getName(), FACET_DIS_BOTTOM, - " rich-ordering-control-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, ATTRIBUTE_CLASS_BUTTON_DISABLED, - DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_BOTTOM), null, false, "bottomControlLabel") { - - public boolean isRendered(FacesContext context, UIOrderingList list) { - return list.isFastOrderControlsVisible(); - } - - } - }; - protected Class getComponentClass() { return UIOrderingList.class; }