You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mc...@apache.org on 2009/10/28 16:47:07 UTC
svn commit: r830644 - in
/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit:
JSFAttr.java html/HtmlImageRendererBase.java
Author: mconcini
Date: Wed Oct 28 15:47:07 2009
New Revision: 830644
URL: http://svn.apache.org/viewvc?rev=830644&view=rev
Log:
MYFACES-2390
Modified:
myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/JSFAttr.java
myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/JSFAttr.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/JSFAttr.java?rev=830644&r1=830643&r2=830644&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/JSFAttr.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/JSFAttr.java Wed Oct 28 15:47:07 2009
@@ -119,7 +119,8 @@
// GraphicImage attributes
String NAME_ATTR = "name";
String URL_ATTR = "url";
-
+ String LIBRARY_ATTR = "library";
+
// UISelectItem attributes
String ITEM_DISABLED_ATTR = "itemDisabled";
String ITEM_DESCRIPTION_ATTR = "itemDescription";
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java?rev=830644&r1=830643&r2=830644&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java Wed Oct 28 15:47:07 2009
@@ -89,13 +89,22 @@
}
else
{
- String name = (String) uiComponent.getAttributes().get (JSFAttr.NAME_ATTR);
-
+ String resourceName = (String) uiComponent.getAttributes().get (JSFAttr.NAME_ATTR);
+ String libraryName = (String) uiComponent.getAttributes().get (JSFAttr.LIBRARY_ATTR);
// JSF 2.0: if "name" attribute is available, treat as a resource reference.
- if ((name != null) && (name.length() > 0))
+ if ((resourceName != null) && (resourceName.length() > 0))
{
- Resource resource = facesContext.getApplication().getResourceHandler().createResource (name);
+ Resource resource = null;
+ if ((libraryName != null) && (libraryName.length() > 0))
+ {
+ resource = facesContext.getApplication().getResourceHandler().createResource (resourceName, libraryName);
+ }
+ else
+ {
+ resource = facesContext.getApplication().getResourceHandler().createResource (resourceName);
+ }
+
String src = resource.getRequestPath();
writer.writeURIAttribute(HTML.SRC_ATTR,