[richfaces-svn-commits] JBoss Rich Faces SVN: r22027 - branches/4.0.X/ui/output/ui/src/main/java/org/richfaces/renderkit/html.
Author: Alex.Kolonitsky
Date: 2011-03-03 03:37:53 -0500 (Thu, 03 Mar 2011)
New Revision: 22027
Modified:
branches/4.0.X/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java
Log:
RF-10664 Panel menu group: attributes leftIconClass and rightIconClass ignored
- reviewed by Anton Belevich
Modified:
branches/4.0.X/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java
===================================================================
---
branches/4.0.X/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java 2011-03-03
00:23:14 UTC (rev 22026)
+++
branches/4.0.X/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java 2011-03-03
08:37:53 UTC (rev 22027)
@@ -6,6 +6,7 @@
import javax.faces.context.ResponseWriter;
import org.richfaces.component.AbstractPanelMenuGroup;
+import org.richfaces.component.util.HtmlUtil;
import org.richfaces.renderkit.util.PanelIcons;
import org.richfaces.renderkit.util.PanelIcons.State;
@@ -35,7 +36,7 @@
iconExpanded = PanelIcons.transparent.toString();
}
- encodeTdIcon(writer, context, cssClassPrefix + "-ico", iconCollapsed,
iconExpanded, getState(group));
+ encodeTdIcon(writer, context, HtmlUtil.concatClasses(cssClassPrefix +
"-ico", group.getLeftIconClass()), iconCollapsed, iconExpanded,
getState(group));
}
protected void encodeHeaderRightIcon(ResponseWriter writer, FacesContext context,
AbstractPanelMenuGroup group) throws IOException {
@@ -50,6 +51,6 @@
iconExpanded = PanelIcons.transparent.toString();
}
//TODO nick - should this be "-ico-exp"? also why expanded icon state
is connected with right icon alignment?
- encodeTdIcon(writer, context, cssClassPrefix + "-exp-ico",
iconCollapsed, iconExpanded, getState(group));
+ encodeTdIcon(writer, context, HtmlUtil.concatClasses(cssClassPrefix +
"-exp-ico", group.getRightIconClass()), iconCollapsed, iconExpanded,
getState(group));
}
}