Author: konstantin.mishin Date: 2010-09-17 13:50:16 -0400 (Fri, 17 Sep 2010) New Revision: 19244 Added: branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ArrowBase.java branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerArrowBase.java branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerArrowBottom.java branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerArrowTop.java branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowBottom.java branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowTop.java Modified: branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderArrowBase.java Log: RF-9194 Added: branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ArrowBase.java =================================================================== --- branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ArrowBase.java (rev 0) +++ branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ArrowBase.java 2010-09-17 17:50:16 UTC (rev 19244) @@ -0,0 +1,96 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.richfaces.renderkit.html.images; + +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 java.util.Date; +import java.util.Map; + +import javax.faces.context.FacesContext; + +import org.richfaces.resource.DynamicResource; +import org.richfaces.resource.ImageType; +import org.richfaces.resource.Java2DUserResource; +import org.richfaces.resource.StateHolderResource; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; + +/** + * @author Konstantin Mishin + * + */ +@DynamicResource +public abstract class ArrowBase implements Java2DUserResource, StateHolderResource { + + private int color; + private String colorName = Skin.GENERAL_TEXT_COLOR; + + private void initialize() { + FacesContext context = FacesContext.getCurrentInstance(); + Skin skin = SkinFactory.getInstance(context).getSkin(context); + this.color = skin.getColorParameter(context, colorName); + } + + protected final void setColorName(String colorName) { + this.colorName = colorName; + } + + public abstract Dimension getDimension(); + + public void paint(Graphics2D graphics2d, Dimension dimension) { + graphics2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + graphics2d.setColor(new Color(color)); + } + + public void writeState(FacesContext context, DataOutput dataOutput) throws IOException { + initialize(); + dataOutput.writeInt(this.color); + } + + public void readState(FacesContext context, DataInput dataInput) throws IOException { + this.color = dataInput.readInt(); + } + + public Map<String, String> getResponseHeaders() { + return null; + } + + public Date getLastModified() { + return null; + } + + public ImageType getImageType() { + return ImageType.PNG; + } + + public boolean isTransient() { + return false; + } + +} Modified: branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderArrowBase.java =================================================================== --- branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderArrowBase.java 2010-09-17 15:23:45 UTC (rev 19243) +++ branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderArrowBase.java 2010-09-17 17:50:16 UTC (rev 19244) @@ -22,77 +22,18 @@ package org.richfaces.renderkit.html.images; -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 java.util.Date; -import java.util.Map; -import javax.faces.context.FacesContext; - -import org.richfaces.resource.DynamicResource; -import org.richfaces.resource.ImageType; -import org.richfaces.resource.Java2DUserResource; -import org.richfaces.resource.StateHolderResource; -import org.richfaces.skin.Skin; -import org.richfaces.skin.SkinFactory; - /** * @author Konstantin Mishin * */ -@DynamicResource -public abstract class SliderArrowBase implements Java2DUserResource, StateHolderResource { +public abstract class SliderArrowBase extends ArrowBase { private Dimension dimension = new Dimension(7, 7); - private int color; - private String colorName = Skin.GENERAL_TEXT_COLOR; - private void initialize() { - FacesContext context = FacesContext.getCurrentInstance(); - Skin skin = SkinFactory.getInstance(context).getSkin(context); - this.color = skin.getColorParameter(context, colorName); - } - - protected final void setColorName(String colorName) { - this.colorName = colorName; - } - + @Override public Dimension getDimension() { return dimension; } - public void paint(Graphics2D graphics2d, Dimension dimension) { - graphics2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - graphics2d.setColor(new Color(color)); - } - - public void writeState(FacesContext context, DataOutput dataOutput) throws IOException { - initialize(); - dataOutput.writeInt(this.color); - } - - public void readState(FacesContext context, DataInput dataInput) throws IOException { - this.color = dataInput.readInt(); - } - - public Map<String, String> getResponseHeaders() { - return null; - } - - public Date getLastModified() { - return null; - } - - public ImageType getImageType() { - return ImageType.PNG; - } - - public boolean isTransient() { - return false; - } - } Added: branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerArrowBase.java =================================================================== --- branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerArrowBase.java (rev 0) +++ branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerArrowBase.java 2010-09-17 17:50:16 UTC (rev 19244) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.richfaces.renderkit.html.images; + +import java.awt.Dimension; + +/** + * @author Konstantin Mishin + * + */ +public abstract class SpinnerArrowBase extends ArrowBase { + + private Dimension dimension = new Dimension(5, 3); + + @Override + public Dimension getDimension() { + return dimension; + } +} Added: branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerArrowBottom.java =================================================================== --- branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerArrowBottom.java (rev 0) +++ branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerArrowBottom.java 2010-09-17 17:50:16 UTC (rev 19244) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.richfaces.renderkit.html.images; + +import java.awt.Dimension; +import java.awt.Graphics2D; + +/** + * @author Konstantin Mishin + * + */ +public class SpinnerArrowBottom extends SpinnerArrowBase { + + @Override + public void paint(Graphics2D graphics2d, Dimension dimension) { + super.paint(graphics2d, dimension); + graphics2d.drawLine(0, 0, 4, 0); + graphics2d.drawLine(1, 1, 3, 1); + graphics2d.drawLine(2, 2, 2, 2); + } +} Added: branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerArrowTop.java =================================================================== --- branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerArrowTop.java (rev 0) +++ branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerArrowTop.java 2010-09-17 17:50:16 UTC (rev 19244) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.richfaces.renderkit.html.images; + +import java.awt.Dimension; +import java.awt.Graphics2D; + +/** + * @author Konstantin Mishin + * + */ +public class SpinnerArrowTop extends SpinnerArrowBase { + + @Override + public void paint(Graphics2D graphics2d, Dimension dimension) { + super.paint(graphics2d, dimension); + graphics2d.drawLine(2, 0, 2, 0); + graphics2d.drawLine(1, 1, 3, 1); + graphics2d.drawLine(0, 2, 4, 2); + } +} Added: branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowBottom.java =================================================================== --- branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowBottom.java (rev 0) +++ branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowBottom.java 2010-09-17 17:50:16 UTC (rev 19244) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.richfaces.renderkit.html.images; + + +/** + * @author Konstantin Mishin + * + */ +public class SpinnerDisabledArrowBottom extends SpinnerArrowBottom { + + public SpinnerDisabledArrowBottom() { + setColorName("tabDisabledTextColor"); + } +} Added: branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowTop.java =================================================================== --- branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowTop.java (rev 0) +++ branches/RF-9151/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowTop.java 2010-09-17 17:50:16 UTC (rev 19244) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.richfaces.renderkit.html.images; + + +/** + * @author Konstantin Mishin + * + */ +public class SpinnerDisabledArrowTop extends SpinnerArrowTop { + + public SpinnerDisabledArrowTop() { + setColorName("tabDisabledTextColor"); + } +}