myfaces-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Matthias Wessendorf" <mat...@apache.org>
Subject Re: svn commit: r644969 - /myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java
Date Sat, 05 Apr 2008 07:54:30 GMT
Cagatay,

please run the tests before committing...
This broke both trunks!

Can you check that?

Thx,
Matthias

On Sat, Apr 5, 2008 at 12:32 AM,  <cagatay@apache.org> wrote:
> Author: cagatay
>  Date: Fri Apr  4 15:32:05 2008
>  New Revision: 644969
>
>  URL: http://svn.apache.org/viewvc?rev=644969&view=rev
>  Log:
>  Fixed TRINIDAD-999(duplicate help facet rendering for panelLabelAndMessage), removed
help facet generation from PanelLabelAndMessageRender since parent LabelAndMessageRenderer
already generates one later.
>
>  Modified:
>     myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java
>
>  Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java
>  URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java?rev=644969&r1=644968&r2=644969&view=diff
>  ==============================================================================
>  --- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java
(original)
>  +++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java
Fri Apr  4 15:32:05 2008
>  @@ -108,16 +108,11 @@
>      // +------------------+-----------+
>      // | indexed children | end facet |
>      // +------------------+-----------+
>  -    // | help facet                   |
>  -    // +------------------------------+
>      ResponseWriter rw = context.getResponseWriter();
>      rw.startElement("table", component);
>      OutputUtils.renderLayoutTableAttributes(context, arc, "0", null/*width*/);
>
>      UIComponent end = getFacet(component, CorePanelLabelAndMessage.END_FACET);
>  -    UIComponent help = getFacet(component, CorePanelLabelAndMessage.HELP_FACET);
>  -
>  -    short helpColSpan = 1;
>
>      // Build the main row:
>      rw.startElement("tr", null);
>  @@ -126,24 +121,11 @@
>      rw.endElement("td");
>      if (end != null)
>      {
>  -      helpColSpan = 2;
>        rw.startElement("td", null);
>        // =-= mcc TODO apply className for "af|panelLabelAndMessage::end-facet"
>        // renderStyleClass(context, arc, ...);
>        //apply className for "af|panelLabelAndMessage::help-facet"
>        encodeChild(context, end);
>  -      rw.endElement("td");
>  -    }
>  -
>  -    // Build the help row:
>  -    if (help != null)
>  -    {
>  -      rw.endElement("tr");
>  -      rw.startElement("tr", null);
>  -      rw.startElement("td", null);
>  -      rw.writeAttribute("colspan", helpColSpan, null);
>  -      renderStyleClass(context, arc, SkinSelectors.AF_PANEL_LABEL_AND_MESSAGE_HELP_FACET_STYLE_CLASS);
>  -      encodeChild(context, help);
>        rw.endElement("td");
>      }
>
>
>
>



-- 
Matthias Wessendorf

further stuff:
blog: http://matthiaswessendorf.wordpress.com/
sessions: http://www.slideshare.net/mwessendorf
mail: matzew-at-apache-dot-org

Mime
View raw message