Author: dmaliarevich Date: 2008-12-05 05:12:02 -0500 (Fri, 05 Dec 2008) New Revision: 12295 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMessageTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMessagesTemplate.java Log: https://jira.jboss.org/jira/browse/JBIDE-3287, styles and classes were updated, html structure was updated, JUnit test was updated. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMessageTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMessageTemplate.java 2008-12-05 10:09:40 UTC (rev 12294) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMessageTemplate.java 2008-12-05 10:12:02 UTC (rev 12295) @@ -32,33 +32,33 @@ */ public class RichFacesMessageTemplate extends VpeAbstractTemplate { - private static String VALIDATION_MESSAGE = "Validation message"; + private static String VALIDATION_MESSAGE = "Validation message"; //$NON-NLS-1$ - protected static String PASSED_LABEL_ATTRIBUTE_NAME = "passedLabel"; - protected static String LABEL_CLASS_ATTRIBUTE_NAME = "labelClass"; - protected static String MARKER_CLASS_ATTRIBUTE_NAME = "markerClass"; - protected static String MARKER_STYLE_ATTRIBUTE_NAME = "markerStyle"; + protected static String PASSED_LABEL_ATTRIBUTE_NAME = "passedLabel"; //$NON-NLS-1$ + protected static String LABEL_CLASS_ATTRIBUTE_NAME = "labelClass"; //$NON-NLS-1$ + protected static String MARKER_CLASS_ATTRIBUTE_NAME = "markerClass"; //$NON-NLS-1$ + protected static String MARKER_STYLE_ATTRIBUTE_NAME = "markerStyle"; //$NON-NLS-1$ - protected static String ERROR_MARKER_CLASS_ATTRIBUTE_NAME = "errorMarkerClass"; - protected static String ERROR_LABEL_CLASS_ATTRIBUTE_NAME = "errorLabelClass"; - protected static String ERROR_CLASS_ATTRIBUTE_NAME = "errorClass"; + protected static String ERROR_MARKER_CLASS_ATTRIBUTE_NAME = "errorMarkerClass"; //$NON-NLS-1$ + protected static String ERROR_LABEL_CLASS_ATTRIBUTE_NAME = "errorLabelClass"; //$NON-NLS-1$ + protected static String ERROR_CLASS_ATTRIBUTE_NAME = "errorClass"; //$NON-NLS-1$ - protected static String FATAL_MARKER_CLASS_ATTRIBUTE_NAME = "fatalMarkerClass"; - protected static String FATAL_LABEL_CLASS_ATTRIBUTE_NAME = "fatalLabelClass"; - protected static String FATAL_CLASS_ATTRIBUTE_NAME = "fatalClass"; + protected static String FATAL_MARKER_CLASS_ATTRIBUTE_NAME = "fatalMarkerClass"; //$NON-NLS-1$ + protected static String FATAL_LABEL_CLASS_ATTRIBUTE_NAME = "fatalLabelClass"; //$NON-NLS-1$ + protected static String FATAL_CLASS_ATTRIBUTE_NAME = "fatalClass"; //$NON-NLS-1$ - protected static String INFO_MARKER_CLASS_ATTRIBUTE_NAME = "infoMarkerClass"; - protected static String INFO_LABEL_CLASS_ATTRIBUTE_NAME = "infoLabelClass"; - protected static String INFO_CLASS_ATTRIBUTE_NAME = "infoClass"; + protected static String INFO_MARKER_CLASS_ATTRIBUTE_NAME = "infoMarkerClass"; //$NON-NLS-1$ + protected static String INFO_LABEL_CLASS_ATTRIBUTE_NAME = "infoLabelClass"; //$NON-NLS-1$ + protected static String INFO_CLASS_ATTRIBUTE_NAME = "infoClass"; //$NON-NLS-1$ - protected static String WARN_MARKER_CLASS_ATTRIBUTE_NAME = "warnMarkerClass"; - protected static String WARN_LABEL_CLASS_ATTRIBUTE_NAME = "warnLabelClass"; - protected static String WARN_CLASS_ATTRIBUTE_NAME = "warnClass"; + protected static String WARN_MARKER_CLASS_ATTRIBUTE_NAME = "warnMarkerClass"; //$NON-NLS-1$ + protected static String WARN_LABEL_CLASS_ATTRIBUTE_NAME = "warnLabelClass"; //$NON-NLS-1$ + protected static String WARN_CLASS_ATTRIBUTE_NAME = "warnClass"; //$NON-NLS-1$ - protected static String ERROR_MESSAGE = "Error message"; - protected static String FATAL_MESSAGE = "Fatal message"; - protected static String INFO_MESSAGE = "Info message"; - protected static String WARNING_MESSAGE = "Warning message"; + protected static String ERROR_MESSAGE = "Error message"; //$NON-NLS-1$ + protected static String FATAL_MESSAGE = "Fatal message"; //$NON-NLS-1$ + protected static String INFO_MESSAGE = "Info message"; //$NON-NLS-1$ + protected static String WARNING_MESSAGE = "Warning message"; //$NON-NLS-1$ protected String passedLabelValue; protected String labelClassValue; @@ -79,14 +79,14 @@ protected String styleValue; protected String styleClassValue; - protected static String[] markers = { "passedMarker", "errorMarker", - "fatalMarker", "infoMarker", "warnMarker" }; + protected static String[] markers = { "passedMarker", "errorMarker", //$NON-NLS-1$ //$NON-NLS-2$ + "fatalMarker", "infoMarker", "warnMarker" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - protected static String FACET_TAG_NAME = "facet"; + protected static String FACET_TAG_NAME = "facet"; //$NON-NLS-1$ - protected static String NAME_ATTRIBUTE_NAME = "name"; + protected static String NAME_ATTRIBUTE_NAME = "name"; //$NON-NLS-1$ - private final static String MESSAGE_STYLE = "padding-left: 1px;padding-right: 1px;padding-top: 1px;padding-bottom: 1px"; + private final static String MESSAGE_STYLE = "padding-left: 1px;padding-right: 1px;padding-top: 1px;padding-bottom: 1px"; //$NON-NLS-1$ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { @@ -146,14 +146,14 @@ nsIDOMElement span = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_SPAN); - if (styleValue != null && !styleValue.trim().equals("")) + if (styleValue != null && !styleValue.trim().equals("")) //$NON-NLS-1$ span .setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, styleValue); - if (styleClassValue != null && !styleClassValue.trim().equals("")) + if (styleClassValue != null && !styleClassValue.trim().equals("")) //$NON-NLS-1$ span.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, styleClassValue); - if (labelClassValue != null && !labelClassValue.trim().equals("")) + if (labelClassValue != null && !labelClassValue.trim().equals("")) //$NON-NLS-1$ span.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, labelClassValue); @@ -231,7 +231,7 @@ nsIDOMElement tbody = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_TBODY); - tbody.setAttribute(HtmlComponentUtil.HTML_ATTR_VALIGN, "top"); + tbody.setAttribute(HtmlComponentUtil.HTML_ATTR_VALIGN, "top"); //$NON-NLS-1$ tableHeader.appendChild(tbody); nsIDOMElement tr = visualDocument @@ -239,10 +239,10 @@ tbody.appendChild(tr); - if (styleValue != null && !styleValue.trim().equals("")) + if (styleValue != null && !styleValue.trim().equals("")) //$NON-NLS-1$ tableHeader.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, styleValue); - if (styleClassValue != null && !styleClassValue.trim().equals("")) + if (styleClassValue != null && !styleClassValue.trim().equals("")) //$NON-NLS-1$ tableHeader.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, styleClassValue); @@ -257,54 +257,54 @@ case 0: // passed if (markerClassValue != null - && !markerClassValue.trim().equals("")) + && !markerClassValue.trim().equals("")) //$NON-NLS-1$ td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, markerClassValue); if (markerStyleValue != null - && !markerStyleValue.trim().equals("")) + && !markerStyleValue.trim().equals("")) //$NON-NLS-1$ td.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, markerStyleValue); break; case 1: // error if (errorClassValue != null - && !errorClassValue.trim().equals("")) + && !errorClassValue.trim().equals("")) //$NON-NLS-1$ td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, errorClassValue); if (errorMarkerClassValue != null - && !errorMarkerClassValue.trim().equals("")) + && !errorMarkerClassValue.trim().equals("")) //$NON-NLS-1$ td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, errorMarkerClassValue); break; case 2: // fatal if (fatalClassValue != null - && !fatalClassValue.trim().equals("")) + && !fatalClassValue.trim().equals("")) //$NON-NLS-1$ td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, fatalClassValue); if (fatalMarkerClassValue != null - && !fatalMarkerClassValue.trim().equals("")) + && !fatalMarkerClassValue.trim().equals("")) //$NON-NLS-1$ td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, fatalMarkerClassValue); break; case 3: // info if (infoClassValue != null - && !infoClassValue.trim().equals("")) + && !infoClassValue.trim().equals("")) //$NON-NLS-1$ td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, infoClassValue); if (infoMarkerClassValue != null - && !infoMarkerClassValue.trim().equals("")) + && !infoMarkerClassValue.trim().equals("")) //$NON-NLS-1$ td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, infoMarkerClassValue); break; case 4: // warn if (warnClassValue != null - && !warnClassValue.trim().equals("")) + && !warnClassValue.trim().equals("")) //$NON-NLS-1$ td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, warnClassValue); if (warnMarkerClassValue != null - && !warnMarkerClassValue.trim().equals("")) + && !warnMarkerClassValue.trim().equals("")) //$NON-NLS-1$ td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, warnMarkerClassValue); @@ -328,7 +328,7 @@ nsIDOMElement td1 = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_TD); - if (labelClassValue != null && !labelClassValue.trim().equals("")) + if (labelClassValue != null && !labelClassValue.trim().equals("")) //$NON-NLS-1$ td1 .setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, labelClassValue); @@ -364,7 +364,7 @@ if (!(nodeList.item(i) instanceof Element)) continue; - String facetName = nodeList.item(i).getPrefix() + ":" + String facetName = nodeList.item(i).getPrefix() + ":" //$NON-NLS-1$ + FACET_TAG_NAME; if (nodeList.item(i).getNodeName().equalsIgnoreCase(facetName) Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMessagesTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMessagesTemplate.java 2008-12-05 10:09:40 UTC (rev 12294) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMessagesTemplate.java 2008-12-05 10:12:02 UTC (rev 12295) @@ -12,10 +12,13 @@ import java.util.HashMap; -import org.jboss.tools.jsf.vpe.richfaces.HtmlComponentUtil; +import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil; +import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeChildrenInfo; import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.util.Constants; +import org.jboss.tools.vpe.editor.util.HTML; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMText; @@ -24,6 +27,15 @@ public class RichFacesMessagesTemplate extends RichFacesMessageTemplate { + private static final String LAYOUT = "layout"; //$NON-NLS-1$ + private static final String LIST = "list"; //$NON-NLS-1$ + private static final String TABLE = "table"; //$NON-NLS-1$ + private static final String ITERATOR = "iterator"; //$NON-NLS-1$ + + private static final String CSS_RICH_MESSAGES = "rich-messages"; //$NON-NLS-1$ + private static final String CSS_RICH_MESSAGES_MARKER = "rich-messages-marker"; //$NON-NLS-1$ + private static final String CSS_RICH_MESSAGES_LABEL = "rich-messages-label"; //$NON-NLS-1$ + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { @@ -67,33 +79,46 @@ .getAttribute(WARN_CLASS_ATTRIBUTE_NAME); styleValue = ((Element) sourceNode) - .getAttribute(HtmlComponentUtil.HTML_STYLE_ATTR); + .getAttribute(HTML.ATTR_STYLE); styleClassValue = ((Element) sourceNode) - .getAttribute(HtmlComponentUtil.HTML_STYLECLASS_ATTR); + .getAttribute(RichFaces.ATTR_STYLE_CLASS); + + String styleClass = CSS_RICH_MESSAGES; + String layout = ((Element) sourceNode).getAttribute(LAYOUT); + nsIDOMElement container = null; + if (TABLE.equalsIgnoreCase(layout)) { + container = visualDocument.createElement(HTML.TAG_TABLE); + container.setAttribute(HTML.ATTR_CELLPADDING, "0"); //$NON-NLS-1$ + container.setAttribute(HTML.ATTR_CELLSPACING, "0"); //$NON-NLS-1$ + } else { + /* + * If layout is either list or iterator or not specified + * use list layout by default. + */ + container = visualDocument.createElement(HTML.TAG_DL); + } + + if (ComponentUtil.isNotBlank(styleValue)) { + container.setAttribute(HTML.ATTR_STYLE, styleValue); + } + if (ComponentUtil.isNotBlank(styleClassValue)) { + styleClass += Constants.WHITE_SPACE + styleClassValue; + } + container.setAttribute(HTML.ATTR_CLASS, styleClass); + + creationData = new VpeCreationData(container); - nsIDOMElement table = visualDocument - .createElement(HtmlComponentUtil.HTML_TAG_TABLE); - - if (styleValue != null && !styleValue.trim().equals("")) - table.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, styleValue); - if (styleClassValue != null && !styleClassValue.trim().equals("")) - table.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - styleClassValue); - - creationData = new VpeCreationData(table); - HashMap<String, Node> facets = getFacelets((Element) sourceNode); for (int i = 0; i < markers.length; i++) { if (facets.containsKey(markers[i])) { - table.appendChild(createVisualMessage(creationData, - visualDocument, i, (Element) facets.get(markers[i]))); + container.appendChild(createVisualMessage(creationData, + visualDocument, layout, i, (Element) facets.get(markers[i]))); } else { - table.appendChild(createVisualMessage(creationData, - visualDocument, i, null)); + container.appendChild(createVisualMessage(creationData, + visualDocument, layout, i, null)); } } - return creationData; } @@ -106,107 +131,120 @@ * @return */ private nsIDOMElement createVisualMessage(VpeCreationData creationData, - nsIDOMDocument visualDocument, int markerNum, Element facet) { + nsIDOMDocument visualDocument, String layout, int markerNum, + Element facet) { - String labelMessage = ""; + String containerClass = Constants.EMPTY; + String markerClass = CSS_RICH_MESSAGES_MARKER; + String labelClass = CSS_RICH_MESSAGES_LABEL; + + String labelMessage = Constants.EMPTY; + nsIDOMElement topContainer = null; + nsIDOMElement container = null; + nsIDOMElement marker = null; + nsIDOMElement label = null; - nsIDOMElement tr = visualDocument - .createElement(HtmlComponentUtil.HTML_TAG_TR); + if (TABLE.equalsIgnoreCase(layout)) { + nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR); + container = visualDocument.createElement(HTML.TAG_TD); + marker = visualDocument.createElement(HTML.TAG_SPAN); + label = visualDocument.createElement(HTML.TAG_SPAN); + tr.appendChild(container); + container.appendChild(marker); + container.appendChild(label); + topContainer = tr; + } else { + /* + * If layout is either list or iterator or not specified use list + * layout by default. + */ + container = visualDocument.createElement(HTML.TAG_DT); + marker = visualDocument.createElement(HTML.TAG_SPAN); + label = visualDocument.createElement(HTML.TAG_SPAN); + container.appendChild(marker); + container.appendChild(label); + topContainer = container; + } - nsIDOMElement td1 = visualDocument - .createElement(HtmlComponentUtil.HTML_TAG_TD); - - nsIDOMElement td2 = visualDocument - .createElement(HtmlComponentUtil.HTML_TAG_TD); if (facet != null) { - VpeChildrenInfo childrenInfo = new VpeChildrenInfo(td1); + VpeChildrenInfo childrenInfo = new VpeChildrenInfo(marker); creationData.addChildrenInfo(childrenInfo); childrenInfo.addSourceChild(facet); } - // apply styles and classes + /* + * apply styles and classes + */ switch (markerNum) { case 0: // passed - labelMessage = (passedLabelValue == null) ? "" : passedLabelValue; - if (labelClassValue != null && !labelClassValue.trim().equals("")) - td2.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - labelClassValue); - if (markerClassValue != null && !markerClassValue.trim().equals("")) - td1.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - markerClassValue); - if (markerStyleValue != null && !markerStyleValue.trim().equals("")) - td1.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, - markerStyleValue); + labelMessage = (passedLabelValue == null) ? Constants.EMPTY : passedLabelValue; + if (ComponentUtil.isNotBlank(markerClassValue)) { + markerClass += Constants.WHITE_SPACE + markerClassValue; + } + if (ComponentUtil.isNotBlank(labelClassValue)) { + labelClass += Constants.WHITE_SPACE + labelClassValue; + } break; case 1: // error - if (errorClassValue != null && !errorClassValue.trim().equals("")) - tr.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - errorClassValue); - if (errorMarkerClassValue != null - && !errorMarkerClassValue.trim().equals("")) - td1.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - errorMarkerClassValue); - if (errorLabelClassValue != null - && !errorLabelClassValue.trim().equals("")) - td2.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - errorLabelClassValue); - labelMessage = ERROR_MESSAGE; + if (ComponentUtil.isNotBlank(errorClassValue)) { + containerClass += Constants.WHITE_SPACE + errorClassValue; + } + if (ComponentUtil.isNotBlank(errorMarkerClassValue)) { + markerClass += Constants.WHITE_SPACE + errorMarkerClassValue; + } + if (ComponentUtil.isNotBlank(errorLabelClassValue)) { + labelClass += Constants.WHITE_SPACE + errorLabelClassValue; + } break; case 2: // fatal labelMessage = FATAL_MESSAGE; - if (fatalClassValue != null && !fatalClassValue.trim().equals("")) - tr.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - fatalClassValue); - if (fatalMarkerClassValue != null - && !fatalMarkerClassValue.trim().equals("")) - td1.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - fatalMarkerClassValue); - if (fatalLabelClassValue != null - && !fatalLabelClassValue.trim().equals("")) - td2.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - fatalLabelClassValue); + if (ComponentUtil.isNotBlank(fatalClassValue)) { + containerClass += Constants.WHITE_SPACE + fatalClassValue; + } + if (ComponentUtil.isNotBlank(fatalMarkerClassValue)) { + markerClass += Constants.WHITE_SPACE + fatalMarkerClassValue; + } + if (ComponentUtil.isNotBlank(fatalLabelClassValue)) { + labelClass += Constants.WHITE_SPACE + fatalLabelClassValue; + } break; case 3: // info labelMessage = INFO_MESSAGE; - if (infoClassValue != null && !infoClassValue.trim().equals("")) - tr.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - infoClassValue); - if (infoMarkerClassValue != null - && !infoMarkerClassValue.trim().equals("")) - td1.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - infoMarkerClassValue); - if (infoLabelClassValue != null - && !infoLabelClassValue.trim().equals("")) - td2.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - infoLabelClassValue); + if (ComponentUtil.isNotBlank(infoClassValue)) { + containerClass += Constants.WHITE_SPACE + infoClassValue; + } + if (ComponentUtil.isNotBlank(infoMarkerClassValue)) { + markerClass += Constants.WHITE_SPACE + infoMarkerClassValue; + } + if (ComponentUtil.isNotBlank(infoLabelClassValue)) { + labelClass += Constants.WHITE_SPACE + infoLabelClassValue; + } break; case 4: // warn labelMessage = WARNING_MESSAGE; - if (warnClassValue != null && !warnClassValue.trim().equals("")) - tr.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - warnClassValue); - if (warnMarkerClassValue != null - && !warnMarkerClassValue.trim().equals("")) - td1.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - warnMarkerClassValue); - if (warnLabelClassValue != null - && !warnLabelClassValue.trim().equals("")) - td2.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - warnLabelClassValue); + if (ComponentUtil.isNotBlank(warnClassValue)) { + containerClass += Constants.WHITE_SPACE + warnClassValue; + } + if (ComponentUtil.isNotBlank(warnMarkerClassValue)) { + markerClass += Constants.WHITE_SPACE + warnMarkerClassValue; + } + if (ComponentUtil.isNotBlank(warnLabelClassValue)) { + labelClass += Constants.WHITE_SPACE + warnLabelClassValue; + } break; default: break; } - if (labelClassValue != null && !labelClassValue.trim().equals("")) - td2 - .setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - labelClassValue); + if (ComponentUtil.isNotBlank(containerClass)) { + container.setAttribute(HTML.ATTR_CLASS, containerClass); + } + marker.setAttribute(HTML.ATTR_CLASS, markerClass); + label.setAttribute(HTML.ATTR_CLASS, labelClass); + nsIDOMText text = visualDocument.createTextNode(labelMessage); - tr.appendChild(td1); - tr.appendChild(td2); - td2.appendChild(text); - return tr; + label.appendChild(text); + return topContainer; } } \ No newline at end of file