Author: nbelaevski Date: 2007-11-16 19:08:44 -0500 (Fri, 16 Nov 2007) New Revision: 4061 Modified: trunk/sandbox/ui/orderingList/pom.xml trunk/sandbox/ui/orderingList/src/main/config/component/orderinglist.xml trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/gradientimages/OrderingListClickedGradient.java trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottom.java trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottomDisabled.java trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDown.java trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDownDisabled.java trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconTop.java trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconTopDisabled.java trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUp.java trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUpDisabled.java Log: orderingList is ready for 3.1.x Modified: trunk/sandbox/ui/orderingList/pom.xml =================================================================== --- trunk/sandbox/ui/orderingList/pom.xml 2007-11-16 23:26:09 UTC (rev 4060) +++ trunk/sandbox/ui/orderingList/pom.xml 2007-11-17 00:08:44 UTC (rev 4061) @@ -2,11 +2,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <artifactId>ui</artifactId> - <groupId>org.richfaces.sandbox</groupId> - <version>3.2.0-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <version>3.1.3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.sandbox.ui</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>orderingList</artifactId> <name>orderingList</name> <build> @@ -14,7 +14,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: trunk/sandbox/ui/orderingList/src/main/config/component/orderinglist.xml =================================================================== --- trunk/sandbox/ui/orderingList/src/main/config/component/orderinglist.xml 2007-11-16 23:26:09 UTC (rev 4060) +++ trunk/sandbox/ui/orderingList/src/main/config/component/orderinglist.xml 2007-11-17 00:08:44 UTC (rev 4061) @@ -38,13 +38,31 @@ </description> </property> <property> - <name>label</name> - <classname>java.lang.Boolean</classname> + <name>showButtonLabels</name> + <classname>boolean</classname> <description> </description> <defaultvalue><![CDATA[true]]></defaultvalue> </property> + <property> + <name>topControlLabel</name> + <classname>java.lang.String</classname> + </property> + <property> + <name>upControlLabel</name> + <classname>java.lang.String</classname> + </property> + <property> + <name>downControlLabel</name> + <classname>java.lang.String</classname> + </property> + <property> + <name>bottomControlLabel</name> + <classname>java.lang.String</classname> + </property> + + <property> <name>listWidth</name> <classname>int</classname> <description> @@ -96,7 +114,7 @@ <name>controlsType</name> <classname>java.lang.String</classname> <description> - Defines type of a control: button, link or none. + Defines type of a control: button or none. </description> <defaultvalue><![CDATA["button"]]></defaultvalue> </property> @@ -182,7 +200,7 @@ <property elonly="true"> <name>validator</name> <classname>javax.faces.el.MethodBinding</classname> - <methodargs>javax.faces.event.ValueChangeEvent</methodargs> + <methodargs>java.lang.Object.class</methodargs> </property> <property> Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java =================================================================== --- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java 2007-11-16 23:26:09 UTC (rev 4060) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java 2007-11-17 00:08:44 UTC (rev 4061) @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Map; import javax.faces.component.EditableValueHolder; import javax.faces.component.UIColumn; @@ -145,8 +146,9 @@ } protected Iterator fixedChildren() { - if (getFacetCount() != 0) { - return getFacets().values().iterator(); + Map facets = getFacets(); + if (facets != null) { + return facets.values().iterator(); } else { return EmptyIterator.INSTANCE; } Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java =================================================================== --- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2007-11-16 23:26:09 UTC (rev 4060) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2007-11-17 00:08:44 UTC (rev 4061) @@ -28,7 +28,9 @@ import javax.faces.event.FacesEvent; import javax.faces.event.ValueChangeEvent; import javax.faces.event.ValueChangeListener; +import javax.faces.model.ArrayDataModel; import javax.faces.model.DataModel; +import javax.faces.model.ListDataModel; import javax.faces.validator.Validator; import javax.faces.validator.ValidatorException; @@ -155,7 +157,18 @@ } protected ExtendedDataModel createDataModel() { - DataModel dataModel = super.getDataModel(); + DataModel dataModel; + Object current = getValue(); + if (current == null) { + dataModel = new ListDataModel(Collections.EMPTY_LIST); + } else if (current instanceof List) { + dataModel = new ListDataModel((List) current); + } else if (Object[].class.isAssignableFrom(current.getClass())) { + dataModel = new ArrayDataModel((Object[]) current); + } else { + throw new IllegalArgumentException(); + } + if (isTranslatedRenderingState() || isTranslatedState()) { return new TranslatedSequenceDataModel(dataModel, isTranslatedState(), submittedValueHolder != null ? submittedValueHolder.permutationOrder : null); } else { @@ -741,7 +754,6 @@ return convertedValue; } - @Override protected void resetDataModel() { super.resetDataModel(); Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java =================================================================== --- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-16 23:26:09 UTC (rev 4060) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-17 00:08:44 UTC (rev 4061) @@ -1,8 +1,6 @@ package org.richfaces.renderkit; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Locale; @@ -32,9 +30,9 @@ private static final String MESSAGE_BUNDLE_NAME = OrderingListRendererBase.class.getPackage().getName() + "OrderingList"; - private final static Character ACTIVITY_MARKER = 'a'; + private final static Character ACTIVITY_MARKER = new Character('a'); - private final static Character SELECTION_MARKER = 's'; + private final static Character SELECTION_MARKER = new Character('s'); private final static String ITEM_SEPARATOR = ","; @@ -62,7 +60,7 @@ private final static String CONTROL_TYPE_NONE = "none"; - private final static String ATTRIBUTE_LABEL = "label"; + private final static String SHOW_LABELS_ATTRIBUTE_NAME = "showButtonLabels"; private final static String ATTRIBUTE_CONTROLS_TYPE = "controlsType"; @@ -133,11 +131,13 @@ private String defaultText; + private String labelAttributeName; + public abstract boolean isRendered(FacesContext context, UIOrderingList list); 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; @@ -150,6 +150,7 @@ this.customEvent = customEvent; this.buttonStyleClass = buttonStyleClass; this.enable = isEnable; + this.labelAttributeName = labelAttributeName; } public String getName() { @@ -195,12 +196,16 @@ public String getDefaultText() { return defaultText; } + + public String getLabelAttributeName() { + return labelAttributeName; + } }; protected static final ControlsHelper[] HELPERS = new ControlsHelper[] { new 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) { + CONTROL_ID_TOP, ATTRIBUTE_CE_ONTOPCLICK, true, "topControlLabel") { public boolean isRendered(FacesContext context, UIOrderingList list) { return list.isFastOrderControlsVisible(); @@ -209,7 +214,7 @@ }, new 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) { + DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_TOP), null, false, "topControlLabel") { public boolean isRendered(FacesContext context, UIOrderingList list) { return list.isFastOrderControlsVisible(); @@ -218,7 +223,7 @@ }, new 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) { + CONTROL_ID_UP, ATTRIBUTE_CE_ONUPCLICK ,true, "upControlLabel") { public boolean isRendered(FacesContext context, UIOrderingList list) { return list.isOrderControlsVisible(); @@ -227,7 +232,7 @@ }, new 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) { + DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_UP), null, false, "upControlLabel") { public boolean isRendered(FacesContext context, UIOrderingList list) { return list.isOrderControlsVisible(); @@ -236,7 +241,7 @@ }, new 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) { + CONTROL_ID_DOWN, ATTRIBUTE_CE_ONDOWNCLICK, true, "downControlLabel") { public boolean isRendered(FacesContext context, UIOrderingList list) { return list.isFastOrderControlsVisible(); @@ -245,7 +250,7 @@ }, new 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) { + DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_DOWN), null, false, "downControlLabel") { public boolean isRendered(FacesContext context, UIOrderingList list) { return list.isFastOrderControlsVisible(); @@ -254,7 +259,7 @@ }, new 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) { + CONTROL_ID_BOTTOM, ATTRIBUTE_CE_ONBOTTOMCLICK, true, "bottomControlLabel") { public boolean isRendered(FacesContext context, UIOrderingList list) { return list.isOrderControlsVisible(); @@ -263,7 +268,7 @@ }, new 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) { + DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_BOTTOM), null, false, "bottomControlLabel") { public boolean isRendered(FacesContext context, UIOrderingList list) { return list.isOrderControlsVisible(); @@ -319,7 +324,7 @@ writer.endElement("thead"); } - private static final ThreadLocal<ItemState> itemStates = new ThreadLocal<ItemState>(); + private static final ThreadLocal itemStates = new ThreadLocal(); public void encodeBegin(FacesContext context, UIComponent component) throws IOException { @@ -346,7 +351,7 @@ boolean selectedLast = false; try { - ItemState state = itemStates.get(); + ItemState state = (ItemState) itemStates.get(); orderingList.setRowKey(new Integer(0)); selectedFirst = state.isSelected(); @@ -417,7 +422,6 @@ UIOrderingList orderingList, ResponseWriter writer, boolean useFacet, ControlsHelper helper, String clientId, ResourceBundle bundle, boolean enabled) throws IOException { - String htmlElem = HTML.a_ELEMENT; UIComponent facet = orderingList.getFacet(helper.getFacetName()); String customEvent = null; Map attributes = orderingList.getAttributes(); @@ -452,7 +456,6 @@ } - writer.startElement(htmlElem, orderingList); if (customEvent != null) { writer.writeAttribute(HTML.onclick_ATTRIBUTE, customEvent,null); } @@ -471,10 +474,10 @@ writer.endElement(HTML.IMG_ELEMENT); - if ((Boolean) attributes.get(ATTRIBUTE_LABEL)) { - String label = null; + if (Boolean.TRUE.equals(attributes.get(SHOW_LABELS_ATTRIBUTE_NAME))) { + String label = (String) attributes.get(helper.getLabelAttributeName()); - if (bundle != null) { + if (label == null && bundle != null) { try { label = bundle.getString(helper.getBundlePropertyName()); } catch (MissingResourceException e) { @@ -493,7 +496,6 @@ // helper.getIdSuffix(), null); // writer.writeAttribute(HTML.class_ATTRIBUTE, currentStyle, null); - writer.endElement(htmlElem); if (!useFacet) { writer.endElement(HTML.DIV_ELEM); @@ -547,7 +549,7 @@ StringBuffer rowClassName = new StringBuffer("ol_normal rich-ordering-list-row"); StringBuffer cellClassName = new StringBuffer("ol_cell rich-ordering-list-cell"); - ItemState state = itemStates.get(); + ItemState state = (ItemState) itemStates.get(); if (state.isActive()) { rowClassName.append(" ol_active rich-ordering-list-row-active"); @@ -561,8 +563,10 @@ writer.writeAttribute("class", rowClassName.toString(), null); - List<UIComponent> children = table.getChildren(); - for (UIComponent component : children) { + List children = table.getChildren(); + for (Iterator iterator = children.iterator(); iterator.hasNext();) { + UIComponent component = (UIComponent) iterator.next(); + if (component instanceof UIColumn && component.isRendered()) { UIColumn column = (UIColumn) component; @@ -612,39 +616,4 @@ orderingList.setSubmittedString(valueOrder); } } - - - private void valuesSynchronization(String[] valueOrder, List oldValues) { - List synchronizedList = new ArrayList(); - List selectedItems = new ArrayList(); - Object activeItem = null; - Integer itemIndex = null; - String[] currentOrder; - - for (int i = 0; i < valueOrder.length; i++) { - currentOrder = valueOrder[i].split("d+"); - - try { - itemIndex = new Integer(currentOrder[0]); - } catch (NumberFormatException e) { - // TODO: handle exception - } - - Object currentItem = oldValues.get(itemIndex.intValue()); - synchronizedList.add(currentItem); - - if (currentOrder.length > 1) { - Iterator it = Arrays.asList(currentOrder[1].toCharArray()).iterator(); - while (it.hasNext()) { - Character marker = (Character) it.next(); - if (ACTIVITY_MARKER.equals(marker)) { - activeItem = currentItem; - } else if (SELECTION_MARKER.equals(marker)) { - selectedItems.add(currentItem); - } - } - } - } - } - } Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/gradientimages/OrderingListClickedGradient.java =================================================================== --- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/gradientimages/OrderingListClickedGradient.java 2007-11-16 23:26:09 UTC (rev 4060) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/gradientimages/OrderingListClickedGradient.java 2007-11-17 00:08:44 UTC (rev 4061) @@ -33,7 +33,6 @@ * */ public class OrderingListClickedGradient extends BaseGradient { - @Override protected void paint(ResourceContext resourceContext, Graphics2D g2d) { g2d.transform(new AffineTransform(1., 0., 0., -1., 0., 15.)); super.paint(resourceContext, g2d); Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java =================================================================== --- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java 2007-11-16 23:26:09 UTC (rev 4060) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java 2007-11-17 00:08:44 UTC (rev 4061) @@ -105,7 +105,6 @@ /** * @param data - pass icon color and background color */ - @Override protected Object getDataToStore(FacesContext context, Object data) { return storeData(context, ICON_COLOR, BACKGROUND_COLOR, BORDER_COLOR); } @@ -156,7 +155,6 @@ return ret; } - @Override protected Object deserializeData(byte[] objectArray) { if (objectArray == null) { return null; Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottom.java =================================================================== --- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottom.java 2007-11-16 23:26:09 UTC (rev 4060) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottom.java 2007-11-17 00:08:44 UTC (rev 4061) @@ -32,7 +32,6 @@ */ public class OrderingListIconBottom extends OrderingListIconBase { - @Override protected void paintImage(ResourceContext context, Graphics2D g2d, Color textColor, Color borderColor) { Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottomDisabled.java =================================================================== --- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottomDisabled.java 2007-11-16 23:26:09 UTC (rev 4060) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottomDisabled.java 2007-11-17 00:08:44 UTC (rev 4061) @@ -28,7 +28,6 @@ * */ public class OrderingListIconBottomDisabled extends OrderingListIconBottom { - @Override protected Object getDataToStore(FacesContext context, Object data) { return storeData(context, DISABLED_ICON_COLOR, DISABLED_BACKGROUND_COLOR, DISABLED_BORDER_COLOR); } Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDown.java =================================================================== --- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDown.java 2007-11-16 23:26:09 UTC (rev 4060) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDown.java 2007-11-17 00:08:44 UTC (rev 4061) @@ -32,7 +32,6 @@ */ public class OrderingListIconDown extends OrderingListIconBase { - @Override protected void paintImage(ResourceContext context, Graphics2D g2d, Color textColor, Color borderColor) { Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDownDisabled.java =================================================================== --- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDownDisabled.java 2007-11-16 23:26:09 UTC (rev 4060) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDownDisabled.java 2007-11-17 00:08:44 UTC (rev 4061) @@ -28,7 +28,6 @@ * */ public class OrderingListIconDownDisabled extends OrderingListIconDown { - @Override protected Object getDataToStore(FacesContext context, Object data) { return storeData(context, DISABLED_ICON_COLOR, DISABLED_BACKGROUND_COLOR, DISABLED_BORDER_COLOR); } Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconTop.java =================================================================== --- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconTop.java 2007-11-16 23:26:09 UTC (rev 4060) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconTop.java 2007-11-17 00:08:44 UTC (rev 4061) @@ -32,7 +32,6 @@ */ public class OrderingListIconTop extends OrderingListIconBottom { - @Override protected void paintImage(ResourceContext context, Graphics2D g2d, Color textColor, Color borderColor) { Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconTopDisabled.java =================================================================== --- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconTopDisabled.java 2007-11-16 23:26:09 UTC (rev 4060) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconTopDisabled.java 2007-11-17 00:08:44 UTC (rev 4061) @@ -28,7 +28,6 @@ * */ public class OrderingListIconTopDisabled extends OrderingListIconTop { - @Override protected Object getDataToStore(FacesContext context, Object data) { return storeData(context, DISABLED_ICON_COLOR, DISABLED_BACKGROUND_COLOR, DISABLED_BORDER_COLOR); } Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUp.java =================================================================== --- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUp.java 2007-11-16 23:26:09 UTC (rev 4060) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUp.java 2007-11-17 00:08:44 UTC (rev 4061) @@ -32,7 +32,6 @@ */ public class OrderingListIconUp extends OrderingListIconDown { - @Override protected void paintImage(ResourceContext context, Graphics2D g2d, Color textColor, Color borderColor) { Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUpDisabled.java =================================================================== --- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUpDisabled.java 2007-11-16 23:26:09 UTC (rev 4060) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUpDisabled.java 2007-11-17 00:08:44 UTC (rev 4061) @@ -28,7 +28,6 @@ * */ public class OrderingListIconUpDisabled extends OrderingListIconUp { - @Override protected Object getDataToStore(FacesContext context, Object data) { return storeData(context, DISABLED_ICON_COLOR, DISABLED_BACKGROUND_COLOR, DISABLED_BORDER_COLOR); }