You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by ma...@apache.org on 2006/12/19 14:21:41 UTC
svn commit: r488688 - in
/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main:
java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java
javascript/META-INF/adf/jsLibs/ColorFormat.js
Author: matzew
Date: Tue Dec 19 06:21:40 2006
New Revision: 488688
URL: http://svn.apache.org/viewvc?view=rev&rev=488688
Log:
no need to send down the summary for the color converter (client version)
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/ColorFormat.js
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java?view=diff&rev=488688&r1=488687&r2=488688
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java Tue Dec 19 06:21:40 2006
@@ -178,12 +178,9 @@
convMsgDet, params);
sb.append("','");
- sb.append(XhtmlLafUtils.escapeJS(msg.getSummary()));
- sb.append("','");
sb.append(XhtmlLafUtils.escapeJS(msg.getDetail()));
}
-
-
+
sb.append("')");
return sb.toString();
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/ColorFormat.js
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/ColorFormat.js?view=diff&rev=488688&r1=488687&r2=488688
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/ColorFormat.js (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/ColorFormat.js Tue Dec 19 06:21:40 2006
@@ -21,14 +21,12 @@
pattern,
allowsTransparent,
patternsString,
- summary,
detail)
{
// for debugging
this._class = "TrColorConverter";
this._allowsTransparent = allowsTransparent;
this._patternsString = patternsString;
- this._summary = summary;
this._detail = detail;
if (pattern != null)
@@ -97,21 +95,22 @@
return new TrColor(0,0,0,0);
var facesMessage;
-
- if(this._summary == undefined)
+ var key = "org.apache.myfaces.trinidad.convert.ColorConverter.CONVERT";
+ if(this._detail == undefined)
{
- facesMessage = _createFacesMessage("org.apache.myfaces.trinidad.convert.ColorConverter.CONVERT",
- label,
- parseString,
- this._patternsString);
+ facesMessage = _createFacesMessage(key,
+ label,
+ parseString,
+ this._patternsString);
}
else
{
- facesMessage = _createCustomFacesMessage(this._summary,
- this._detail,
- label,
- parseString,
- this._patternsString);
+ facesMessage = _createCustomFacesMessage(
+ TrMessageFactory.getSummaryString(key),
+ this._detail,
+ label,
+ parseString,
+ this._patternsString);
}