You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2008/02/26 11:12:59 UTC

svn commit: r631150 - /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageBoxRenderer.java

Author: matzew
Date: Tue Feb 26 02:12:42 2008
New Revision: 631150

URL: http://svn.apache.org/viewvc?rev=631150&view=rev
Log:
fixed NPE from TRINIDAD-969.
but now we see "odd" rendering of the "validation error message"
(needs to be discussed on dev list)

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageBoxRenderer.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageBoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageBoxRenderer.java?rev=631150&r1=631149&r2=631150&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageBoxRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageBoxRenderer.java Tue Feb 26 02:12:42 2008
@@ -34,7 +34,6 @@
 
 import org.apache.myfaces.trinidad.context.RenderingContext;
 import org.apache.myfaces.trinidad.context.RequestContext;
-import org.apache.myfaces.trinidad.skin.Icon;
 import org.apache.myfaces.trinidad.util.LabeledFacesMessage;
 import org.apache.myfaces.trinidadinternal.util.MessageUtils;
 
@@ -296,13 +295,14 @@
     if (msg instanceof LabeledFacesMessage)
     {
       LabeledFacesMessage labeledMsg = (LabeledFacesMessage)msg;
-      String anchor = MessageUtils.getAnchor(componentId);
-      if (anchor != null)
+      String labelString = labeledMsg.getLabelAsString(context);
+      if (labelString != null)
       {
+        String anchor = MessageUtils.getAnchor(componentId);
         writer.startElement(XhtmlConstants.LINK_ELEMENT, null);
         renderStyleClass(context, arc, SkinSelectors.LINK_STYLE_CLASS);
         writer.writeAttribute(XhtmlConstants.HREF_ATTRIBUTE, "#" + anchor, null);
-        writer.write(labeledMsg.getLabelAsString(context));
+        writer.write(labelString);
         writer.endElement(XhtmlConstants.LINK_ELEMENT);
       }
     }