Author: abelevich Date: 2011-02-10 07:34:05 -0500 (Thu, 10 Feb 2011) New Revision: 21595 Added: trunk/core/impl/src/main/resources/META-INF/richfaces/ trunk/core/impl/src/main/resources/META-INF/richfaces/resource-mappings.properties trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteGradient.java Removed: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteBaseGradient.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteButtonGradient.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteFieldGradient.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboButtonBase.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDisabledDownButton.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowBottom.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowLeft.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowRight.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowBottom.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowLeft.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowRight.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowBottom.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowTop.java Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ArrowBase.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDownButton.java trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.ecss trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSpinner.ecss trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss trunk/ui/input/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/accordion.ecss trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanel.ecss trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/dropdownmenu.ecss trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panel.ecss trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.ecss trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/toolbar.ecss trunk/ui/output/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties Log: RF-10145 Update core & component images Added: trunk/core/impl/src/main/resources/META-INF/richfaces/resource-mappings.properties =================================================================== --- trunk/core/impl/src/main/resources/META-INF/richfaces/resource-mappings.properties (rev 0) +++ trunk/core/impl/src/main/resources/META-INF/richfaces/resource-mappings.properties 2011-02-10 12:34:05 UTC (rev 21595) @@ -0,0 +1,5 @@ +org.richfaces.images\:gradientA.png=org.richfaces.renderkit.html.BaseGradient\ + {baseColorParam=headerGradientColor, gradientColorParam=headerBackgroundColor} + +org.richfaces.images\:inputBackgroundImage.png=org.richfaces.renderkit.html.images.InputBackgroundImage +org.richfaces.images\:buttonBackgroundImage.png=org.richfaces.renderkit.html.images.ButtonBackgroundImage \ No newline at end of file Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ArrowBase.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ArrowBase.java 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ArrowBase.java 2011-02-10 12:34:05 UTC (rev 21595) @@ -35,6 +35,7 @@ import org.richfaces.resource.AbstractJava2DUserResource; import org.richfaces.resource.DynamicUserResource; import org.richfaces.resource.PostConstructResource; +import org.richfaces.resource.ResourceParameter; import org.richfaces.resource.StateHolderResource; import org.richfaces.skin.Skin; import org.richfaces.skin.SkinFactory; @@ -47,7 +48,7 @@ public abstract class ArrowBase extends AbstractJava2DUserResource implements StateHolderResource { private Integer color; - private String colorName = Skin.GENERAL_TEXT_COLOR; + private String colorParam; public ArrowBase(Dimension dimension) { super(dimension); @@ -59,14 +60,15 @@ Skin skin = SkinFactory.getInstance(context).getSkin(context); Skin defaultSkin = SkinFactory.getInstance(context).getDefaultSkin(context); - this.color = skin.getColorParameter(context, colorName); + this.color = skin.getColorParameter(context, colorParam); if (this.color == null) { - this.color = defaultSkin.getColorParameter(context, colorName); + this.color = defaultSkin.getColorParameter(context, colorParam); } } - protected final void setColorName(String colorName) { - this.colorName = colorName; + @ResourceParameter(defaultValue = Skin.GENERAL_TEXT_COLOR) + public void setColorParam(String colorParam) { + this.colorParam = colorParam; } public void paint(Graphics2D graphics2d) { Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteBaseGradient.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteBaseGradient.java 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteBaseGradient.java 2011-02-10 12:34:05 UTC (rev 21595) @@ -1,114 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, 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.GradientPaint; -import java.awt.Graphics2D; -import java.awt.Rectangle; -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.DynamicUserResource; -import org.richfaces.resource.PostConstructResource; -import org.richfaces.resource.StateHolderResource; -import org.richfaces.skin.Skin; -import org.richfaces.skin.SkinFactory; - -/** - * @author Nick Belaevski - * - */ -@DynamicUserResource -public abstract class AutocompleteBaseGradient extends AbstractJava2DUserResource implements StateHolderResource { - - private static final Dimension DIMENSION = new Dimension(18, 8); - - private String topColorSkinParameter; - - private String bottomColorSkinParameter; - - private Integer topColor; - - private Integer bottomColor; - - public AutocompleteBaseGradient() { - super(DIMENSION); - } - - @PostConstructResource - public void initialize() { - FacesContext context = FacesContext.getCurrentInstance(); - Skin skin = SkinFactory.getInstance(context).getSkin(context); - - topColor = skin.getColorParameter(context, topColorSkinParameter); - bottomColor = skin.getColorParameter(context, bottomColorSkinParameter); - } - - public void paint(Graphics2D graphics2d) { - if (topColor == null || bottomColor == null) { - return; - } - Dimension dimension = getDimension(); - - GradientPaint paint = new GradientPaint(0, 0, new Color(topColor), 0, dimension.height, new Color(bottomColor)); - graphics2d.setPaint(paint); - graphics2d.fill(new Rectangle(dimension)); - } - - public void writeState(FacesContext context, DataOutput dataOutput) throws IOException { - if (topColor != null && bottomColor != null) { - dataOutput.writeBoolean(true); - dataOutput.writeInt(topColor); - dataOutput.writeInt(bottomColor); - } else { - dataOutput.writeBoolean(false); - } - } - - public void readState(FacesContext context, DataInput dataInput) throws IOException { - if (dataInput.readBoolean()) { - topColor = dataInput.readInt(); - bottomColor = dataInput.readInt(); - } else { - topColor = null; - bottomColor = null; - } - } - - public boolean isTransient() { - return false; - } - - protected void setTopColorSkinParameter(String topColorSkinParameter) { - this.topColorSkinParameter = topColorSkinParameter; - } - - protected void setBottomColorSkinParameter(String bottomColorSkinParameter) { - this.bottomColorSkinParameter = bottomColorSkinParameter; - } -} Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteButtonGradient.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteButtonGradient.java 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteButtonGradient.java 2011-02-10 12:34:05 UTC (rev 21595) @@ -1,36 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, 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 org.richfaces.skin.Skin; - -/** - * @author Nick Belaevski - * - */ -public class AutocompleteButtonGradient extends AutocompleteBaseGradient { - - public AutocompleteButtonGradient() { - setTopColorSkinParameter(Skin.HEADER_GRADIENT_COLOR); - setBottomColorSkinParameter(Skin.HEADER_BACKGROUND_COLOR); - } -} Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteFieldGradient.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteFieldGradient.java 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteFieldGradient.java 2011-02-10 12:34:05 UTC (rev 21595) @@ -1,36 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, 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 org.richfaces.skin.Skin; - -/** - * @author Nick Belaevski - * - */ -public class AutocompleteFieldGradient extends AutocompleteBaseGradient { - - public AutocompleteFieldGradient() { - setTopColorSkinParameter(Skin.ADDITIONAL_BACKGROUND_COLOR); - setBottomColorSkinParameter(Skin.CONTROL_BACKGROUND_COLOR); - } -} Added: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteGradient.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteGradient.java (rev 0) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteGradient.java 2011-02-10 12:34:05 UTC (rev 21595) @@ -0,0 +1,117 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, 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.GradientPaint; +import java.awt.Graphics2D; +import java.awt.Rectangle; +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.DynamicUserResource; +import org.richfaces.resource.PostConstructResource; +import org.richfaces.resource.ResourceParameter; +import org.richfaces.resource.StateHolderResource; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; + +/** + * @author Nick Belaevski + * + */ +@DynamicUserResource +public class AutocompleteGradient extends AbstractJava2DUserResource implements StateHolderResource { + + private static final Dimension DIMENSION = new Dimension(18, 8); + + private String topColorParam; + + private String bottomColorParam; + + private Integer topColor; + + private Integer bottomColor; + + public AutocompleteGradient() { + super(DIMENSION); + } + + @PostConstructResource + public void initialize() { + FacesContext context = FacesContext.getCurrentInstance(); + Skin skin = SkinFactory.getInstance(context).getSkin(context); + + topColor = skin.getColorParameter(context, topColorParam); + bottomColor = skin.getColorParameter(context, bottomColorParam); + } + + public void paint(Graphics2D graphics2d) { + if (topColor == null || bottomColor == null) { + return; + } + Dimension dimension = getDimension(); + + GradientPaint paint = new GradientPaint(0, 0, new Color(topColor), 0, dimension.height, new Color(bottomColor)); + graphics2d.setPaint(paint); + graphics2d.fill(new Rectangle(dimension)); + } + + public void writeState(FacesContext context, DataOutput dataOutput) throws IOException { + if (topColor != null && bottomColor != null) { + dataOutput.writeBoolean(true); + dataOutput.writeInt(topColor); + dataOutput.writeInt(bottomColor); + } else { + dataOutput.writeBoolean(false); + } + } + + public void readState(FacesContext context, DataInput dataInput) throws IOException { + if (dataInput.readBoolean()) { + topColor = dataInput.readInt(); + bottomColor = dataInput.readInt(); + } else { + topColor = null; + bottomColor = null; + } + } + + public boolean isTransient() { + return false; + } + + @ResourceParameter(defaultValue = Skin.HEADER_GRADIENT_COLOR) + public void setTopColorParam(String topColorSkinParameter) { + this.topColorParam = topColorSkinParameter; + } + + @ResourceParameter(defaultValue = Skin.HEADER_BACKGROUND_COLOR) + public void setBottomColorParam(String bottomColorSkinParameter) { + this.bottomColorParam = bottomColorSkinParameter; + } +} Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboButtonBase.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboButtonBase.java 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboButtonBase.java 2011-02-10 12:34:05 UTC (rev 21595) @@ -1,98 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, 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.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; - -import javax.faces.context.FacesContext; - -import org.richfaces.resource.AbstractJava2DUserResource; -import org.richfaces.resource.DynamicUserResource; -import org.richfaces.resource.PostConstructResource; -import org.richfaces.resource.StateHolderResource; -import org.richfaces.skin.Skin; -import org.richfaces.skin.SkinFactory; - -@DynamicUserResource -public abstract class ComboButtonBase extends AbstractJava2DUserResource implements StateHolderResource { - - private static final Dimension DIMENSION = new Dimension(15, 15); - - private Integer arrowColor; - private String colorName = Skin.GENERAL_TEXT_COLOR; - - public ComboButtonBase() { - super(DIMENSION); - } - - @PostConstructResource - public final void initialize() { - FacesContext context = FacesContext.getCurrentInstance(); - Skin skin = SkinFactory.getInstance(context).getSkin(context); - Skin defaultSkin = SkinFactory.getInstance(context).getDefaultSkin(context); - - this.arrowColor = skin.getColorParameter(context, Skin.TABLE_BORDER_COLOR); - this.arrowColor = skin.getColorParameter(context, colorName); - if (this.arrowColor == null) { - this.arrowColor = defaultSkin.getColorParameter(context, colorName); - } - } - - protected final void setColorName(String colorName) { - this.colorName = colorName; - } - - public boolean isTransient() { - return false; - } - - public void writeState(FacesContext context, DataOutput dataOutput) throws IOException { - dataOutput.writeInt(this.arrowColor); - } - - public void readState(FacesContext context, DataInput dataInput) throws IOException { - this.arrowColor = dataInput.readInt(); - } - - public void paint(Graphics2D graphics2d) { - graphics2d.setColor(Color.WHITE); - graphics2d.drawLine(4, 5, 10, 5); - graphics2d.drawLine(3, 6, 11, 6); - graphics2d.drawLine(4, 7, 10, 7); - graphics2d.drawLine(5, 8, 9, 8); - graphics2d.drawLine(6, 9, 8, 9); - graphics2d.drawLine(7, 10, 7, 10); - - Color arrowColor = new Color(this.arrowColor); - graphics2d.setColor(arrowColor); - graphics2d.drawLine(4, 6, 10, 6); - graphics2d.drawLine(5, 7, 9, 7); - graphics2d.drawLine(6, 8, 8, 8); - graphics2d.drawLine(7, 9, 7, 9); - } -} Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDisabledDownButton.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDisabledDownButton.java 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDisabledDownButton.java 2011-02-10 12:34:05 UTC (rev 21595) @@ -1,32 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, 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 org.richfaces.skin.Skin; - -public class ComboDisabledDownButton extends ComboButtonBase { - - public ComboDisabledDownButton() { - setColorName(Skin.TABLE_BORDER_COLOR); - } -} Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDownButton.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDownButton.java 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDownButton.java 2011-02-10 12:34:05 UTC (rev 21595) @@ -22,11 +22,79 @@ package org.richfaces.renderkit.html.images; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics2D; +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.DynamicUserResource; +import org.richfaces.resource.PostConstructResource; +import org.richfaces.resource.ResourceParameter; +import org.richfaces.resource.StateHolderResource; import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; -public class ComboDownButton extends ComboButtonBase { +@DynamicUserResource +public class ComboDownButton extends AbstractJava2DUserResource implements StateHolderResource { + private static final Dimension DIMENSION = new Dimension(15, 15); + + private Integer arrowColor; + + private boolean disabled; + public ComboDownButton() { - setColorName(Skin.GENERAL_TEXT_COLOR); + super(DIMENSION); } + + @PostConstructResource + public final void initialize() { + FacesContext context = FacesContext.getCurrentInstance(); + Skin skin = SkinFactory.getInstance(context).getSkin(context); + Skin defaultSkin = SkinFactory.getInstance(context).getDefaultSkin(context); + + this.arrowColor = skin.getColorParameter(context, disabled ? Skin.TABLE_BORDER_COLOR : Skin.GENERAL_TEXT_COLOR); + if (this.arrowColor == null) { + this.arrowColor = defaultSkin.getColorParameter(context, disabled ? Skin.TABLE_BORDER_COLOR : Skin.GENERAL_TEXT_COLOR); + } + } + + @ResourceParameter(defaultValue = "false") + public void setDisabled(boolean disabled) { + this.disabled = disabled; + } + + public boolean isTransient() { + return false; + } + + public void writeState(FacesContext context, DataOutput dataOutput) throws IOException { + dataOutput.writeInt(this.arrowColor); + } + + public void readState(FacesContext context, DataInput dataInput) throws IOException { + this.arrowColor = dataInput.readInt(); + } + + public void paint(Graphics2D graphics2d) { + graphics2d.setColor(Color.WHITE); + graphics2d.drawLine(4, 5, 10, 5); + graphics2d.drawLine(3, 6, 11, 6); + graphics2d.drawLine(4, 7, 10, 7); + graphics2d.drawLine(5, 8, 9, 8); + graphics2d.drawLine(6, 9, 8, 9); + graphics2d.drawLine(7, 10, 7, 10); + + Color arrowColor = new Color(this.arrowColor); + graphics2d.setColor(arrowColor); + graphics2d.drawLine(4, 6, 10, 6); + graphics2d.drawLine(5, 7, 9, 7); + graphics2d.drawLine(6, 8, 8, 8); + graphics2d.drawLine(7, 9, 7, 9); + } } Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowBottom.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowBottom.java 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowBottom.java 2011-02-10 12:34:05 UTC (rev 21595) @@ -1,35 +0,0 @@ -/* - * 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 SliderDisabledArrowBottom extends SliderArrowBottom { - - public SliderDisabledArrowBottom() { - setColorName("tabDisabledTextColor"); - } -} Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowLeft.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowLeft.java 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowLeft.java 2011-02-10 12:34:05 UTC (rev 21595) @@ -1,35 +0,0 @@ -/* - * 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 SliderDisabledArrowLeft extends SliderArrowLeft { - - public SliderDisabledArrowLeft() { - setColorName("tabDisabledTextColor"); - } -} Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowRight.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowRight.java 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowRight.java 2011-02-10 12:34:05 UTC (rev 21595) @@ -1,35 +0,0 @@ -/* - * 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 SliderDisabledArrowRight extends SliderArrowRight { - - public SliderDisabledArrowRight() { - setColorName("tabDisabledTextColor"); - } -} Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowBottom.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowBottom.java 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowBottom.java 2011-02-10 12:34:05 UTC (rev 21595) @@ -1,35 +0,0 @@ -/* - * 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 SliderSelectedArrowBottom extends SliderArrowBottom { - - public SliderSelectedArrowBottom() { - setColorName("tipBorderColor"); - } -} Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowLeft.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowLeft.java 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowLeft.java 2011-02-10 12:34:05 UTC (rev 21595) @@ -1,35 +0,0 @@ -/* - * 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 SliderSelectedArrowLeft extends SliderArrowLeft { - - public SliderSelectedArrowLeft() { - setColorName("tipBorderColor"); - } -} Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowRight.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowRight.java 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowRight.java 2011-02-10 12:34:05 UTC (rev 21595) @@ -1,35 +0,0 @@ -/* - * 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 SliderSelectedArrowRight extends SliderArrowRight { - - public SliderSelectedArrowRight() { - setColorName("tipBorderColor"); - } -} Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowBottom.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowBottom.java 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowBottom.java 2011-02-10 12:34:05 UTC (rev 21595) @@ -1,35 +0,0 @@ -/* - * 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"); - } -} Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowTop.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowTop.java 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowTop.java 2011-02-10 12:34:05 UTC (rev 21595) @@ -1,35 +0,0 @@ -/* - * 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"); - } -} Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss 2011-02-10 12:34:05 UTC (rev 21595) @@ -6,7 +6,7 @@ input.rf-au-inp { background-color: '#{richSkin.controlBackgroundColor}'; - background-image: url("#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']}"); + background-image: url("#{resource['org.richfaces.images.inputBackgroundImage.png']}"); background-position:1px 1px; background-repeat:no-repeat; border: 0px; @@ -21,7 +21,7 @@ border-style: solid; border-color: '#{richSkin.panelBorderColor}'; display: inline-block; - background-image: "url(#{resource['org.richfaces.renderkit.html.images.AutocompleteFieldGradient']})"; + background-image: "url(#{resource['org.richfaces.images:autocompleteFieldGradient.png']})"; background-repeat: repeat-x; background-position: top left; background-color: '#{richSkin.controlBackgroundColor}'; @@ -34,7 +34,7 @@ } .rf-au-btn{ - background-image: "url(#{resource['org.richfaces.renderkit.html.images.AutocompleteButtonGradient']})"; + background-image: "url(#{resource['org.richfaces.images:autocompleteButtonGradient.png']})"; background-repeat: repeat-x; background-position: top left; background-color: '#{richSkin.headerBackgroundColor}'; @@ -48,7 +48,7 @@ .rf-au-btn-arrow, .rf-au-btn-arrow-dis{ background-position: center; background-repeat: no-repeat; - background-image: "url(#{resource['org.richfaces:combo_down_button.gif']})"; + background-image: "url(#{resource['org.richfaces.images:comboDownButton.png']})"; cursor: pointer; width: 15px; height: 16px; @@ -56,7 +56,7 @@ } .rf-au-btn-arrow-dis{ - background-image: "url(#{resource['org.richfaces.renderkit.html.images.ComboDisabledDownButton']})"; + background-image: "url(#{resource['org.richfaces.images:comboDisabledDownButton.png']})"; cursor: default; } Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss 2011-02-10 12:34:05 UTC (rev 21595) @@ -153,7 +153,7 @@ background-position: left top; background-repeat: repeat-x; border: 1px solid; - background-image: url("#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']}"); + background-image: url("#{resource['org.richfaces.images:inputBackgroundImage.png']}"); background-color: '#{richSkin.controlBackgroundColor}'; border-color: '#{richSkin.panelBorderColor}'; border-bottom-color: '#{richSkin.subBorderColor}'; @@ -168,7 +168,7 @@ font-size: 0px; background-color: '#{richSkin.headerBackgroundColor}'; border-color: '#{richSkin.headerBackgroundColor}'; - background-image: "url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})"; + background-image: "url(#{resource['org.richfaces.images:buttonBackgroundImage.png']})"; } @@ -339,11 +339,11 @@ } .rf-cal-sp-up { - background-image: "url(#{resource['org.richfaces.renderkit.html.images.SpinnerArrowTop']})"; + background-image: "url(#{resource['org.richfaces.images:spinnerArrowTop.png']})"; } .rf-cal-sp-down { - background-image: "url(#{resource['org.richfaces.renderkit.html.images.SpinnerArrowBottom']})"; + background-image: "url(#{resource['org.richfaces.images:spinnerArrowBottom.png']})"; } .rf-cal-sp-press { @@ -353,7 +353,7 @@ .rf-cal-sp-btn { background-color: '#{richSkin.headerBackgroundColor}'; border-color: '#{richSkin.headerBackgroundColor}'; - background-image: "url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})"; + background-image: "url(#{resource['org.richfaces.images:buttonBackgroundImage.png']})"; } .rf-cal-edtr-layout-shdw { Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.ecss =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.ecss 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.ecss 2011-02-10 12:34:05 UTC (rev 21595) @@ -29,7 +29,7 @@ .rf-fu-hdr { background-color: '#{richSkin.headerBackgroundColor}'; - background-image: url("#{resource['org.richfaces.renderkit.html.GradientA']}"); + background-image: url("#{resource['org.richfaces.images:gradientA.png']}"); border-color: '#{richSkin.headerBackgroundColor}'; border-style: solid; border-width: 1px; Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss 2011-02-10 12:34:05 UTC (rev 21595) @@ -109,37 +109,37 @@ .rf-insl-hnd { - background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderArrowBottom']}"); + background-image: url("#{resource['org.richfaces.images:sliderArrowBottom.png']}"); } .rf-insl-hnd-sel { - background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderSelectedArrowBottom']}"); + background-image: url("#{resource['org.richfaces.images:sliderSelectedArrowBottom.png']}"); } .rf-insl-hnd-dis { - background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderDisabledArrowBottom']}"); + background-image: url("#{resource['org.richfaces.images:sliderDisabledArrowBottom.png']}"); } .rf-insl-dec { - background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderArrowLeft']}"); + background-image: url("#{resource['org.richfaces.images:sliderArrowLeft.png']}"); } .rf-insl-dec-sel { - background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderSelectedArrowLeft']}"); + background-image: url("#{resource['org.richfaces.images:sliderSelectedArrowLeft.png']}"); } .rf-insl-dec-dis { - background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderDisabledArrowLeft']}"); + background-image: url("#{resource['org.richfaces.images:sliderDisabledArrowLeft.png']}"); } .rf-insl-inc { - background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderArrowRight']}"); + background-image: url("#{resource['org.richfaces.images:sliderArrowRight.png']}"); } .rf-insl-inc-sel { - background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderSelectedArrowRight']}"); + background-image: url("#{resource['org.richfaces.images:sliderSelectedArrowRight.png']}"); } .rf-insl-inc-dis { - background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderDisabledArrowRight']}"); + background-image: url("#{resource['org.richfaces.images:sliderDisabledArrowRight.png']}"); } \ No newline at end of file Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSpinner.ecss =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSpinner.ecss 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSpinner.ecss 2011-02-10 12:34:05 UTC (rev 21595) @@ -30,7 +30,7 @@ input.rf-insp-inp[type="text"] { background-color: '#{richSkin.controlBackgroundColor}'; - background-image: url("#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']}"); + background-image: url("#{resource['org.richfaces.images:inputBackgroundImage.png']}"); background-position:1px 1px; background-repeat:no-repeat; border: 0px; @@ -44,7 +44,7 @@ .rf-insp-btns { background-color: '#{richSkin.headerBackgroundColor}'; - background-image: "url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})"; + background-image: "url(#{resource['org.richfaces.images:buttonBackgroundImage.png']})"; background-position: top left; background-repeat: repeat-x; border-left-width: 1px; @@ -64,17 +64,17 @@ } .rf-insp-dec { - background-image: url("#{resource['org.richfaces.renderkit.html.images.SpinnerArrowBottom']}"); + background-image: url("#{resource['org.richfaces.images:spinnerArrowBottom.png']}"); } .rf-insp-inc { - background-image: url("#{resource['org.richfaces.renderkit.html.images.SpinnerArrowTop']}"); + background-image: url("#{resource['org.richfaces.images:spinnerArrowTop.png']}"); } .rf-insp-dec-dis { - background-image: url("#{resource['org.richfaces.renderkit.html.images.SpinnerDisabledArrowBottom']}"); + background-image: url("#{resource['org.richfaces.images:spinnerDisabledArrowBottom.png']}"); } .rf-insp-inc-dis { - background-image: url("#{resource['org.richfaces.renderkit.html.images.SpinnerDisabledArrowTop']}"); + background-image: url("#{resource['org.richfaces.images:spinnerDisabledArrowTop.png']}"); } \ No newline at end of file Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss 2011-02-10 12:34:05 UTC (rev 21595) @@ -15,7 +15,7 @@ input.rf-sel-inp { background-color: '#{richSkin.controlBackgroundColor}'; - background-image: url("#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']}"); + background-image: url("#{resource['org.richfaces.images:inputBackgroundImage.png']}"); background-position:1px 1px; background-repeat:no-repeat; border: 0px; @@ -34,7 +34,7 @@ } .rf-sel-btn{ - background-image: "url(#{resource['org.richfaces.renderkit.html.images.AutocompleteButtonGradient']})"; + background-image: "url(#{resource['org.richfaces.images:autocompleteButtonGradient.png']})"; background-repeat: repeat-x; background-position: top left; background-color: '#{richSkin.headerBackgroundColor}'; Modified: trunk/ui/input/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/input/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2011-02-10 12:34:05 UTC (rev 21595) @@ -15,4 +15,44 @@ {baseColorParam=additionalBackgroundColor, gradientColorParam=trimColor, height=18, width=1} org.richfaces.images\:fuBtnDisGrad.png=org.richfaces.renderkit.html.BaseGradient\ {baseColorParam=tableSubfooterBackgroundColor, gradientColorParam=tableFooterBackgroundColor, height=18, width=1} -org.richfaces\:fileUploadProgress=org.richfaces.resource.FileUploadProgressResource \ No newline at end of file +org.richfaces\:fileUploadProgress=org.richfaces.resource.FileUploadProgressResource + +org.richfaces.images\:comboDownButton.png=org.richfaces.renderkit.html.images.ComboDownButton +org.richfaces.images\:comboDisabledDownButton.png=org.richfaces.renderkit.html.images.ComboDownButton{disabled=true} + +org.richfaces.images\:autocompleteButtonGradient.png=org.richfaces.renderkit.html.images.AutocompleteGradient\ + {topColorParam=headerGradientColor ,bottomColorParam=headerBackgroundColor} +org.richfaces.images\:autocompleteFieldGradient.png=org.richfaces.renderkit.html.images.AutocompleteGradient\ + {topColorParam=additionalBackgroundColor ,bottomColorParam=controlBackgroundColor} + +org.richfaces.images\:spinnerArrowTop.png=org.richfaces.renderkit.html.images.SpinnerArrowTop +org.richfaces.images\:spinnerArrowBottom.png=org.richfaces.renderkit.html.images.SpinnerArrowBottom + +org.richfaces.images\:spinnerDisabledArrowTop.png=org.richfaces.renderkit.html.images.SpinnerArrowTop\ + {colorParam=tabDisabledTextColor} +org.richfaces.images\:spinnerDisabledArrowBottom.png=org.richfaces.renderkit.html.images.SpinnerArrowBottom\ + {colorParam=tabDisabledTextColor} + +org.richfaces.images\:sliderArrowBottom.png=org.richfaces.renderkit.html.images.SliderArrowBottom +org.richfaces.images\:sliderArrowLeft.png=org.richfaces.renderkit.html.images.SliderArrowLeft +org.richfaces.images\:sliderArrowRight.png=org.richfaces.renderkit.html.images.SliderArrowRight + +org.richfaces.images\:sliderDisabledArrowBottom.png=org.richfaces.renderkit.html.images.SliderArrowBottom\ + {colorParam=tabDisabledTextColor} +org.richfaces.images\:sliderDisabledArrowLeft.png=org.richfaces.renderkit.html.images.SliderArrowLeft\ + {colorParam=tabDisabledTextColor} +org.richfaces.images\:sliderDisabledArrowRight.png=org.richfaces.renderkit.html.images.SliderArrowRight\ + {colorParam=tabDisabledTextColor} + +org.richfaces.images\:sliderSelectedArrowBottom.png=org.richfaces.renderkit.html.images.SliderArrowBottom\ + {colorParam=tipBorderColor} +org.richfaces.images\:sliderSelectedArrowLeft.png=org.richfaces.renderkit.html.images.SliderArrowLeft\ + {colorParam=tipBorderColor} +org.richfaces.images\:sliderSelectedArrowRight.png=org.richfaces.renderkit.html.images.SliderArrowRight\ + {colorParam=tipBorderColor} + +org.richfaces.images\:inputBackgroundImage.png=org.richfaces.renderkit.html.images.InputBackgroundImage +org.richfaces.images\:buttonBackgroundImage.png=org.richfaces.renderkit.html.images.ButtonBackgroundImage + + + \ No newline at end of file Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/accordion.ecss =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/accordion.ecss 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/accordion.ecss 2011-02-10 12:34:05 UTC (rev 21595) @@ -10,7 +10,7 @@ border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: '#{richSkin.panelBorderColor}'; - background-image: "url(#{resource['org.richfaces.renderkit.html.GradientA']})"; + background-image: "url(#{resource['org.richfaces.images:gradientA.png']})"; background-repeat: repeat-x; background-position: top left; background-color: '#{richSkin.headerBackgroundColor}'; Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanel.ecss =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanel.ecss 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanel.ecss 2011-02-10 12:34:05 UTC (rev 21595) @@ -19,7 +19,7 @@ border-style:solid; background-position:top left; background-repeat:repeat-x; - background-image:"url(#{resource['org.richfaces.renderkit.html.GradientA']})"; + background-image:"url(#{resource['org.richfaces.images:gradientA.png']})"; } .rf-cp-hdr-exp {} Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/dropdownmenu.ecss =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/dropdownmenu.ecss 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/dropdownmenu.ecss 2011-02-10 12:34:05 UTC (rev 21595) @@ -94,7 +94,7 @@ margin : 2px 0px 2px 24px; } .rf-ddm-nd { - background-image: "url(#{resource['org.richfaces.renderkit.html.images.MenuNodeImage']})"; + background-image: "url(#{resource['org.richfaces.images:menuNodeImage.gif']})"; background-repeat: no-repeat; background-position: top; font-size: 1px; Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panel.ecss =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panel.ecss 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panel.ecss 2011-02-10 12:34:05 UTC (rev 21595) @@ -18,7 +18,7 @@ border-style:solid; background-position:top left; background-repeat:repeat-x; - background-image:"url(#{resource['org.richfaces.renderkit.html.GradientA']})"; + background-image:"url(#{resource['org.richfaces.images:gradientA.png']})"; } .rf-p-b{ Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.ecss =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.ecss 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.ecss 2011-02-10 12:34:05 UTC (rev 21595) @@ -34,7 +34,7 @@ z-index:100; } .rf-pp-hdr { - background : "url(#{resource['org.richfaces.renderkit.html.GradientA']})"; + background : "url(#{resource['org.richfaces.images:gradientA.png']})"; repeat-x : 'top left #{richSkin.headerBackgroundColor}'; position : relative; padding-left : 10px; Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/toolbar.ecss =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/toolbar.ecss 2011-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/toolbar.ecss 2011-02-10 12:34:05 UTC (rev 21595) @@ -10,7 +10,7 @@ background-position:left top; background-repeat:repeat-x; /*check gradient from headerGradientColor to headerBackgroundColor*/ - background-image:url("#{resource['org.richfaces.renderkit.html.GradientA']}"); + background-image:url("#{resource['org.richfaces.images:gradientA.png']}"); } .rf-tb-itm { @@ -35,25 +35,25 @@ } .rf-tb-sep-grid { - background-image:url("#{resource['org.richfaces.renderkit.html.images.GridSeparatorImage']}"); + background-image:url("#{resource['org.richfaces.images:gridSeparatorImage.gif']}"); width: 9px; background-repeat: repeat-y; } .rf-tb-sep-line { width: 2px; - background-image:url("#{resource['org.richfaces.renderkit.html.images.LineSeparatorImage']}"); + background-image:url("#{resource['org.richfaces.images:lineSeparatorImage.gif']}"); background-repeat: repeat-y; } .rf-tb-sep-disc { width: 9px; - background-image:url("#{resource['org.richfaces.renderkit.html.images.DotSeparatorImage']}"); + background-image:url("#{resource['org.richfaces.images:dotSeparatorImage.gif']}"); background-repeat: no-repeat; } .rf-tb-sep-square { width: 9px; - background-image:url("#{resource['org.richfaces.renderkit.html.images.SquareSeparatorImage']}"); + background-image:url("#{resource['org.richfaces.images:squareSeparatorImage.gif']}"); background-repeat: no-repeat; } \ No newline at end of file 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-02-10 12:23:27 UTC (rev 21594) +++ trunk/ui/output/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2011-02-10 12:34:05 UTC (rev 21595) @@ -19,11 +19,16 @@ org.richfaces.images\:actRightTabBg.png=org.richfaces.renderkit.html.BaseGradient\ {width=26, height=5, baseColorParam=generalBackgroundColor, gradientColorParam=tabBackgroundColor, horizontal=true} -org.richfaces.images\:pbAniBg.gif=org.richfaces.renderkit.html.images.ProgressBarAnimatedBackgroundImage - org.richfaces.images\:menu_list_bg.gif=org.richfaces.renderkit.html.BaseGradient\ {width=22, height=3, baseColorParam=additionalBackgroundColor, gradientColorParam=tabBackgroundColor, horizontal=true} org.richfaces.images\:menu_item_bg.gif=org.richfaces.renderkit.html.BaseGradient\ {width=3, height=16, baseColorParam=additionalBackgroundColor, gradientColorParam=tabBackgroundColor} org.richfaces.images\:tabLineBg.png=org.richfaces.renderkit.html.BaseGradient\ - {width=5, height=26, baseColorParam=additionalBackgroundColor, gradientColorParam=generalBackgroundColor} \ No newline at end of file + {width=5, height=26, baseColorParam=additionalBackgroundColor, gradientColorParam=generalBackgroundColor} + +org.richfaces.images\:menuNodeImage.gif=org.richfaces.renderkit.html.images.MenuNodeImage +org.richfaces.images\:pbAniBg.gif=org.richfaces.renderkit.html.images.ProgressBarAnimatedBackgroundImage +org.richfaces.images\:dotSeparatorImage.gif=org.richfaces.renderkit.html.images.DotSeparatorImage +org.richfaces.images\:gridSeparatorImage.gif=org.richfaces.renderkit.html.images.GridSeparatorImage +org.richfaces.images\:squareSeparatorImage.gif=org.richfaces.renderkit.html.images.SquareSeparatorImage +org.richfaces.images\:lineSeparatorImage.gif=org.richfaces.renderkit.html.images.LineSeparatorImage