7:54 p.m.
Author: nbelaevski
Date: 2010-04-27 20:54:49 -0400 (Tue, 27 Apr 2010)
New Revision: 16824
Modified:
branches/enterprise/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/html/iconimages/CalendarIcon.java
branches/enterprise/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/html/iconimages/DisabledCalendarIcon.java
Log:
https://jira.jboss.org/jira/browse/RFPL-551
Modified:
branches/enterprise/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/html/iconimages/CalendarIcon.java
===================================================================
---
branches/enterprise/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/html/iconimages/CalendarIcon.java 2010-04-27
14:30:54 UTC (rev 16823)
+++
branches/enterprise/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/html/iconimages/CalendarIcon.java 2010-04-28
00:54:49 UTC (rev 16824)
@@ -51,9 +51,9 @@
public class CalendarIcon extends Java2Dresource {
private static Dimension dimension = new Dimension(20, 20);
-
+
/**
- *
+ *
*/
public CalendarIcon() {
setRenderer(new GifRenderer());
@@ -68,7 +68,7 @@
// TODO Auto-generated method stub
return dimension;
}
-
+
/* (non-Javadoc)
* @see
org.ajax4jsf.resource.Java2Dresource#getDimensions(org.ajax4jsf.resource.ResourceContext)
*/
@@ -76,52 +76,52 @@
// TODO Auto-generated method stub
return dimension;
}
-
+
protected Object getDataToStore(FacesContext context, Object data) {
Skin skin = SkinFactory.getInstance().getSkin(context);
Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context);
-
+
String skinParameter = "headerBackgroundColor";
String headerTextColor = (String) skin.getParameter(context, skinParameter);
if (null == headerTextColor || "".equals(headerTextColor))
headerTextColor = (String) defaultSkin.getParameter(context, skinParameter);
-
+
if (headerTextColor == null) {
return null;
}
-
-
+
+
skinParameter = "selectControlColor";
String headerBackgroundColor = (String) skin.getParameter(context, skinParameter);
if (null == headerBackgroundColor || "".equals(headerBackgroundColor))
headerBackgroundColor = (String) defaultSkin.getParameter(context, skinParameter);
-
+
if(headerBackgroundColor == null){
return null;
}
-
+
byte[] ret = new byte[6];
Zipper2 zipper2 = new
Zipper2(ret).addColor(HtmlColor.decode(headerTextColor).getRGB());
zipper2.addColor(HtmlColor.decode(headerBackgroundColor).getRGB());
return ret;
}
-
+
protected Object deserializeData(byte[] objectArray) {
if (objectArray == null) {
return null;
}
-
+
Object[] colors = new Object[2];
Zipper2 z = new Zipper2(objectArray);
colors[0] = z.nextColor();
colors[1] = z.nextColor();
-
+
return colors;
}
-
+
public void paint(ResourceContext context, Graphics2D graphics) {
-
+
Object[] stored = (Object[]) restoreData(context);
if (stored != null) {
Dimension dim = getDimensions(context);
@@ -129,36 +129,40 @@
graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
RenderingHints.VALUE_INTERPOLATION_BICUBIC);
graphics.drawImage(image, 0, 0, dim.width, dim.height, null);
-
+
}
-
+
}
+ protected BufferedImage createImage(int width, int height) {
+ return new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
+ }
+
protected BufferedImage paintImage(Object [] colors) {
- BufferedImage image = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
-
+ BufferedImage image = createImage(16, 16);
+
Graphics2D g2d = image.createGraphics();
-
+
Color borderColor = (Color) colors[0];//new Color(((Integer) stored[0]).intValue());
Color activeColor = (Color) colors[1];//new Color(((Integer) stored[1]).intValue());
-
+
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING,
RenderingHints.VALUE_COLOR_RENDER_QUALITY);
-
+
g2d.setStroke(new BasicStroke(1));
-
+
int w = 16;
int h = 16;
-
-
+
+
//Draw Border
g2d.setColor(borderColor);
Rectangle2D border = new Rectangle2D.Double(1, 1, w - 3, h - 3);
RoundRectangle2D round = new RoundRectangle2D.Double(1, 1, w- 3, h - 3, 2, 2);
g2d.draw(round);
-
+
Color lightBlue = new Color(216, 226, 240);
Paint gradient1 = new GradientPaint(w-4, h-4, lightBlue, 2, 2, Color.white);
g2d.setPaint(gradient1);
@@ -176,36 +180,36 @@
g2d.drawLine(7, 6, 7, 11);
g2d.drawLine(9, 6, 9, 11);
g2d.drawLine(11, 6, 11, 11);
-
-
-
-
-
+
+
+
+
+
//Draw orange rectangle
border = new Rectangle2D.Double(3, 3, 10, 3);
g2d.setColor(Color.white);
g2d.fill(border);
-
+
Color c = new Color(activeColor.getRed(), activeColor.getGreen(),
activeColor.getBlue(), 100);
Color c2 = new Color(activeColor.getRed(), activeColor.getGreen(),
activeColor.getBlue(), 200);
-
+
gradient1 = new GradientPaint(12, 4, activeColor, 4, 7, c2);
g2d.setPaint(gradient1);
g2d.fill(border);
//g2d.setColor(activeColor);
-
+
c = new Color(activeColor.getRed(), activeColor.getGreen(), activeColor.getBlue(),
150);
c2 = new Color(activeColor.getRed(), activeColor.getGreen(), activeColor.getBlue(),
200);
border = new Rectangle2D.Double(4, 4, 8, 1);
-
+
g2d.setColor(Color.white);
g2d.fill(border);
-
+
gradient1 = new GradientPaint(4, 4, c, 10, 4, c2);
//g2d.setPaint(gradient1);
g2d.setColor(c);
g2d.fill(border);
-
+
g2d.dispose();
return image;
Modified:
branches/enterprise/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/html/iconimages/DisabledCalendarIcon.java
===================================================================
---
branches/enterprise/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/html/iconimages/DisabledCalendarIcon.java 2010-04-27
14:30:54 UTC (rev 16823)
+++
branches/enterprise/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/html/iconimages/DisabledCalendarIcon.java 2010-04-28
00:54:49 UTC (rev 16824)
@@ -21,25 +21,29 @@
package org.richfaces.renderkit.html.iconimages;
+import java.awt.Transparency;
import java.awt.color.ColorSpace;
import java.awt.image.BufferedImage;
-import java.awt.image.ColorConvertOp;
+import java.awt.image.ComponentColorModel;
+import java.awt.image.DataBuffer;
+import java.awt.image.WritableRaster;
/**
* @author Maksim Kaszynski
*
*/
public class DisabledCalendarIcon extends CalendarIcon {
-
- /* (non-Javadoc)
- * @see
org.richfaces.renderkit.html.iconimages.CalendarIcon#paintImage(java.lang.Object[])
- */
- protected BufferedImage paintImage(Object[] colors) {
-
- BufferedImage image = super.paintImage(colors);
-
- image = new ColorConvertOp(ColorSpace.getInstance(ColorSpace.CS_GRAY),
null).filter(image, null);
-
- return image;
+
+ @Override
+ protected BufferedImage createImage(int width, int height) {
+ ColorSpace gsColorSpace = ColorSpace.getInstance(ColorSpace.CS_GRAY);
+
+ ComponentColorModel ccm = new ComponentColorModel(gsColorSpace, true, false,
+ Transparency.TRANSLUCENT, DataBuffer.TYPE_BYTE);
+
+ WritableRaster raster = ccm.createCompatibleWritableRaster(width, height);
+
+ return new BufferedImage(ccm, raster, ccm.isAlphaPremultiplied(), null);
}
+
}