Author: sergeyhalipov Date: 2007-11-14 14:05:13 -0500 (Wed, 14 Nov 2007) New Revision: 3995 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/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: Icon images changed in ordering list demo. 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-14 17:41:47 UTC (rev 3994) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java 2007-11-14 19:05:13 UTC (rev 3995) @@ -42,19 +42,27 @@ * */ public abstract class OrderingListIconBase extends Java2Dresource { + protected static final String ICON_COLOR = "headerTextColor"; + protected static final String BACKGROUND_COLOR = "headerBackgroundColor"; + protected static final String BORDER_COLOR = "subBorderColor"; + protected static final String DISABLED_ICON_COLOR = "tabDisabledTextColor"; + protected static final String DISABLED_BACKGROUND_COLOR = "tabBackgroundColor"; + protected static final String DISABLED_BORDER_COLOR = "subBorderColor"; + public OrderingListIconBase() { setRenderer(new GifRenderer()); setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime())); } - abstract protected void paintImage(ResourceContext context, Graphics2D g2d, Color textColor); + abstract protected void paintImage(ResourceContext context, Graphics2D g2d, Color textColor, Color borderColor); protected void paint(ResourceContext context, Graphics2D g2d) { int [] data = (int[]) restoreData(context); Color textColor = new Color(data[0]); Color backgroundColor = new Color(data[1]); + Color borderColor = new Color(data[2]); g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE); @@ -73,7 +81,7 @@ g2d.scale(dimension.getHeight()/120,dimension.getHeight()/120); if (textColor != null && backgroundColor != null && g2d != null) { - paintImage(context, g2d, textColor); + paintImage(context, g2d, textColor, borderColor); } } @@ -94,14 +102,14 @@ */ @Override protected Object getDataToStore(FacesContext context, Object data) { - return storeData(context, "headerTextColor", "headerBackgroundColor"); + return storeData(context, ICON_COLOR, BACKGROUND_COLOR, BORDER_COLOR); } - protected Object storeData(FacesContext context, String colorSkinParam, String backgroundSkinParam) { + protected Object storeData(FacesContext context, String colorSkinParam, String backgroundSkinParam, String borderSkinParam) { Skin skin = SkinFactory.getInstance().getSkin(context); Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context); - int [] ret = new int[2]; + int [] ret = new int[3]; Color color = null; @@ -128,6 +136,17 @@ color = HtmlColor.decode(color2); ret[1] = color.getRGB(); + 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); + ret[2] = color.getRGB(); + return ret; } 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-14 17:41:47 UTC (rev 3994) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottom.java 2007-11-14 19:05:13 UTC (rev 3995) @@ -24,6 +24,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; +import java.awt.geom.AffineTransform; import java.awt.geom.GeneralPath; import javax.faces.context.FacesContext; @@ -34,12 +35,16 @@ * @author Siarhej Chalipau * */ -public class OrderingListIconBottom extends OrderingListIconBase { +public class OrderingListIconBottom extends OrderingListIconTop { @Override protected void paintImage(ResourceContext context, Graphics2D g2d, - Color textColor) { - GeneralPath path = new GeneralPath(); + Color textColor, Color borderColor) { + + g2d.transform(new AffineTransform(1., 0., 0., -1., 0., 112.)); + super.paintImage(context, g2d, textColor, borderColor); + + /*GeneralPath path = new GeneralPath(); g2d.setColor(textColor); @@ -59,7 +64,7 @@ path.lineTo(34,33); path.lineTo(67,0); path.closePath(); - g2d.fill(path); + g2d.fill(path);*/ } } 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-14 17:41:47 UTC (rev 3994) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottomDisabled.java 2007-11-14 19:05:13 UTC (rev 3995) @@ -30,6 +30,6 @@ public class OrderingListIconBottomDisabled extends OrderingListIconBottom { @Override protected Object getDataToStore(FacesContext context, Object data) { - return storeData(context, "tabDisabledTextColor", "tabBackgroundColor"); + 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-14 17:41:47 UTC (rev 3994) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDown.java 2007-11-14 19:05:13 UTC (rev 3995) @@ -39,18 +39,23 @@ @Override protected void paintImage(ResourceContext context, Graphics2D g2d, - Color textColor) { + Color textColor, Color borderColor) { GeneralPath path = new GeneralPath(); - g2d.translate(23,46); - path.moveTo(0,0); - path.lineTo(33,33); - path.lineTo(34,33); - path.lineTo(67,0); + g2d.translate(15,38); + path.moveTo(8,8); + path.lineTo(41,41); + path.lineTo(42,41); + path.lineTo(75,8); path.closePath(); g2d.setColor(textColor); g2d.fill(path); + + g2d.setColor(borderColor); + g2d.drawLine(8, 8, 41, 41); + g2d.drawLine(41, 41, 72, 8); + g2d.drawLine(16, 0, 64, 0); } } 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-14 17:41:47 UTC (rev 3994) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDownDisabled.java 2007-11-14 19:05:13 UTC (rev 3995) @@ -30,6 +30,6 @@ public class OrderingListIconDownDisabled extends OrderingListIconDown { @Override protected Object getDataToStore(FacesContext context, Object data) { - return storeData(context, "tabDisabledTextColor", "tabBackgroundColor"); + 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-14 17:41:47 UTC (rev 3994) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconTop.java 2007-11-14 19:05:13 UTC (rev 3995) @@ -38,28 +38,53 @@ @Override protected void paintImage(ResourceContext context, Graphics2D g2d, - Color textColor) { + Color textColor, Color borderColor) { GeneralPath path = new GeneralPath(); g2d.setColor(textColor); - g2d.drawRect(31, 22, 51, 4); - - g2d.translate(23,31); - path.moveTo(0,33); - path.lineTo(33,0); - path.lineTo(34,0); - path.lineTo(67,33); + // First triangle + g2d.translate(23,23); + path.moveTo(0,39); + path.lineTo(33,8); + path.lineTo(34,8); + path.lineTo(67,39); path.closePath(); g2d.fill(path); + // Border or first triangle + g2d.setColor(borderColor); + g2d.drawLine(0, 33, 33, 0); + g2d.drawLine(33, 0, 67, 33); + g2d.drawLine(8, 41, 59, 41); + + // Second triangle + g2d.setColor(textColor); g2d.translate(0,27); - path.moveTo(0,33); - path.lineTo(33,0); - path.lineTo(34,0); - path.lineTo(67,33); + path.moveTo(0,41); + path.lineTo(33,8); + path.lineTo(34,8); + path.lineTo(67,41); path.closePath(); g2d.fill(path); + + // Border of second triangle + g2d.setColor(borderColor); + g2d.drawLine(0, 41, 25, 16); + g2d.drawLine(41, 16, 67, 41); + g2d.drawLine(8, 49, 59, 49); + + // Top Line and its borders. + g2d.setColor(textColor); + g2d.translate(-23, -50); + g2d.drawLine(31, 22, 79, 22); + + g2d.setColor(borderColor); + g2d.drawLine(31, 14, 79, 14); + g2d.drawRect(23, 22, 1, 1); + g2d.drawRect(87, 22, 1, 1); + g2d.drawLine(31, 30, 39, 30); + g2d.drawLine(79, 30, 71, 30); } } 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-14 17:41:47 UTC (rev 3994) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconTopDisabled.java 2007-11-14 19:05:13 UTC (rev 3995) @@ -30,6 +30,6 @@ public class OrderingListIconTopDisabled extends OrderingListIconTop { @Override protected Object getDataToStore(FacesContext context, Object data) { - return storeData(context, "tabDisabledTextColor", "tabBackgroundColor"); + 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-14 17:41:47 UTC (rev 3994) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUp.java 2007-11-14 19:05:13 UTC (rev 3995) @@ -38,18 +38,23 @@ @Override protected void paintImage(ResourceContext context, Graphics2D g2d, - Color textColor) { + Color textColor, Color borderColor) { GeneralPath path = new GeneralPath(); - g2d.translate(23,39); - path.moveTo(0,33); - path.lineTo(33,0); - path.lineTo(34,0); - path.lineTo(67,33); + g2d.translate(23,31); + path.moveTo(0,41); + path.lineTo(33,8); + path.lineTo(34,8); + path.lineTo(67,41); path.closePath(); g2d.setColor(textColor); g2d.fill(path); + + g2d.setColor(borderColor); + g2d.drawLine(0, 33, 33, 0); + g2d.drawLine(33, 0, 67, 33); + g2d.drawLine(8, 41, 59, 41); } } 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-14 17:41:47 UTC (rev 3994) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUpDisabled.java 2007-11-14 19:05:13 UTC (rev 3995) @@ -30,6 +30,6 @@ public class OrderingListIconUpDisabled extends OrderingListIconUp { @Override protected Object getDataToStore(FacesContext context, Object data) { - return storeData(context, "tabDisabledTextColor", "tabBackgroundColor"); + return storeData(context, DISABLED_ICON_COLOR, DISABLED_BACKGROUND_COLOR, DISABLED_BORDER_COLOR); } }