Author: nbelaevski Date: 2008-06-26 09:43:53 -0400 (Thu, 26 Jun 2008) New Revision: 9239 Added: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/TriangleIconDown.java trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/TriangleIconUp.java trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/iconimages/DataTableIconConstants.java trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconConstants.java trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDown.java trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUp.java Removed: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/TriangleIconDown.java trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/TriangleIconUp.java trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/iconimages/DataTableIconBasic.java Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/TriangleIconBase.java trunk/framework/impl/src/main/resources/META-INF/resources-config.xml trunk/sandbox/ui/extendedDataTable/ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/iconimages/DataTableIconSortAsc.java trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/iconimages/DataTableIconSortDesc.java trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/iconimages/DataTableIconSortNone.java trunk/ui/dataTable/src/test/java/org/richfaces/renderkit/SortableHeaderRenderingTest.java trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconCopy.java trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconCopyAllDisabled.java trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconCopyDisabled.java trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconRemove.java trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconRemoveAllDisabled.java trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconRemoveDisabled.java trunk/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentControlsHelper.java trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottom.java trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottomDisabled.java trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDownDisabled.java trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconTopDisabled.java trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUpDisabled.java trunk/ui/orderingList/src/test/java/org/richfaces/renderkit/OrderingListRenderingTest.java trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/iconimages/ScrollableDataTableIconSplit.java trunk/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/iconimages/ScrollableDataTableIconBasicTest.java Log: http://jira.jboss.com/jira/browse/RF-3726 Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/TriangleIconBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/TriangleIconBase.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/TriangleIconBase.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -47,11 +47,11 @@ private static final Dimension DIMENSION = new Dimension(15, 15); protected static final String ICON_COLOR = "generalTextColor"; - protected static final String BACKGROUND_COLOR = "tabBackgroundColor"; + //protected static final String BACKGROUND_COLOR = "tabBackgroundColor"; protected static final String BORDER_COLOR = "generalBackgroundColor"; protected static final String DISABLED_ICON_COLOR = "tabDisabledTextColor"; - protected static final String DISABLED_BACKGROUND_COLOR = "tabBackgroundColor"; + //protected static final String DISABLED_BACKGROUND_COLOR = "tabBackgroundColor"; protected static final String DISABLED_BORDER_COLOR = "generalBackgroundColor"; public TriangleIconBase() { @@ -71,8 +71,7 @@ Color [] data = (Color[]) restoreData(context); Color textColor = data[0]; - Color backgroundColor = data[1]; - Color borderColor = data[2]; + Color borderColor = data[1]; g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE); @@ -85,11 +84,7 @@ // g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_DISABLE); // g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); - /*Dimension dim = getDimensions(context); - g2d.setColor(backgroundColor); - g2d.fillRect(0, 0, dim.width, dim.height);*/ - - if (textColor != null && backgroundColor != null && g2d != null) { + if (textColor != null && borderColor != null && g2d != null) { paintImage(context, g2d, textColor, borderColor); } @@ -106,52 +101,67 @@ * @param data - pass icon color and background color */ protected Object getDataToStore(FacesContext context, Object data) { - return storeData(context, ICON_COLOR, BACKGROUND_COLOR, BORDER_COLOR); + return getDataToStore(context, null, ICON_COLOR, null, + BORDER_COLOR); } + + protected String getParameterValue(FacesContext context, Skin skin, Skin defaultSkin, + String parameterName, String defaultParameterName) { - protected Object storeData(FacesContext context, String colorSkinParam, String backgroundSkinParam, String borderSkinParam) { - Skin skin = SkinFactory.getInstance().getSkin(context); - Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context); + String value = null; - byte [] ret = new byte[9]; + if (parameterName != null && parameterName.length() != 0) { + value = (String) skin.getParameter(context, parameterName); + if (value == null || value.length() == 0) { + value = (String) defaultSkin.getParameter(context, parameterName); + } + } + + if (value == null || value.length() == 0) { + if (defaultParameterName != null && defaultParameterName.length() != 0) { + value = (String) skin.getParameter(context, defaultParameterName); + if (value == null || value.length() == 0) { + value = (String) defaultSkin.getParameter(context, defaultParameterName); + } + } + } + if (value == null) { + return "#FFFFFF"; + } + + return value; + } + + protected Object getDataToStore(FacesContext context, + String iconColorParam, + String defaultIconColorParam, + String borderColorParam, + String defaultBorderColorParam) { + SkinFactory skinFactory = SkinFactory.getInstance(); + Skin skin = skinFactory.getSkin(context); + Skin defaultSkin = skinFactory.getDefaultSkin(context); + + byte [] ret = new byte[6]; + Color color = null; Zipper2 zipper = new Zipper2(ret); - String color1 = (String) skin.getParameter(context, colorSkinParam); - if (null == color1 || "".equals(color1)) - color1 = (String) defaultSkin.getParameter(context, colorSkinParam); + String color1 = getParameterValue(context, skin, defaultSkin, + iconColorParam, + defaultIconColorParam); - if (color1 == null) { - color1 = "#FFFFFF"; - } - color = HtmlColor.decode(color1); zipper.addColor(color); - String color2 = (String) skin.getParameter(context, backgroundSkinParam); - if (null == color2 || "".equals(color2)) - color2 = (String) defaultSkin.getParameter(context, backgroundSkinParam); + String color2 = getParameterValue(context, skin, defaultSkin, + borderColorParam, + defaultBorderColorParam); - if (color2 == null) { - color2 = "#000000"; - } - color = HtmlColor.decode(color2); zipper.addColor(color); - String color3 = (String) skin.getParameter(context, borderSkinParam); - if (null == color3 || "".equals(color3)) - color3 = (String) defaultSkin.getParameter(context, backgroundSkinParam); - - if (color3 == null) { - color3 = "#000000"; - } - - color = HtmlColor.decode(color3); - zipper.addColor(color); - return ret; } @@ -162,7 +172,7 @@ Zipper2 zipper = new Zipper2(objectArray); - return new Color[] {zipper.nextColor(), zipper.nextColor(), zipper.nextColor()}; + return new Color[] {zipper.nextColor(), zipper.nextColor()}; } public boolean isCacheable() { Deleted: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/TriangleIconDown.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/TriangleIconDown.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/TriangleIconDown.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -1,49 +0,0 @@ -/** - * License Agreement. - * - * JBoss RichFaces - Ajax4jsf Component Library - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.richfaces.renderkit.html.images; - -import java.awt.Color; -import java.awt.Graphics2D; - -import org.ajax4jsf.resource.ResourceContext; - -/** - * @author Siarhej Chalipau - * - */ -public class TriangleIconDown extends TriangleIconBase { - - protected void paintImage(ResourceContext context, Graphics2D g2d, - Color textColor, Color borderColor) { - - g2d.setColor(textColor); - g2d.translate(7, 5); - paintBaseTriangle(g2d); - g2d.translate(-7, -5); - - g2d.setColor(borderColor); - g2d.drawLine(4, 5, 10, 5); - g2d.drawLine(11, 6, 7, 10); - g2d.drawLine(7, 10, 3, 6); - } - -} Added: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/TriangleIconDown.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/TriangleIconDown.java (rev 0) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/TriangleIconDown.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -0,0 +1,49 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.images; + +import java.awt.Color; +import java.awt.Graphics2D; + +import org.ajax4jsf.resource.ResourceContext; + +/** + * @author Siarhej Chalipau + * + */ +public class TriangleIconDown extends TriangleIconBase { + + protected void paintImage(ResourceContext context, Graphics2D g2d, + Color textColor, Color borderColor) { + + g2d.setColor(textColor); + g2d.translate(7, 5); + paintBaseTriangle(g2d); + g2d.translate(-7, -5); + + g2d.setColor(borderColor); + g2d.drawLine(4, 5, 10, 5); + g2d.drawLine(11, 6, 7, 10); + g2d.drawLine(7, 10, 3, 6); + } + +} Deleted: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/TriangleIconUp.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/TriangleIconUp.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/TriangleIconUp.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -1,44 +0,0 @@ -/** - * License Agreement. - * - * JBoss RichFaces - Ajax4jsf Component Library - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.richfaces.renderkit.html.images; - -import java.awt.Color; -import java.awt.Graphics2D; - -import org.ajax4jsf.resource.ResourceContext; - -/** - * @author Siarhej Chalipau - * - */ -public class TriangleIconUp extends TriangleIconDown { - - protected void paintImage(ResourceContext context, Graphics2D g2d, - Color textColor, Color borderColor) { - - g2d.translate(0, 14); - g2d.scale(1, -1); - - super.paintImage(context, g2d, textColor, borderColor); - } - -} Added: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/TriangleIconUp.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/TriangleIconUp.java (rev 0) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/TriangleIconUp.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -0,0 +1,44 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.images; + +import java.awt.Color; +import java.awt.Graphics2D; + +import org.ajax4jsf.resource.ResourceContext; + +/** + * @author Siarhej Chalipau + * + */ +public class TriangleIconUp extends TriangleIconDown { + + protected void paintImage(ResourceContext context, Graphics2D g2d, + Color textColor, Color borderColor) { + + g2d.translate(0, 14); + g2d.scale(1, -1); + + super.paintImage(context, g2d, textColor, borderColor); + } + +} Modified: trunk/framework/impl/src/main/resources/META-INF/resources-config.xml =================================================================== --- trunk/framework/impl/src/main/resources/META-INF/resources-config.xml 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/framework/impl/src/main/resources/META-INF/resources-config.xml 2008-06-26 13:43:53 UTC (rev 9239) @@ -43,13 +43,6 @@ <name>org.richfaces.renderkit.html.BaseGradient</name> </resource> - <resource class="org.richfaces.renderkit.html.images.TriangleIconDown"> - <name>org.richfaces.renderkit.html.images.TriangleIconDown</name> - </resource> - <resource class="org.richfaces.renderkit.html.images.TriangleIconUp"> - <name>org.richfaces.renderkit.html.images.TriangleIconUp</name> - </resource> - <resource> <name>jquery.js</name> <path>org/richfaces/renderkit/html/scripts/jquery/jquery.js</path> Property changes on: trunk/sandbox/ui/extendedDataTable ___________________________________________________________________ Name: svn:ignore + bin target .project Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -42,9 +42,9 @@ import org.richfaces.component.Row; import org.richfaces.component.UIDataTable; import org.richfaces.model.Ordering; +import org.richfaces.renderkit.html.iconimages.DataTableIconSortAsc; +import org.richfaces.renderkit.html.iconimages.DataTableIconSortDesc; import org.richfaces.renderkit.html.iconimages.DataTableIconSortNone; -import org.richfaces.renderkit.html.images.TriangleIconDown; -import org.richfaces.renderkit.html.images.TriangleIconUp; /** * @author shura @@ -633,13 +633,13 @@ if (null != col.getSortIconAscending()) { imageUrl = col.getSortIconAscending(); } else { - imageUrl = getResource(TriangleIconUp.class.getName()).getUri(context, null); + imageUrl = getResource(DataTableIconSortAsc.class.getName()).getUri(context, null); } } else if (Ordering.DESCENDING.equals(col.getSortOrder())) { if (null != col.getSortIconDescending()) { imageUrl = col.getSortIconDescending(); } else { - imageUrl = getResource(TriangleIconDown.class.getName()).getUri(context, null); + imageUrl = getResource(DataTableIconSortDesc.class.getName()).getUri(context, null); } } else if (col.isSelfSorted()) { if (null != col.getSortIcon()) { Deleted: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/iconimages/DataTableIconBasic.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/iconimages/DataTableIconBasic.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/iconimages/DataTableIconBasic.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -1,103 +0,0 @@ -/** - * License Agreement. - * - * JBoss RichFaces - Ajax4jsf Component Library - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.richfaces.renderkit.html.iconimages; - -import java.awt.Color; -import java.awt.Dimension; -import java.util.Date; - -import javax.faces.context.FacesContext; - -import org.ajax4jsf.resource.GifRenderer; -import org.ajax4jsf.resource.InternetResourceBuilder; -import org.ajax4jsf.resource.Java2Dresource; -import org.ajax4jsf.resource.ResourceContext; -import org.ajax4jsf.util.HtmlColor; -import org.ajax4jsf.util.Zipper; -import org.richfaces.skin.Skin; -import org.richfaces.skin.SkinFactory; - -public abstract class DataTableIconBasic extends Java2Dresource { - - public DataTableIconBasic() { - setRenderer(new GifRenderer()); - setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime())); - } - - public Dimension getDimensions(FacesContext facesContext, Object data) { - return calculateDimensions(); - } - protected Dimension getDimensions(ResourceContext resourceContext) { - return calculateDimensions(); - } - - protected Object deserializeData(byte[] objectArray) { - if (objectArray == null) { - return null; - } - - Object [] stored = new Object[2]; - stored[0] = new Color(Zipper.unzip(objectArray, 0)); - stored[1] = new Color(Zipper.unzip(objectArray, 3)); - - return stored; - } - - public abstract Dimension calculateDimensions(); - - - protected Object getDataToStore(FacesContext context, Object data) { - Skin skin = SkinFactory.getInstance().getSkin(context); - Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context); - - Color col = null; - - String skinParameter = "headerTextColor"; - String headerTextColor = (String) skin.getParameter(context, skinParameter); - if (null == headerTextColor || "".equals(headerTextColor)) - headerTextColor = (String) defaultSkin.getParameter(context, skinParameter); - - if (headerTextColor == null) { - return null; - } - - col = HtmlColor.decode(headerTextColor); - - byte[] ret = new byte[6]; - Zipper.zip(ret, col.getRGB(), 0); - - skinParameter = "headerBackgroundColor"; - String headerBackgroundColor = (String) skin.getParameter(context, skinParameter); - if (null == headerBackgroundColor || "".equals(headerBackgroundColor)) - headerBackgroundColor = (String) defaultSkin.getParameter(context, skinParameter); - - if (headerBackgroundColor == null) { - return null; - } - - col = HtmlColor.decode(headerBackgroundColor); - - Zipper.zip(ret, col.getRGB(), 3); - - return ret; - } -} Added: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/iconimages/DataTableIconConstants.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/iconimages/DataTableIconConstants.java (rev 0) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/iconimages/DataTableIconConstants.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -0,0 +1,30 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.iconimages; + + +class DataTableIconConstants { + + public static final String SORT_ICON_COLOR = "dataTableSortIconColor"; + public static final String SORT_ICON_BORDER_COLOR = "dataTableSortIconBorderColor"; + +} Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/iconimages/DataTableIconSortAsc.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/iconimages/DataTableIconSortAsc.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/iconimages/DataTableIconSortAsc.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -21,34 +21,17 @@ package org.richfaces.renderkit.html.iconimages; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Graphics2D; -import java.awt.RenderingHints; -import java.awt.geom.GeneralPath; +import static org.richfaces.renderkit.html.iconimages.DataTableIconConstants.SORT_ICON_BORDER_COLOR; +import static org.richfaces.renderkit.html.iconimages.DataTableIconConstants.SORT_ICON_COLOR; -import org.ajax4jsf.resource.ResourceContext; +import javax.faces.context.FacesContext; -public class DataTableIconSortAsc extends DataTableIconBasic { +import org.richfaces.renderkit.html.images.TriangleIconUp; + +public class DataTableIconSortAsc extends TriangleIconUp { - public Dimension calculateDimensions() { - return new Dimension(13, 4); + protected Object getDataToStore(FacesContext context, Object data) { + return super.getDataToStore(context, SORT_ICON_COLOR, ICON_COLOR, + SORT_ICON_BORDER_COLOR, BORDER_COLOR); } - - protected void paint(ResourceContext context, Graphics2D g2d) { - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); - g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE); - GeneralPath path = new GeneralPath(); - - path.moveTo(1,4); - path.lineTo(4,0); - path.lineTo(8,4); - path.closePath(); - Object [] data = (Object[]) restoreData(context); - Color col = (Color)data[0]; - - g2d.setColor(col); - g2d.fill(path); - } } Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/iconimages/DataTableIconSortDesc.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/iconimages/DataTableIconSortDesc.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/iconimages/DataTableIconSortDesc.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -21,34 +21,17 @@ package org.richfaces.renderkit.html.iconimages; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Graphics2D; -import java.awt.RenderingHints; -import java.awt.geom.GeneralPath; +import static org.richfaces.renderkit.html.iconimages.DataTableIconConstants.SORT_ICON_BORDER_COLOR; +import static org.richfaces.renderkit.html.iconimages.DataTableIconConstants.SORT_ICON_COLOR; -import org.ajax4jsf.resource.ResourceContext; +import javax.faces.context.FacesContext; -public class DataTableIconSortDesc extends DataTableIconBasic { +import org.richfaces.renderkit.html.images.TriangleIconDown; - public Dimension calculateDimensions() { - return new Dimension(13, 4); +public class DataTableIconSortDesc extends TriangleIconDown { + + protected Object getDataToStore(FacesContext context, Object data) { + return super.getDataToStore(context, SORT_ICON_COLOR, ICON_COLOR, + SORT_ICON_BORDER_COLOR, BORDER_COLOR); } - - protected void paint(ResourceContext context, Graphics2D g2d) { - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); - g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE); - GeneralPath path = new GeneralPath(); - - path.moveTo(1,0); - path.lineTo(4,4); - path.lineTo(8,0); - path.closePath(); - Object [] data = (Object[]) restoreData(context); - Color col = (Color)data[0]; - - g2d.setColor(col); - g2d.fill(path); - } } Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/iconimages/DataTableIconSortNone.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/iconimages/DataTableIconSortNone.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/iconimages/DataTableIconSortNone.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -21,10 +21,15 @@ package org.richfaces.renderkit.html.iconimages; +import static org.richfaces.renderkit.html.iconimages.DataTableIconConstants.SORT_ICON_BORDER_COLOR; +import static org.richfaces.renderkit.html.iconimages.DataTableIconConstants.SORT_ICON_COLOR; + import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; +import javax.faces.context.FacesContext; + import org.ajax4jsf.resource.ResourceContext; import org.richfaces.renderkit.html.images.TriangleIconBase; @@ -56,4 +61,8 @@ g2d.drawLine(3, 8, 6, 5); } + protected Object getDataToStore(FacesContext context, Object data) { + return super.getDataToStore(context, SORT_ICON_COLOR, ICON_COLOR, + SORT_ICON_BORDER_COLOR, BORDER_COLOR); + } } Modified: trunk/ui/dataTable/src/test/java/org/richfaces/renderkit/SortableHeaderRenderingTest.java =================================================================== --- trunk/ui/dataTable/src/test/java/org/richfaces/renderkit/SortableHeaderRenderingTest.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/dataTable/src/test/java/org/richfaces/renderkit/SortableHeaderRenderingTest.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -43,6 +43,7 @@ import org.richfaces.component.UIColumn; import org.richfaces.component.UIDataTable; import org.richfaces.model.Ordering; +import org.richfaces.renderkit.html.iconimages.DataTableIconSortAsc; import com.gargoylesoftware.htmlunit.html.DomText; import com.gargoylesoftware.htmlunit.html.HtmlElement; @@ -190,7 +191,7 @@ String src = img.getAttributeValue(HTML.src_ATTRIBUTE); assertNotNull(src); - assertTrue(src.contains("org.richfaces.renderkit.html.images.TriangleIconUp")); + assertTrue(src.contains(DataTableIconSortAsc.class.getName())); } /** Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconCopy.java =================================================================== --- trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconCopy.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconCopy.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -5,8 +5,7 @@ import org.ajax4jsf.resource.ResourceContext; - -public class ListShuttleIconCopy extends TriangleIconUp { +public class ListShuttleIconCopy extends OrderingListIconUp { protected void paintImage(ResourceContext context, Graphics2D g2d, Color textColor, Color borderColor) { Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconCopyAllDisabled.java =================================================================== --- trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconCopyAllDisabled.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconCopyAllDisabled.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -1,10 +1,14 @@ package org.richfaces.renderkit.html.images; +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_DISABLED_BORDER_COLOR; +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_DISABLED_ICON_COLOR; + import javax.faces.context.FacesContext; public class ListShuttleIconCopyAllDisabled extends ListShuttleIconCopyAll { + protected Object getDataToStore(FacesContext context, Object data) { - return storeData(context, DISABLED_ICON_COLOR, DISABLED_BACKGROUND_COLOR, - DISABLED_BORDER_COLOR); + return super.getDataToStore(context, SELECT_LIST_DISABLED_ICON_COLOR, DISABLED_ICON_COLOR, + SELECT_LIST_DISABLED_BORDER_COLOR, DISABLED_BORDER_COLOR); } } Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconCopyDisabled.java =================================================================== --- trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconCopyDisabled.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconCopyDisabled.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -1,10 +1,14 @@ package org.richfaces.renderkit.html.images; +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_DISABLED_BORDER_COLOR; +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_DISABLED_ICON_COLOR; + import javax.faces.context.FacesContext; public class ListShuttleIconCopyDisabled extends ListShuttleIconCopy { + protected Object getDataToStore(FacesContext context, Object data) { - return storeData(context, DISABLED_ICON_COLOR, DISABLED_BACKGROUND_COLOR, - DISABLED_BORDER_COLOR); + return super.getDataToStore(context, SELECT_LIST_DISABLED_ICON_COLOR, DISABLED_ICON_COLOR, + SELECT_LIST_DISABLED_BORDER_COLOR, DISABLED_BORDER_COLOR); } } Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconRemove.java =================================================================== --- trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconRemove.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconRemove.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -5,7 +5,7 @@ import org.ajax4jsf.resource.ResourceContext; -public class ListShuttleIconRemove extends TriangleIconDown { +public class ListShuttleIconRemove extends OrderingListIconDown { protected void paintImage(ResourceContext context, Graphics2D g2d, Color textColor, Color borderColor) { Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconRemoveAllDisabled.java =================================================================== --- trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconRemoveAllDisabled.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconRemoveAllDisabled.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -1,10 +1,14 @@ package org.richfaces.renderkit.html.images; +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_DISABLED_BORDER_COLOR; +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_DISABLED_ICON_COLOR; + import javax.faces.context.FacesContext; public class ListShuttleIconRemoveAllDisabled extends ListShuttleIconRemoveAll { + protected Object getDataToStore(FacesContext context, Object data) { - return storeData(context, DISABLED_ICON_COLOR, DISABLED_BACKGROUND_COLOR, - DISABLED_BORDER_COLOR); + return super.getDataToStore(context, SELECT_LIST_DISABLED_ICON_COLOR, DISABLED_ICON_COLOR, + SELECT_LIST_DISABLED_BORDER_COLOR, DISABLED_BORDER_COLOR); } } Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconRemoveDisabled.java =================================================================== --- trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconRemoveDisabled.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/html/images/ListShuttleIconRemoveDisabled.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -1,10 +1,14 @@ package org.richfaces.renderkit.html.images; +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_DISABLED_BORDER_COLOR; +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_DISABLED_ICON_COLOR; + import javax.faces.context.FacesContext; public class ListShuttleIconRemoveDisabled extends ListShuttleIconRemove { + protected Object getDataToStore(FacesContext context, Object data) { - return storeData(context, DISABLED_ICON_COLOR, DISABLED_BACKGROUND_COLOR, - DISABLED_BORDER_COLOR); + return super.getDataToStore(context, SELECT_LIST_DISABLED_ICON_COLOR, DISABLED_ICON_COLOR, + SELECT_LIST_DISABLED_BORDER_COLOR, DISABLED_BORDER_COLOR); } } Modified: trunk/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java =================================================================== --- trunk/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -72,7 +72,7 @@ javaScripts.add("scripts/ListShuttle.js"); javaScripts.add("scripts/ListBase.js"); - imageClasses.add("org.richfaces.renderkit.html.images.TriangleIconUp"); + imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconUp"); imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconTop"); imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconBottom"); imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconUpDisabled"); @@ -87,7 +87,7 @@ imageClasses.add("org.richfaces.renderkit.html.images.ListShuttleIconRemoveAll"); imageClasses.add("org.richfaces.renderkit.html.images.ListShuttleIconRemoveDisabled"); imageClasses.add("org.richfaces.renderkit.html.images.ListShuttleIconRemoveAllDisabled"); - imageClasses.add("org.richfaces.renderkit.html.images.TriangleIconDown"); + imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconDown"); imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconBottomDisabled"); imagePNGClasses.add("org.richfaces.renderkit.html.gradientimages.OrderingListButtonGradient"); Modified: trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentControlsHelper.java =================================================================== --- trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentControlsHelper.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentControlsHelper.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -3,14 +3,13 @@ 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.TriangleIconDown; +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.TriangleIconUp; +import org.richfaces.renderkit.html.images.OrderingListIconUp; import org.richfaces.renderkit.html.images.OrderingListIconUpDisabled; public class OrderingComponentControlsHelper { @@ -93,7 +92,7 @@ } }, - new OrderingComponentRendererBase.ControlsHelper("up", "RICH_SHUTTLES_UP_LABEL", DEFAULT_LABEL_UP, TriangleIconUp.class.getName(), FACET_UP, + new OrderingComponentRendererBase.ControlsHelper("up", "RICH_SHUTTLES_UP_LABEL", DEFAULT_LABEL_UP, OrderingListIconUp.class.getName(), FACET_UP, "-up", ATTRIBUTE_CLASS_UP_CONTROL, "", CONTROL_ID_UP, ATTRIBUTE_CE_ONUPCLICK ,true, "up".concat(CONTROL_LABEL_ATTRIBUTE_SUFFIX)) { @@ -111,7 +110,7 @@ } }, - new OrderingComponentRendererBase.ControlsHelper("down", "RICH_SHUTTLES_DOWN_LABEL", DEFAULT_LABEL_DOWN, TriangleIconDown.class.getName(), FACET_DOWN, + new OrderingComponentRendererBase.ControlsHelper("down", "RICH_SHUTTLES_DOWN_LABEL", DEFAULT_LABEL_DOWN, OrderingListIconDown.class.getName(), FACET_DOWN, "-down", ATTRIBUTE_CLASS_DOWN_CONTROL, "", CONTROL_ID_DOWN, ATTRIBUTE_CE_ONDOWNCLICK, true, "down".concat(CONTROL_LABEL_ATTRIBUTE_SUFFIX)) { Modified: trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottom.java =================================================================== --- trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottom.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottom.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -21,9 +21,14 @@ package org.richfaces.renderkit.html.images; +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_BORDER_COLOR; +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_ICON_COLOR; + import java.awt.Color; import java.awt.Graphics2D; +import javax.faces.context.FacesContext; + import org.ajax4jsf.resource.ResourceContext; /** @@ -73,4 +78,8 @@ g2d.drawLine(4, 6, 10, 6); } + protected Object getDataToStore(FacesContext context, Object data) { + return super.getDataToStore(context, SELECT_LIST_ICON_COLOR, ICON_COLOR, + SELECT_LIST_BORDER_COLOR, BORDER_COLOR); + } } Modified: trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottomDisabled.java =================================================================== --- trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottomDisabled.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottomDisabled.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -21,15 +21,21 @@ package org.richfaces.renderkit.html.images; +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_DISABLED_BORDER_COLOR; +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_DISABLED_ICON_COLOR; + import javax.faces.context.FacesContext; + /** * @author Siarhej Chalipau * */ public class OrderingListIconBottomDisabled extends OrderingListIconBottom { + protected Object getDataToStore(FacesContext context, Object data) { - return storeData(context, DISABLED_ICON_COLOR, DISABLED_BACKGROUND_COLOR, - DISABLED_BORDER_COLOR); + return super.getDataToStore(context, SELECT_LIST_DISABLED_ICON_COLOR, DISABLED_ICON_COLOR, + SELECT_LIST_DISABLED_BORDER_COLOR, DISABLED_BORDER_COLOR); } + } Added: trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconConstants.java =================================================================== --- trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconConstants.java (rev 0) +++ trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconConstants.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -0,0 +1,32 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.images; + +class OrderingListIconConstants { + + public static final String SELECT_LIST_ICON_COLOR = "selectListIconColor"; + public static final String SELECT_LIST_BORDER_COLOR = "selectListIconBorderColor"; + + public static final String SELECT_LIST_DISABLED_ICON_COLOR = "selectListDisabledIconColor"; + public static final String SELECT_LIST_DISABLED_BORDER_COLOR = "selectListDisabledIconBorderColor"; + +} Added: trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDown.java =================================================================== --- trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDown.java (rev 0) +++ trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDown.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -0,0 +1,39 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.images; + +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_BORDER_COLOR; +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_ICON_COLOR; + +import javax.faces.context.FacesContext; + +/** + * @author Siarhej Chalipau + * + */ +public class OrderingListIconDown extends TriangleIconDown { + + protected Object getDataToStore(FacesContext context, Object data) { + return super.getDataToStore(context, SELECT_LIST_ICON_COLOR, ICON_COLOR, + SELECT_LIST_BORDER_COLOR, BORDER_COLOR); + } +} Modified: trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDownDisabled.java =================================================================== --- trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDownDisabled.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDownDisabled.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -21,15 +21,19 @@ package org.richfaces.renderkit.html.images; +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_DISABLED_BORDER_COLOR; +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_DISABLED_ICON_COLOR; + import javax.faces.context.FacesContext; /** * @author Siarhej Chalipau * */ -public class OrderingListIconDownDisabled extends TriangleIconDown { +public class OrderingListIconDownDisabled extends OrderingListIconDown { + protected Object getDataToStore(FacesContext context, Object data) { - return storeData(context, DISABLED_ICON_COLOR, DISABLED_BACKGROUND_COLOR, - DISABLED_BORDER_COLOR); + return super.getDataToStore(context, SELECT_LIST_DISABLED_ICON_COLOR, DISABLED_ICON_COLOR, + SELECT_LIST_DISABLED_BORDER_COLOR, DISABLED_BORDER_COLOR); } } Modified: trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconTopDisabled.java =================================================================== --- trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconTopDisabled.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconTopDisabled.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -21,6 +21,9 @@ package org.richfaces.renderkit.html.images; +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_DISABLED_BORDER_COLOR; +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_DISABLED_ICON_COLOR; + import javax.faces.context.FacesContext; /** @@ -28,8 +31,9 @@ * */ public class OrderingListIconTopDisabled extends OrderingListIconTop { + protected Object getDataToStore(FacesContext context, Object data) { - return storeData(context, DISABLED_ICON_COLOR, DISABLED_BACKGROUND_COLOR, - DISABLED_BORDER_COLOR); + return super.getDataToStore(context, SELECT_LIST_DISABLED_ICON_COLOR, DISABLED_ICON_COLOR, + SELECT_LIST_DISABLED_BORDER_COLOR, DISABLED_BORDER_COLOR); } } Added: trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUp.java =================================================================== --- trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUp.java (rev 0) +++ trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUp.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -0,0 +1,39 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.images; + +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_BORDER_COLOR; +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_ICON_COLOR; + +import javax.faces.context.FacesContext; + +/** + * @author Siarhej Chalipau + * + */ +public class OrderingListIconUp extends TriangleIconUp { + + protected Object getDataToStore(FacesContext context, Object data) { + return super.getDataToStore(context, SELECT_LIST_ICON_COLOR, ICON_COLOR, + SELECT_LIST_BORDER_COLOR, BORDER_COLOR); + } +} Modified: trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUpDisabled.java =================================================================== --- trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUpDisabled.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUpDisabled.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -21,15 +21,19 @@ package org.richfaces.renderkit.html.images; +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_DISABLED_BORDER_COLOR; +import static org.richfaces.renderkit.html.images.OrderingListIconConstants.SELECT_LIST_DISABLED_ICON_COLOR; + import javax.faces.context.FacesContext; /** * @author Siarhej Chalipau * */ -public class OrderingListIconUpDisabled extends TriangleIconUp { +public class OrderingListIconUpDisabled extends OrderingListIconUp { + protected Object getDataToStore(FacesContext context, Object data) { - return storeData(context, DISABLED_ICON_COLOR, DISABLED_BACKGROUND_COLOR, - DISABLED_BORDER_COLOR); + return super.getDataToStore(context, SELECT_LIST_DISABLED_ICON_COLOR, DISABLED_ICON_COLOR, + SELECT_LIST_DISABLED_BORDER_COLOR, DISABLED_BORDER_COLOR); } } Modified: trunk/ui/orderingList/src/test/java/org/richfaces/renderkit/OrderingListRenderingTest.java =================================================================== --- trunk/ui/orderingList/src/test/java/org/richfaces/renderkit/OrderingListRenderingTest.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/orderingList/src/test/java/org/richfaces/renderkit/OrderingListRenderingTest.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -65,14 +65,14 @@ javaScripts.add("scripts/OrderingList.js"); javaScripts.add("scripts/ListBase.js"); - imageClasses.add("org.richfaces.renderkit.html.images.TriangleIconUp"); + imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconUp"); imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconTop"); imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconBottom"); imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconUpDisabled"); imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconDownDisabled"); imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconTopDisabled"); imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconBottomDisabled"); - imageClasses.add("org.richfaces.renderkit.html.images.TriangleIconDown"); + imageClasses.add("org.richfaces.renderkit.html.images.OrderingListIconDown"); imagePNGClasses.add("org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient"); imagePNGClasses.add("org.richfaces.renderkit.html.gradientimages.OrderingListClickedGradient"); Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/iconimages/ScrollableDataTableIconSplit.java =================================================================== --- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/iconimages/ScrollableDataTableIconSplit.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/iconimages/ScrollableDataTableIconSplit.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -4,11 +4,26 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.RenderingHints; +import java.util.Date; +import javax.faces.context.FacesContext; + +import org.ajax4jsf.resource.GifRenderer; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.Java2Dresource; import org.ajax4jsf.resource.ResourceContext; +import org.ajax4jsf.util.HtmlColor; +import org.ajax4jsf.util.Zipper; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; -public class ScrollableDataTableIconSplit extends DataTableIconBasic { +public class ScrollableDataTableIconSplit extends Java2Dresource { + public ScrollableDataTableIconSplit() { + setRenderer(new GifRenderer()); + setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime())); + } + public Dimension calculateDimensions() { return new Dimension(2, 13); } @@ -28,4 +43,59 @@ g2d.drawLine(1, 0, 1, 12); } + public Dimension getDimensions(FacesContext facesContext, Object data) { + return calculateDimensions(); + } + protected Dimension getDimensions(ResourceContext resourceContext) { + return calculateDimensions(); + } + + protected Object deserializeData(byte[] objectArray) { + if (objectArray == null) { + return null; + } + + Object [] stored = new Object[2]; + stored[0] = new Color(Zipper.unzip(objectArray, 0)); + stored[1] = new Color(Zipper.unzip(objectArray, 3)); + + return stored; + } + + protected Object getDataToStore(FacesContext context, Object data) { + Skin skin = SkinFactory.getInstance().getSkin(context); + Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context); + + Color col = null; + + String skinParameter = "headerTextColor"; + String headerTextColor = (String) skin.getParameter(context, skinParameter); + if (null == headerTextColor || "".equals(headerTextColor)) + headerTextColor = (String) defaultSkin.getParameter(context, skinParameter); + + if (headerTextColor == null) { + return null; + } + + col = HtmlColor.decode(headerTextColor); + + byte[] ret = new byte[6]; + Zipper.zip(ret, col.getRGB(), 0); + + skinParameter = "headerBackgroundColor"; + String headerBackgroundColor = (String) skin.getParameter(context, skinParameter); + if (null == headerBackgroundColor || "".equals(headerBackgroundColor)) + headerBackgroundColor = (String) defaultSkin.getParameter(context, skinParameter); + + if (headerBackgroundColor == null) { + return null; + } + + col = HtmlColor.decode(headerBackgroundColor); + + Zipper.zip(ret, col.getRGB(), 3); + + return ret; + } + } Modified: trunk/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/iconimages/ScrollableDataTableIconBasicTest.java =================================================================== --- trunk/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/iconimages/ScrollableDataTableIconBasicTest.java 2008-06-26 13:33:39 UTC (rev 9238) +++ trunk/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/iconimages/ScrollableDataTableIconBasicTest.java 2008-06-26 13:43:53 UTC (rev 9239) @@ -23,7 +23,7 @@ public void testSaveResources(){ - DataTableIconBasic icon = new DataTableIconSortAsc(); + ScrollableDataTableIconSplit icon = new ScrollableDataTableIconSplit(); Skin skin = SkinFactory.getInstance().getSkin(facesContext); Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(facesContext);