You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ca...@apache.org on 2008/04/05 00:32:07 UTC
svn commit: r644969 -
/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java
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");
}
Re: svn commit: r644969 - /myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java
Posted by Matthias Wessendorf <ma...@apache.org>.
well, running the build before check in should be done.
newbie or not. If than questions come up... everybody loves
to help :-)
-M
On Sat, Apr 5, 2008 at 11:01 AM, Cagatay Civici
<ca...@gmail.com> wrote:
> Ooops, sorry, I'm a trinidad newbie:) I'll fix it.
>
> Cagatay
>
>
>
> On Sat, Apr 5, 2008 at 10:56 AM, Matthias Wessendorf <ma...@apache.org>
> wrote:
>
> > BTW. the failure comes from our "golden file" test.
> > That happens, when you change the markup.
> >
> > You'll find more details here:
> > http://wiki.apache.org/myfaces/Trinidad_RenderKit_test_framework
> >
> > -M
> >
> >
> >
> >
> > On Sat, Apr 5, 2008 at 9:54 AM, Matthias Wessendorf <ma...@apache.org>
> wrote:
> > > 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, <ca...@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
> > >
> >
> >
> >
> > --
> > Matthias Wessendorf
> >
> > further stuff:
> > blog: http://matthiaswessendorf.wordpress.com/
> > sessions: http://www.slideshare.net/mwessendorf
> > mail: matzew-at-apache-dot-org
> >
>
>
--
Matthias Wessendorf
further stuff:
blog: http://matthiaswessendorf.wordpress.com/
sessions: http://www.slideshare.net/mwessendorf
mail: matzew-at-apache-dot-org
Re: svn commit: r644969 - /myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java
Posted by Cagatay Civici <ca...@gmail.com>.
Ooops, sorry, I'm a trinidad newbie:) I'll fix it.
Cagatay
On Sat, Apr 5, 2008 at 10:56 AM, Matthias Wessendorf <ma...@apache.org>
wrote:
> BTW. the failure comes from our "golden file" test.
> That happens, when you change the markup.
>
> You'll find more details here:
> http://wiki.apache.org/myfaces/Trinidad_RenderKit_test_framework
>
> -M
>
> On Sat, Apr 5, 2008 at 9:54 AM, Matthias Wessendorf <ma...@apache.org>
> wrote:
> > 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, <ca...@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
> >
>
>
>
> --
> Matthias Wessendorf
>
> further stuff:
> blog: http://matthiaswessendorf.wordpress.com/
> sessions: http://www.slideshare.net/mwessendorf
> mail: matzew-at-apache-dot-org
>
Re: svn commit: r644969 - /myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java
Posted by Matthias Wessendorf <ma...@apache.org>.
BTW. the failure comes from our "golden file" test.
That happens, when you change the markup.
You'll find more details here:
http://wiki.apache.org/myfaces/Trinidad_RenderKit_test_framework
-M
On Sat, Apr 5, 2008 at 9:54 AM, Matthias Wessendorf <ma...@apache.org> wrote:
> 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, <ca...@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
>
--
Matthias Wessendorf
further stuff:
blog: http://matthiaswessendorf.wordpress.com/
sessions: http://www.slideshare.net/mwessendorf
mail: matzew-at-apache-dot-org
Re: svn commit: r644969 - /myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java
Posted by Matthias Wessendorf <ma...@apache.org>.
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, <ca...@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