Author: nbelaevski
Date: 2009-03-31 11:41:58 -0400 (Tue, 31 Mar 2009)
New Revision: 13317
Added:
trunk/ui/paint2D/src/main/config/resources/
trunk/ui/paint2D/src/main/config/resources/resources-config.xml
Modified:
trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java
Log:
https://jira.jboss.org/jira/browse/RF-6652
Added: trunk/ui/paint2D/src/main/config/resources/resources-config.xml
===================================================================
--- trunk/ui/paint2D/src/main/config/resources/resources-config.xml
(rev 0)
+++ trunk/ui/paint2D/src/main/config/resources/resources-config.xml 2009-03-31 15:41:58
UTC (rev 13317)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource-config>
+ <resource class="org.richfaces.renderkit.html.Paint2DResource">
+ <name>org.richfaces.renderkit.html.Paint2DResource</name>
+ </resource>
+
+ <resource class="org.richfaces.renderkit.html.Paint2DCachedResource">
+ <name>org.richfaces.renderkit.html.Paint2DCachedResource</name>
+ </resource>
+</resource-config>
Modified:
trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java
===================================================================
---
trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java 2009-03-31
14:23:02 UTC (rev 13316)
+++
trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java 2009-03-31
15:41:58 UTC (rev 13317)
@@ -65,7 +65,12 @@
}
public ResourceRenderer getRenderer(ResourceContext context) {
- ImageData data = (ImageData) restoreData(context);
+ ImageData data = null;
+
+ if (context != null) {
+ data = (ImageData) restoreData(context);
+ }
+
ImageRenderer renderer = _renderers[null==data?0:data._format];
return renderer;
}