[richfaces-svn-commits] JBoss Rich Faces SVN: r21196 - in trunk/ui/output/ui/src/main: resources/META-INF/richfaces and 1 other directory.

Author: nbelaevski Date: 2011-01-25 07:08:46 -0500 (Tue, 25 Jan 2011) New Revision: 21196 Added: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconBasic.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconChevron.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconChevronBasic.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconChevronDown.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconChevronLeft.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconChevronUp.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconDisc.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconGrid.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconSpacer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconTriangle.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconTriangleBasic.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconTriangleDown.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconTriangleLeft.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconTriangleUp.java Removed: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconBasic.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevron.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevronBasic.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevronDown.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevronLeft.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevronUp.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconDisc.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconGrid.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconSpacer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangle.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangleBasic.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangleDown.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangleLeft.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangleUp.java Modified: trunk/ui/output/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties Log: Panel menu icons refactoring Copied: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconBasic.java (from rev 21189, trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconBasic.java) =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconBasic.java (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconBasic.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -0,0 +1,88 @@ +/** + * 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.awt.Graphics2D; +import java.awt.RenderingHints; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; + +import javax.faces.context.FacesContext; + +import org.richfaces.resource.AbstractJava2DUserResource; +import org.richfaces.resource.PostConstructResource; +import org.richfaces.resource.StateHolderResource; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; + +/** + * @author Alex.Kolonitsky + */ +public abstract class PanelIconBasic extends AbstractJava2DUserResource implements StateHolderResource { + + private static final Dimension DIMENSION = new Dimension(16, 16); + + private Color color; + + protected PanelIconBasic() { + super(DIMENSION); + } + + public void paint(Graphics2D graphics2D) { + if (color == null || graphics2D == null) { + return; + } + + graphics2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + graphics2D.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE); + graphics2D.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY); + graphics2D.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); + graphics2D.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); + + paintImage(graphics2D, color); + } + + protected abstract void paintImage(Graphics2D g2d, Color color); + + public boolean isTransient() { + return false; + } + + @PostConstructResource + public void initialize() { + FacesContext context = FacesContext.getCurrentInstance(); + Skin skin = SkinFactory.getInstance(context).getSkin(context); + color = new Color(skin.getColorParameter(context, "tabDisabledTextColor")); + } + + public void writeState(FacesContext context, DataOutput dataOutput) throws IOException { + dataOutput.writeInt(color.getRGB()); + } + + public void readState(FacesContext context, DataInput dataInput) throws IOException { + color = new Color(dataInput.readInt()); + } + +} Copied: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconChevron.java (from rev 21189, trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevron.java) =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconChevron.java (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconChevron.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -0,0 +1,42 @@ +/** + * 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 org.richfaces.resource.DynamicUserResource; + +import java.awt.geom.GeneralPath; + +@DynamicUserResource +public class PanelIconChevron extends PanelIconChevronBasic { + + protected void draw(GeneralPath path) { + path.moveTo(1, 1); + + path.lineTo(17, 1); + path.lineTo(47, 31); + path.lineTo(17, 61); + path.lineTo(1, 61); + path.lineTo(31, 31); + path.closePath(); + } + +} Copied: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconChevronBasic.java (from rev 21189, trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevronBasic.java) =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconChevronBasic.java (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconChevronBasic.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -0,0 +1,79 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * 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.BasicStroke; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.awt.RenderingHints; +import java.awt.geom.AffineTransform; +import java.awt.geom.GeneralPath; +import java.awt.image.AffineTransformOp; +import java.awt.image.BufferedImage; + +/** + * @author Alex.Kolonitsky + */ +public abstract class PanelIconChevronBasic extends PanelIconBasic { + private static final int BUFFER_IMAGE_SIZE = 128; + + @Override + protected void paintImage(Graphics2D graphics2d, Color color) { + + BufferedImage bufferedImage = new BufferedImage(BUFFER_IMAGE_SIZE, BUFFER_IMAGE_SIZE, BufferedImage.TYPE_INT_ARGB); + Graphics2D g2d = bufferedImage.createGraphics(); + + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); + g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE); + g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); + g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_DISABLE); + 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); + + Dimension dimension = getDimension(); + g2d.setStroke(new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)); + g2d.translate(28, 28); + g2d.setColor(color); + + GeneralPath path = new GeneralPath(); + draw(path); + + g2d.fill(path); + if (this instanceof PanelIconChevron + || this instanceof PanelIconChevronLeft) { + g2d.translate(24, 0); + } else { + g2d.translate(0, 24); + } + g2d.fill(path); + + AffineTransform transform = AffineTransform.getScaleInstance(dimension.getHeight() / BUFFER_IMAGE_SIZE, dimension.getHeight() / BUFFER_IMAGE_SIZE); + AffineTransformOp transformOp = new AffineTransformOp(transform, AffineTransformOp.TYPE_BILINEAR); + + graphics2d.drawImage(bufferedImage, transformOp, 0, 0); + g2d.dispose(); + } + + abstract void draw(GeneralPath draw); +} Copied: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconChevronDown.java (from rev 21189, trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevronDown.java) =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconChevronDown.java (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconChevronDown.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -0,0 +1,42 @@ +/** + * 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 org.richfaces.resource.DynamicUserResource; + +import java.awt.geom.GeneralPath; + +@DynamicUserResource +public class PanelIconChevronDown extends PanelIconChevronBasic { + + protected void draw(GeneralPath path) { + + path.moveTo(1, 0); + path.lineTo(31, 30); + path.lineTo(61, 0); + path.lineTo(61, 16); + path.lineTo(31, 46); + path.lineTo(1, 16); + path.closePath(); + + } +} Copied: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconChevronLeft.java (from rev 21189, trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevronLeft.java) =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconChevronLeft.java (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconChevronLeft.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -0,0 +1,41 @@ +/** + * 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 org.richfaces.resource.DynamicUserResource; + +import java.awt.geom.GeneralPath; + +@DynamicUserResource +public class PanelIconChevronLeft extends PanelIconChevronBasic { + + void draw(GeneralPath path) { + path.moveTo(61, 1); + path.lineTo(45, 1); + path.lineTo(15, 31); + path.lineTo(45, 61); + path.lineTo(61, 61); + path.lineTo(30, 31); + path.closePath(); + } + +} Copied: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconChevronUp.java (from rev 21189, trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevronUp.java) =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconChevronUp.java (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconChevronUp.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -0,0 +1,43 @@ +/** + * 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 org.richfaces.resource.DynamicUserResource; + +import java.awt.geom.GeneralPath; + +@DynamicUserResource +public class PanelIconChevronUp extends PanelIconChevronBasic { + + protected void draw(GeneralPath path) { + + path.moveTo(0, 46); + path.lineTo(0, 31); + path.lineTo(30, 1); + path.lineTo(61, 31); + path.lineTo(61, 46); + path.lineTo(30, 16); + path.closePath(); + + } + +} Copied: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconDisc.java (from rev 21189, trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconDisc.java) =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconDisc.java (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconDisc.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -0,0 +1,48 @@ +/** + * 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 org.richfaces.resource.DynamicUserResource; + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.awt.RenderingHints; +import java.awt.geom.Ellipse2D; + +@DynamicUserResource +public class PanelIconDisc extends PanelIconBasic { + + @Override + protected void paintImage(Graphics2D g2d, Color color) { + + Dimension dimension = getDimension(); + long dim = Math.round(dimension.getWidth() / 3); + + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g2d.setColor(color); + g2d.translate(dim, dim); + + g2d.fill(new Ellipse2D.Double(0, 0, dim, dim)); + } + +} Copied: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconGrid.java (from rev 21189, trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconGrid.java) =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconGrid.java (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconGrid.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -0,0 +1,67 @@ +/** + * 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 org.richfaces.resource.DynamicUserResource; + +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.awt.RenderingHints; +import java.awt.geom.Rectangle2D; + +@DynamicUserResource +public class PanelIconGrid extends PanelIconBasic { + + @Override + protected void paintImage(Graphics2D g2d, Color color) { + + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE); + g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); + g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE); + 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); + + Rectangle2D.Float path = new Rectangle2D.Float(); + Dimension dimension = getDimension(); + + g2d.setStroke(new BasicStroke(16, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_BEVEL)); + g2d.scale(dimension.getHeight() / 128, dimension.getHeight() / 128); + g2d.translate(40, 40); + + path.setRect(0, 0, 40, 40); + + g2d.setColor(color); + + Color bcolor = new Color(1f, 1f, 1f, 0f); + + g2d.setBackground(bcolor); + g2d.fill(path); + g2d.clearRect(16, 0, 8, 40); + g2d.clearRect(0, 16, 40, 8); + + } + +} Copied: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconSpacer.java (from rev 21189, trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconSpacer.java) =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconSpacer.java (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconSpacer.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -0,0 +1,35 @@ +/** + * 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 org.richfaces.resource.DynamicUserResource; + +import java.awt.Color; +import java.awt.Graphics2D; + +@DynamicUserResource +public class PanelIconSpacer extends PanelIconBasic { + + protected void paintImage(Graphics2D g2d, Color color) { + } + +} Copied: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconTriangle.java (from rev 21189, trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangle.java) =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconTriangle.java (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconTriangle.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -0,0 +1,41 @@ +/** + * 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 org.richfaces.resource.DynamicUserResource; + +import java.awt.*; +import java.awt.geom.GeneralPath; + +@DynamicUserResource +public class PanelIconTriangle extends PanelIconTriangleBasic { + + void draw(GeneralPath path, Graphics2D g2d) { + g2d.translate(47, 30); + path.moveTo(0, 0); + path.lineTo(33, 33); + path.lineTo(33, 34); + path.lineTo(0, 67); + path.closePath(); + + } +} Copied: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconTriangleBasic.java (from rev 21189, trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangleBasic.java) =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconTriangleBasic.java (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconTriangleBasic.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -0,0 +1,54 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * 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.awt.Graphics2D; +import java.awt.RenderingHints; +import java.awt.geom.GeneralPath; + +/** + * @author Anton Belevich + */ +public abstract class PanelIconTriangleBasic extends PanelIconBasic { + + protected void paintImage(Graphics2D g2d, Color color) { + + 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(); + + Dimension dimension = getDimension(); + g2d.scale(dimension.getHeight() / 128, dimension.getHeight() / 128); + + draw(path, g2d); + + g2d.setColor(color); + g2d.fill(path); + + } + + abstract void draw(GeneralPath path, Graphics2D g2d); + +} Copied: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconTriangleDown.java (from rev 21189, trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangleDown.java) =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconTriangleDown.java (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconTriangleDown.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -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.iconimages; + +import org.richfaces.resource.DynamicUserResource; + +import java.awt.Graphics2D; +import java.awt.geom.GeneralPath; + +@DynamicUserResource +public class PanelIconTriangleDown extends PanelIconTriangleBasic { + + void draw(GeneralPath path, Graphics2D g2d) { + + g2d.translate(31, 54); + + path.moveTo(0, 0); + path.lineTo(33, 33); + path.lineTo(34, 33); + path.lineTo(67, 0); + path.closePath(); + + } + +} Copied: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconTriangleLeft.java (from rev 21189, trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangleLeft.java) =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconTriangleLeft.java (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconTriangleLeft.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -0,0 +1,41 @@ +/** + * 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 org.richfaces.resource.DynamicUserResource; + +import java.awt.Graphics2D; +import java.awt.geom.GeneralPath; + +@DynamicUserResource +public class PanelIconTriangleLeft extends PanelIconTriangleBasic { + + void draw(GeneralPath path, Graphics2D g2d) { + g2d.translate(47, 30); + path.moveTo(33, 0); + path.lineTo(0, 33); + path.lineTo(0, 34); + path.lineTo(33, 67); + path.closePath(); + } + +} Copied: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconTriangleUp.java (from rev 21189, trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangleUp.java) =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconTriangleUp.java (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelIconTriangleUp.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -0,0 +1,42 @@ +/** + * 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 org.richfaces.resource.DynamicUserResource; + +import java.awt.Graphics2D; +import java.awt.geom.GeneralPath; + +@DynamicUserResource +public class PanelIconTriangleUp extends PanelIconTriangleBasic { + + void draw(GeneralPath path, Graphics2D g2d) { + g2d.translate(31, 47); + + path.moveTo(0, 33); + path.lineTo(33, 0); + path.lineTo(34, 0); + path.lineTo(67, 33); + path.closePath(); + } + +} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconBasic.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconBasic.java 2011-01-25 12:06:37 UTC (rev 21195) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconBasic.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -1,88 +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.awt.Graphics2D; -import java.awt.RenderingHints; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; - -import javax.faces.context.FacesContext; - -import org.richfaces.resource.AbstractJava2DUserResource; -import org.richfaces.resource.PostConstructResource; -import org.richfaces.resource.StateHolderResource; -import org.richfaces.skin.Skin; -import org.richfaces.skin.SkinFactory; - -/** - * @author Alex.Kolonitsky - */ -public abstract class PanelMenuIconBasic extends AbstractJava2DUserResource implements StateHolderResource { - - private static final Dimension DIMENSION = new Dimension(16, 16); - - private Color color; - - protected PanelMenuIconBasic() { - super(DIMENSION); - } - - public void paint(Graphics2D graphics2D) { - if (color == null || graphics2D == null) { - return; - } - - graphics2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - graphics2D.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE); - graphics2D.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY); - graphics2D.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); - graphics2D.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); - - paintImage(graphics2D, color); - } - - protected abstract void paintImage(Graphics2D g2d, Color color); - - public boolean isTransient() { - return false; - } - - @PostConstructResource - public void initialize() { - FacesContext context = FacesContext.getCurrentInstance(); - Skin skin = SkinFactory.getInstance(context).getSkin(context); - color = new Color(skin.getColorParameter(context, "tabDisabledTextColor")); - } - - public void writeState(FacesContext context, DataOutput dataOutput) throws IOException { - dataOutput.writeInt(color.getRGB()); - } - - public void readState(FacesContext context, DataInput dataInput) throws IOException { - color = new Color(dataInput.readInt()); - } - -} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevron.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevron.java 2011-01-25 12:06:37 UTC (rev 21195) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevron.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -1,42 +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 org.richfaces.resource.DynamicUserResource; - -import java.awt.geom.GeneralPath; - -@DynamicUserResource -public class PanelMenuIconChevron extends PanelMenuIconChevronBasic { - - protected void draw(GeneralPath path) { - path.moveTo(1, 1); - - path.lineTo(17, 1); - path.lineTo(47, 31); - path.lineTo(17, 61); - path.lineTo(1, 61); - path.lineTo(31, 31); - path.closePath(); - } - -} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevronBasic.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevronBasic.java 2011-01-25 12:06:37 UTC (rev 21195) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevronBasic.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -1,79 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * 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.BasicStroke; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Graphics2D; -import java.awt.RenderingHints; -import java.awt.geom.AffineTransform; -import java.awt.geom.GeneralPath; -import java.awt.image.AffineTransformOp; -import java.awt.image.BufferedImage; - -/** - * @author Alex.Kolonitsky - */ -public abstract class PanelMenuIconChevronBasic extends PanelMenuIconBasic { - private static final int BUFFER_IMAGE_SIZE = 128; - - @Override - protected void paintImage(Graphics2D graphics2d, Color color) { - - BufferedImage bufferedImage = new BufferedImage(BUFFER_IMAGE_SIZE, BUFFER_IMAGE_SIZE, BufferedImage.TYPE_INT_ARGB); - Graphics2D g2d = bufferedImage.createGraphics(); - - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); - g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE); - g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); - g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_DISABLE); - 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); - - Dimension dimension = getDimension(); - g2d.setStroke(new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER)); - g2d.translate(28, 28); - g2d.setColor(color); - - GeneralPath path = new GeneralPath(); - draw(path); - - g2d.fill(path); - if (this instanceof PanelMenuIconChevron - || this instanceof PanelMenuIconChevronLeft) { - g2d.translate(24, 0); - } else { - g2d.translate(0, 24); - } - g2d.fill(path); - - AffineTransform transform = AffineTransform.getScaleInstance(dimension.getHeight() / BUFFER_IMAGE_SIZE, dimension.getHeight() / BUFFER_IMAGE_SIZE); - AffineTransformOp transformOp = new AffineTransformOp(transform, AffineTransformOp.TYPE_BILINEAR); - - graphics2d.drawImage(bufferedImage, transformOp, 0, 0); - g2d.dispose(); - } - - abstract void draw(GeneralPath draw); -} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevronDown.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevronDown.java 2011-01-25 12:06:37 UTC (rev 21195) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevronDown.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -1,42 +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 org.richfaces.resource.DynamicUserResource; - -import java.awt.geom.GeneralPath; - -@DynamicUserResource -public class PanelMenuIconChevronDown extends PanelMenuIconChevronBasic { - - protected void draw(GeneralPath path) { - - path.moveTo(1, 0); - path.lineTo(31, 30); - path.lineTo(61, 0); - path.lineTo(61, 16); - path.lineTo(31, 46); - path.lineTo(1, 16); - path.closePath(); - - } -} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevronLeft.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevronLeft.java 2011-01-25 12:06:37 UTC (rev 21195) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevronLeft.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -1,41 +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 org.richfaces.resource.DynamicUserResource; - -import java.awt.geom.GeneralPath; - -@DynamicUserResource -public class PanelMenuIconChevronLeft extends PanelMenuIconChevronBasic { - - void draw(GeneralPath path) { - path.moveTo(61, 1); - path.lineTo(45, 1); - path.lineTo(15, 31); - path.lineTo(45, 61); - path.lineTo(61, 61); - path.lineTo(30, 31); - path.closePath(); - } - -} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevronUp.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevronUp.java 2011-01-25 12:06:37 UTC (rev 21195) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconChevronUp.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -1,43 +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 org.richfaces.resource.DynamicUserResource; - -import java.awt.geom.GeneralPath; - -@DynamicUserResource -public class PanelMenuIconChevronUp extends PanelMenuIconChevronBasic { - - protected void draw(GeneralPath path) { - - path.moveTo(0, 46); - path.lineTo(0, 31); - path.lineTo(30, 1); - path.lineTo(61, 31); - path.lineTo(61, 46); - path.lineTo(30, 16); - path.closePath(); - - } - -} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconDisc.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconDisc.java 2011-01-25 12:06:37 UTC (rev 21195) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconDisc.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -1,48 +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 org.richfaces.resource.DynamicUserResource; - -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Graphics2D; -import java.awt.RenderingHints; -import java.awt.geom.Ellipse2D; - -@DynamicUserResource -public class PanelMenuIconDisc extends PanelMenuIconBasic { - - @Override - protected void paintImage(Graphics2D g2d, Color color) { - - Dimension dimension = getDimension(); - long dim = Math.round(dimension.getWidth() / 3); - - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setColor(color); - g2d.translate(dim, dim); - - g2d.fill(new Ellipse2D.Double(0, 0, dim, dim)); - } - -} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconGrid.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconGrid.java 2011-01-25 12:06:37 UTC (rev 21195) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconGrid.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -1,67 +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 org.richfaces.resource.DynamicUserResource; - -import java.awt.BasicStroke; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Graphics2D; -import java.awt.RenderingHints; -import java.awt.geom.Rectangle2D; - -@DynamicUserResource -public class PanelMenuIconGrid extends PanelMenuIconBasic { - - @Override - protected void paintImage(Graphics2D g2d, Color color) { - - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE); - g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); - g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE); - 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); - - Rectangle2D.Float path = new Rectangle2D.Float(); - Dimension dimension = getDimension(); - - g2d.setStroke(new BasicStroke(16, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_BEVEL)); - g2d.scale(dimension.getHeight() / 128, dimension.getHeight() / 128); - g2d.translate(40, 40); - - path.setRect(0, 0, 40, 40); - - g2d.setColor(color); - - Color bcolor = new Color(1f, 1f, 1f, 0f); - - g2d.setBackground(bcolor); - g2d.fill(path); - g2d.clearRect(16, 0, 8, 40); - g2d.clearRect(0, 16, 40, 8); - - } - -} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconSpacer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconSpacer.java 2011-01-25 12:06:37 UTC (rev 21195) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconSpacer.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -1,35 +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 org.richfaces.resource.DynamicUserResource; - -import java.awt.Color; -import java.awt.Graphics2D; - -@DynamicUserResource -public class PanelMenuIconSpacer extends PanelMenuIconBasic { - - protected void paintImage(Graphics2D g2d, Color color) { - } - -} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangle.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangle.java 2011-01-25 12:06:37 UTC (rev 21195) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangle.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -1,41 +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 org.richfaces.resource.DynamicUserResource; - -import java.awt.*; -import java.awt.geom.GeneralPath; - -@DynamicUserResource -public class PanelMenuIconTriangle extends PanelMenuIconTriangleBasic { - - void draw(GeneralPath path, Graphics2D g2d) { - g2d.translate(47, 30); - path.moveTo(0, 0); - path.lineTo(33, 33); - path.lineTo(33, 34); - path.lineTo(0, 67); - path.closePath(); - - } -} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangleBasic.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangleBasic.java 2011-01-25 12:06:37 UTC (rev 21195) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangleBasic.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -1,54 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * 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.awt.Graphics2D; -import java.awt.RenderingHints; -import java.awt.geom.GeneralPath; - -/** - * @author Anton Belevich - */ -public abstract class PanelMenuIconTriangleBasic extends PanelMenuIconBasic { - - protected void paintImage(Graphics2D g2d, Color color) { - - 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(); - - Dimension dimension = getDimension(); - g2d.scale(dimension.getHeight() / 128, dimension.getHeight() / 128); - - draw(path, g2d); - - g2d.setColor(color); - g2d.fill(path); - - } - - abstract void draw(GeneralPath path, Graphics2D g2d); - -} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangleDown.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangleDown.java 2011-01-25 12:06:37 UTC (rev 21195) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangleDown.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -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.iconimages; - -import org.richfaces.resource.DynamicUserResource; - -import java.awt.Graphics2D; -import java.awt.geom.GeneralPath; - -@DynamicUserResource -public class PanelMenuIconTriangleDown extends PanelMenuIconTriangleBasic { - - void draw(GeneralPath path, Graphics2D g2d) { - - g2d.translate(31, 54); - - path.moveTo(0, 0); - path.lineTo(33, 33); - path.lineTo(34, 33); - path.lineTo(67, 0); - path.closePath(); - - } - -} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangleLeft.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangleLeft.java 2011-01-25 12:06:37 UTC (rev 21195) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangleLeft.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -1,41 +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 org.richfaces.resource.DynamicUserResource; - -import java.awt.Graphics2D; -import java.awt.geom.GeneralPath; - -@DynamicUserResource -public class PanelMenuIconTriangleLeft extends PanelMenuIconTriangleBasic { - - void draw(GeneralPath path, Graphics2D g2d) { - g2d.translate(47, 30); - path.moveTo(33, 0); - path.lineTo(0, 33); - path.lineTo(0, 34); - path.lineTo(33, 67); - path.closePath(); - } - -} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangleUp.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangleUp.java 2011-01-25 12:06:37 UTC (rev 21195) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconTriangleUp.java 2011-01-25 12:08:46 UTC (rev 21196) @@ -1,42 +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 org.richfaces.resource.DynamicUserResource; - -import java.awt.Graphics2D; -import java.awt.geom.GeneralPath; - -@DynamicUserResource -public class PanelMenuIconTriangleUp extends PanelMenuIconTriangleBasic { - - void draw(GeneralPath path, Graphics2D g2d) { - g2d.translate(31, 47); - - path.moveTo(0, 33); - path.lineTo(33, 0); - path.lineTo(34, 0); - path.lineTo(67, 33); - path.closePath(); - } - -} Modified: trunk/ui/output/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2011-01-25 12:06:37 UTC (rev 21195) +++ trunk/ui/output/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2011-01-25 12:08:46 UTC (rev 21196) @@ -18,27 +18,27 @@ org.richfaces.images\:pbAniBg.gif=org.richfaces.renderkit.html.ProgressBarAnimatedBackgroundImage -org.richfaces.images\:Chevron.png=org.richfaces.renderkit.html.iconimages.PanelMenuIconChevron +org.richfaces.images\:Chevron.png=org.richfaces.renderkit.html.iconimages.PanelIconChevron -org.richfaces.images\:ChevronDown.png=org.richfaces.renderkit.html.iconimages.PanelMenuIconChevronDown +org.richfaces.images\:ChevronDown.png=org.richfaces.renderkit.html.iconimages.PanelIconChevronDown -org.richfaces.images\:ChevronLeft.png=org.richfaces.renderkit.html.iconimages.PanelMenuIconChevronLeft +org.richfaces.images\:ChevronLeft.png=org.richfaces.renderkit.html.iconimages.PanelIconChevronLeft -org.richfaces.images\:ChevronUp.png=org.richfaces.renderkit.html.iconimages.PanelMenuIconChevronUp +org.richfaces.images\:ChevronUp.png=org.richfaces.renderkit.html.iconimages.PanelIconChevronUp -org.richfaces.images\:Disc.png=org.richfaces.renderkit.html.iconimages.PanelMenuIconDisc +org.richfaces.images\:Disc.png=org.richfaces.renderkit.html.iconimages.PanelIconDisc -org.richfaces.images\:Grid.png=org.richfaces.renderkit.html.iconimages.PanelMenuIconGrid +org.richfaces.images\:Grid.png=org.richfaces.renderkit.html.iconimages.PanelIconGrid -org.richfaces.images\:Spacer.png=org.richfaces.renderkit.html.iconimages.PanelMenuIconSpacer +org.richfaces.images\:Spacer.png=org.richfaces.renderkit.html.iconimages.PanelIconSpacer -org.richfaces.images\:Triangle.png=org.richfaces.renderkit.html.iconimages.PanelMenuIconTriangle +org.richfaces.images\:Triangle.png=org.richfaces.renderkit.html.iconimages.PanelIconTriangle -org.richfaces.images\:TriangleDown.png=org.richfaces.renderkit.html.iconimages.PanelMenuIconTriangleDown +org.richfaces.images\:TriangleDown.png=org.richfaces.renderkit.html.iconimages.PanelIconTriangleDown -org.richfaces.images\:TriangleLeft.png=org.richfaces.renderkit.html.iconimages.PanelMenuIconTriangleLeft +org.richfaces.images\:TriangleLeft.png=org.richfaces.renderkit.html.iconimages.PanelIconTriangleLeft -org.richfaces.images\:TriangleUp.png=org.richfaces.renderkit.html.iconimages.PanelMenuIconTriangleUp +org.richfaces.images\:TriangleUp.png=org.richfaces.renderkit.html.iconimages.PanelIconTriangleUp org.richfaces.images\:menu_list_bg.gif=org.richfaces.renderkit.html.BaseGradient\ {width=22, height=3, baseColorParam=additionalBackgroundColor, gradientColorParam=tabBackgroundColor, horizontal=true}