[richfaces-svn-commits] JBoss Rich Faces SVN: r4032 - trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images.

Author: nbelaevski Date: 2007-11-16 00:14:41 -0500 (Fri, 16 Nov 2007) New Revision: 4032 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/OrderingListIconDown.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/OrderingListIconUp.java Log: Updated icon images for orderingList 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-15 20:06:03 UTC (rev 4031) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java 2007-11-16 05:14:41 UTC (rev 4032) @@ -42,6 +42,9 @@ * */ public abstract class OrderingListIconBase extends Java2Dresource { + + private static final Dimension DIMENSION = new Dimension(15, 15); + protected static final String ICON_COLOR = "headerTextColor"; protected static final String BACKGROUND_COLOR = "headerBackgroundColor"; protected static final String BORDER_COLOR = "subBorderColor"; @@ -57,6 +60,12 @@ abstract protected void paintImage(ResourceContext context, Graphics2D g2d, Color textColor, Color borderColor); + protected void paintBaseTriangle(Graphics2D g2d) { + for (int i = 0; i < 7; i++) { + g2d.drawLine(-3 + i, 1, -3 + i, 1 + (i < 4 ? i : 6 - i)); + } + } + protected void paint(ResourceContext context, Graphics2D g2d) { int [] data = (int[]) restoreData(context); @@ -71,30 +80,25 @@ g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY); g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC); g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); - +// g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); +// 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);*/ - - Dimension dimension = getDimensions(context); - g2d.scale(dimension.getHeight()/120,dimension.getHeight()/120); - if (textColor != null && backgroundColor != null && g2d != null) { paintImage(context, g2d, textColor, borderColor); } } - protected Dimension calculateDimensions(Object data){ - return new Dimension(15, 15); - } - public Dimension getDimensions(FacesContext facesContext, Object data) { - return calculateDimensions(getDataToStore(facesContext, data)); + return DIMENSION; } protected Dimension getDimensions(ResourceContext resourceContext) { - return calculateDimensions(restoreData(resourceContext)); + return DIMENSION; } /** 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-15 20:06:03 UTC (rev 4031) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottom.java 2007-11-16 05:14:41 UTC (rev 4032) @@ -22,27 +22,56 @@ package org.richfaces.renderkit.html.images; 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; - import org.ajax4jsf.resource.ResourceContext; /** * @author Siarhej Chalipau * */ -public class OrderingListIconBottom extends OrderingListIconTop { +public class OrderingListIconBottom extends OrderingListIconBase { @Override protected void paintImage(ResourceContext context, Graphics2D g2d, Color textColor, Color borderColor) { - g2d.transform(new AffineTransform(1., 0., 0., -1., 0., 112.)); - super.paintImage(context, g2d, textColor, borderColor); + g2d.translate(0, -3); + + 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, 8, 9); + g2d.drawLine(6, 9, 3, 6); + + g2d.translate(0, 4); + g2d.setColor(textColor); + g2d.translate(7, 5); + paintBaseTriangle(g2d); + g2d.translate(-7, -5); + + g2d.setColor(borderColor); + g2d.drawLine(4, 5, 6, 5); + g2d.drawLine(8, 5, 10, 5); + g2d.drawLine(11, 6, 8, 9); + g2d.drawLine(6, 9, 3, 6); + + g2d.translate(0, 4); + + g2d.setColor(borderColor); + g2d.drawLine(4, 5, 6, 5); + g2d.drawLine(8, 5, 10, 5); + + g2d.drawLine(11, 6, 10, 7); + g2d.drawLine(4, 7, 3, 6); + g2d.drawLine(4, 7, 10, 7); + + g2d.setColor(textColor); + g2d.drawLine(4, 6, 10, 6); } } 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-15 20:06:03 UTC (rev 4031) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDown.java 2007-11-16 05:14:41 UTC (rev 4032) @@ -22,13 +22,8 @@ package org.richfaces.renderkit.html.images; import java.awt.Color; -import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.RenderingHints; -import java.awt.geom.GeneralPath; -import javax.faces.context.FacesContext; - import org.ajax4jsf.resource.ResourceContext; /** @@ -40,22 +35,16 @@ @Override protected void paintImage(ResourceContext context, Graphics2D g2d, Color textColor, Color borderColor) { - GeneralPath path = new GeneralPath(); - - 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.translate(7, 5); + paintBaseTriangle(g2d); + g2d.translate(-7, -5); + g2d.setColor(borderColor); - g2d.drawLine(8, 8, 41, 41); - g2d.drawLine(41, 41, 72, 8); - g2d.drawLine(16, 0, 64, 0); + g2d.drawLine(4, 5, 10, 5); + g2d.drawLine(11, 6, 7, 10); + g2d.drawLine(7, 10, 3, 6); } } 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-15 20:06:03 UTC (rev 4031) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconTop.java 2007-11-16 05:14:41 UTC (rev 4032) @@ -22,69 +22,24 @@ package org.richfaces.renderkit.html.images; import java.awt.Color; -import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.geom.GeneralPath; -import javax.faces.context.FacesContext; - import org.ajax4jsf.resource.ResourceContext; /** * @author Siarhej Chalipau * */ -public class OrderingListIconTop extends OrderingListIconBase { +public class OrderingListIconTop extends OrderingListIconBottom { @Override protected void paintImage(ResourceContext context, Graphics2D g2d, Color textColor, Color borderColor) { - GeneralPath path = new GeneralPath(); - g2d.setColor(textColor); + g2d.translate(0, 14); + g2d.scale(1, -1); - // 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,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); + super.paintImage(context, g2d, textColor, borderColor); } } 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-15 20:06:03 UTC (rev 4031) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUp.java 2007-11-16 05:14:41 UTC (rev 4032) @@ -22,39 +22,24 @@ package org.richfaces.renderkit.html.images; import java.awt.Color; -import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.geom.GeneralPath; -import javax.faces.context.FacesContext; - import org.ajax4jsf.resource.ResourceContext; /** * @author Siarhej Chalipau * */ -public class OrderingListIconUp extends OrderingListIconBase { +public class OrderingListIconUp extends OrderingListIconDown { @Override protected void paintImage(ResourceContext context, Graphics2D g2d, Color textColor, Color borderColor) { - GeneralPath path = new GeneralPath(); - - 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.translate(0, 14); + g2d.scale(1, -1); - g2d.setColor(borderColor); - g2d.drawLine(0, 33, 33, 0); - g2d.drawLine(33, 0, 67, 33); - g2d.drawLine(8, 41, 59, 41); + super.paintImage(context, g2d, textColor, borderColor); } }