You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2013/08/17 00:27:25 UTC
svn commit: r1514910 -
/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java
Author: lu4242
Date: Fri Aug 16 22:27:25 2013
New Revision: 1514910
URL: http://svn.apache.org/r1514910
Log:
MYFACES-3755 Show detail message on title of tooltip when showDetail is set or is available for h:message or h:messages
Modified:
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java?rev=1514910&r1=1514909&r2=1514910&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java Fri Aug 16 22:27:25 2013
@@ -212,9 +212,23 @@ public abstract class HtmlMessageRendere
String title = getTitle(message);
boolean tooltip = isTooltip(message);
+ boolean showSummary = isShowSummary(message) && (summary != null);
+ boolean showDetail = isShowDetail(message) && (detail != null);
+
if (title == null && tooltip)
{
- title = summary;
+ if (showDetail)
+ {
+ title = detail;
+ }
+ else if (detail != null)
+ {
+ title = detail;
+ }
+ else
+ {
+ title = summary;
+ }
}
ResponseWriter writer = facesContext.getResponseWriter();
@@ -293,10 +307,6 @@ public abstract class HtmlMessageRendere
writer, message, HTML.SPAN_ELEM, HTML.STYLE_CLASS_ATTR, styleClass, span);
}
-
- boolean showSummary = isShowSummary(message) && (summary != null);
- boolean showDetail = isShowDetail(message) && (detail != null);
-
if (showSummary && !(title == null && tooltip))
{
writer.writeText(summary, null);