reducing <label> elements produced by XFormsGroupHandler

> In upgrading from an older version of Orbeon to 3.5.1 we've noticed that
> additional <label> elements were being produced for <xf:group> spans,
> which was affecting our layout.
>
> We were about to update our css to reflect the change, but then thought
> we'd better check for the source of the extra <label> elements first.
>
> It looks like the group handler is now outputting labels using:
>
>     reusableAttributes.clear();
>     reusableAttributes.addAttribute("", "class", "class",
> ContentHandlerHelper.CDATA, "xforms-label");
>     outputLabelFor(handlerContext, reusableAttributes, effectiveGroupId,
> labelValue);
>
> whereas previously it would use a call to:
>
>     handleLabelHintHelpAlert(effectiveGroupId, "label", groupXFormsControl);
>
> (which it can't use t anymore because the label needs to be output in
> the start() method). The effect is the same, except the labels are now
> output unconditionally, even if the group has no <xf:label> element.
> Whereas the handleLabelHintHelpAlert method won't output anything if no
> <xf:label> is present.
>
> The conditional behavior can be preserved with:
>
>     if(handlerContext.isGenerateTemplate() ||
> groupXFormsControl.getControlElement().element(XFormsConstants.XFORMS_LABEL_QNAME)
> != null) {
>         reusableAttributes.clear();
>         reusableAttributes.addAttribute("", "class", "class",
> ContentHandlerHelper.CDATA, "xforms-label");
>         outputLabelFor(handlerContext, reusableAttributes,
> effectiveGroupId, labelValue);
>     }
>
> Does this seem like a sensible check? Groups are frequently used without
> labels, so this cuts down the number of redundant empty <label> elements
> produced.
>
> Adrian
>
>
>
>
>
>