[richfaces-svn-commits] JBoss Rich Faces SVN: r2359 - trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Mon Aug 20 18:28:02 EDT 2007
Author: ishabalov
Date: 2007-08-20 18:28:02 -0400 (Mon, 20 Aug 2007)
New Revision: 2359
Modified:
trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeImageBase.java
trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineCollapsedImage.java
trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineExpandedImage.java
trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineImage.java
trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineLastImage.java
trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineNodeImage.java
trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeMinusImage.java
trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreePlusImage.java
Log:
Shorter URI encoding
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeImageBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeImageBase.java 2007-08-20 21:55:41 UTC (rev 2358)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeImageBase.java 2007-08-20 22:28:02 UTC (rev 2359)
@@ -29,7 +29,9 @@
import org.ajax4jsf.resource.GifRenderer;
import org.ajax4jsf.resource.InternetResourceBuilder;
import org.ajax4jsf.resource.Java2Dresource;
+import org.ajax4jsf.resource.ResourceContext;
import org.ajax4jsf.util.HtmlColor;
+import org.ajax4jsf.util.Zipper;
import org.richfaces.skin.Skin;
import org.richfaces.skin.SkinFactory;
@@ -81,12 +83,16 @@
} else
dt.setTrimColor(null);
- return dt;
+ return dt.toByteArray();
}
public boolean isCacheable() {
return true;
}
+
+ public TreeImageData getTreeImageData(ResourceContext resourceContext) {
+ return new TreeImageData((byte[])resourceContext.getResourceData());
+ }
protected static class TreeImageData implements Serializable{
private static final long serialVersionUID = 1732700513743861251L;
@@ -94,7 +100,17 @@
private Integer controlColor;
private Integer trimColor;
private Integer generalColor;
+
+ public TreeImageData() {
+
+ }
+ public TreeImageData(byte[] data) {
+ controlColor = new Integer(Zipper.unzip(data,0));
+ trimColor = new Integer(Zipper.unzip(data,3));
+ generalColor = new Integer(Zipper.unzip(data,6));
+ }
+
public Integer getControlColor() {
return controlColor;
}
@@ -113,6 +129,14 @@
public void setGeneralColor(Integer generalColor) {
this.generalColor = generalColor;
}
+
+ public byte[] toByteArray() {
+ byte[] ret = new byte[9];
+ Zipper.zip(ret,controlColor.intValue(),0);
+ Zipper.zip(ret,trimColor.intValue(),3);
+ Zipper.zip(ret,generalColor.intValue(),6);
+ return ret;
+ }
}
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineCollapsedImage.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineCollapsedImage.java 2007-08-20 21:55:41 UTC (rev 2358)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineCollapsedImage.java 2007-08-20 22:28:02 UTC (rev 2359)
@@ -44,7 +44,7 @@
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
- TreeImageData dataToStore = (TreeImageData)resourceContext.getResourceData();
+ TreeImageData dataToStore = getTreeImageData(resourceContext);
if (dataToStore.getTrimColor()!=null) {
Color trimColor = new Color(dataToStore.getTrimColor().intValue());
g2d.setColor(trimColor);
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineExpandedImage.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineExpandedImage.java 2007-08-20 21:55:41 UTC (rev 2358)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineExpandedImage.java 2007-08-20 22:28:02 UTC (rev 2359)
@@ -44,7 +44,7 @@
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
- TreeImageData dataToStore = (TreeImageData)resourceContext.getResourceData();
+ TreeImageData dataToStore = getTreeImageData(resourceContext);
if (dataToStore.getTrimColor()!=null) {
Color trimColor = new Color(dataToStore.getTrimColor().intValue());
g2d.setColor(trimColor);
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineImage.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineImage.java 2007-08-20 21:55:41 UTC (rev 2358)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineImage.java 2007-08-20 22:28:02 UTC (rev 2359)
@@ -44,7 +44,7 @@
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
- TreeImageData dataToStore = (TreeImageData)resourceContext.getResourceData();
+ TreeImageData dataToStore = getTreeImageData(resourceContext);
if (dataToStore.getTrimColor()!=null) {
Color trimColor = new Color(dataToStore.getTrimColor().intValue());
g2d.setColor(trimColor);
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineLastImage.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineLastImage.java 2007-08-20 21:55:41 UTC (rev 2358)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineLastImage.java 2007-08-20 22:28:02 UTC (rev 2359)
@@ -44,7 +44,7 @@
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
- TreeImageData dataToStore = (TreeImageData)resourceContext.getResourceData();
+ TreeImageData dataToStore = getTreeImageData(resourceContext);
if (dataToStore.getTrimColor()!=null) {
Color trimColor = new Color(dataToStore.getTrimColor().intValue());
g2d.setColor(trimColor);
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineNodeImage.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineNodeImage.java 2007-08-20 21:55:41 UTC (rev 2358)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeLineNodeImage.java 2007-08-20 22:28:02 UTC (rev 2359)
@@ -44,7 +44,7 @@
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
- TreeImageData dataToStore = (TreeImageData)resourceContext.getResourceData();
+ TreeImageData dataToStore = getTreeImageData(resourceContext);
if (dataToStore.getTrimColor()!=null) {
Color trimColor = new Color(dataToStore.getTrimColor().intValue());
g2d.setColor(trimColor);
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeMinusImage.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeMinusImage.java 2007-08-20 21:55:41 UTC (rev 2358)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreeMinusImage.java 2007-08-20 22:28:02 UTC (rev 2359)
@@ -32,6 +32,7 @@
import org.ajax4jsf.resource.ResourceContext;
+
public class TreeMinusImage extends TreeImageBase {
private static final Dimension dimensions = new Dimension(16, 16);
@@ -46,7 +47,7 @@
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
- TreeImageData dataToStore = (TreeImageData)resourceContext.getResourceData();
+ TreeImageData dataToStore = getTreeImageData(resourceContext);
if (dataToStore.getControlColor()!=null && dataToStore.getGeneralColor()!=null && dataToStore.getTrimColor()!=null) {
Color trimColor = new Color(dataToStore.getTrimColor().intValue());
Color controlColor = new Color(dataToStore.getControlColor().intValue());
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreePlusImage.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreePlusImage.java 2007-08-20 21:55:41 UTC (rev 2358)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/html/images/TreePlusImage.java 2007-08-20 22:28:02 UTC (rev 2359)
@@ -46,7 +46,7 @@
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
- TreeImageData dataToStore = (TreeImageData)resourceContext.getResourceData();
+ TreeImageData dataToStore = getTreeImageData(resourceContext);
if (dataToStore.getControlColor()!=null && dataToStore.getGeneralColor()!=null && dataToStore.getTrimColor()!=null) {
Color trimColor = new Color(dataToStore.getTrimColor().intValue());
Color controlColor = new Color(dataToStore.getControlColor().intValue());
More information about the richfaces-svn-commits
mailing list