Author: sergeyhalipov
Date: 2008-04-28 07:46:08 -0400 (Mon, 28 Apr 2008)
New Revision: 8225
Added:
trunk/ui/separator/src/main/config/resources/
trunk/ui/separator/src/main/config/resources/resources-config.xml
Modified:
trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/SeparatorRendererBase.java
Log:
http://jira.jboss.com/jira/browse/RF-3269
Added: trunk/ui/separator/src/main/config/resources/resources-config.xml
===================================================================
--- trunk/ui/separator/src/main/config/resources/resources-config.xml
(rev 0)
+++ trunk/ui/separator/src/main/config/resources/resources-config.xml 2008-04-28 11:46:08
UTC (rev 8225)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource-config>
+ <resource
class="org.richfaces.renderkit.html.images.BevelSeparatorImage">
+ <name>org.richfaces.renderkit.html.images.BevelSeparatorImage</name>
+ </resource>
+ <resource
class="org.richfaces.renderkit.html.images.SimpleSeparatorImage">
+ <name>org.richfaces.renderkit.html.images.SimpleSeparatorImage</name>
+ </resource>
+</resource-config>
\ No newline at end of file
Modified:
trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/SeparatorRendererBase.java
===================================================================
---
trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/SeparatorRendererBase.java 2008-04-28
11:26:44 UTC (rev 8224)
+++
trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/SeparatorRendererBase.java 2008-04-28
11:46:08 UTC (rev 8225)
@@ -97,10 +97,10 @@
public String backgroundImage(FacesContext context, UIComponent component) throws
IOException {
UISeparator separator = (UISeparator) component;
String lineType = separator.getLineType();
- if (lineType == null || lineType.trim().length() == 0 ||
LINE_TYPE_NONE.equals(lineType)) {
+ if (LINE_TYPE_NONE.equals(lineType)) {
return "none";
}
- if (! isSupportedLineType(lineType)) {
+ if (lineType == null || lineType.trim().length() == 0 ||
!isSupportedLineType(lineType)) {
lineType = LINE_TYPE_BEVEL;
}
@@ -143,7 +143,7 @@
if (null != width) {
buff.append("width: " + width + "; ");
}
- buff.append("background-image: " + backgroundImage(context, component));
+ buff.append("background-image: " + backgroundImage(context, component) +
"; ");
buff.append(component.getAttributes().get(HTML.style_ATTRIBUTE));
return buff.toString();