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/08/29 15:33:03 UTC
svn commit: r438103 - in /incubator/adffaces/trunk/trinidad:
trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/
trinidad-demo/src/main/webapp/WEB-INF/ trinidad-demo/src/main/webapp/jsLibs/
trinidad-impl/src/main/java/org/apach...
Author: matzew
Date: Tue Aug 29 08:33:02 2006
New Revision: 438103
URL: http://svn.apache.org/viewvc?rev=438103&view=rev
Log:
ADFFACES-127. Thanks for the patch, Gabrielle!
Modified:
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/PasswordValidator.java
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/SSNConverter.java
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/WEB-INF/web.xml
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/jsLibs/passwordValidator.js
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/jsLibs/ssnConverter.js
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/ByteLengthValidator.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/RegExpValidator.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CharSets.js
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/ColorFormat.js
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/DateFormat.js
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/PasswordValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/PasswordValidator.java?rev=438103&r1=438102&r2=438103&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/PasswordValidator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/PasswordValidator.java Tue Aug 29 08:33:02 2006
@@ -113,7 +113,8 @@
// The fourth field marker gets the field label
private static final String _VALIDATOR_INSTANCE_STRING =
"new PasswordValidator({"
- + "N:'The password value must contain at least one number.'})";
+ + "NS:'The password is invalid.',"
+ + "ND:'The password value must contain at least one number.'})";
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/SSNConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/SSNConverter.java?rev=438103&r1=438102&r2=438103&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/SSNConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/SSNConverter.java Tue Aug 29 08:33:02 2006
@@ -130,6 +130,7 @@
// in a real app the messages would be translated
return ("new SSNConverter({"
+ + "SUM:'Invalid social security number.',"
+ "S:'Value \"{1}\" is too short.',"
+ "L:'Value \"{1}\" is too long.',"
+ "N:'Value \"{1}\" is not a valid social security number.'})"
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/WEB-INF/web.xml?rev=438103&r1=438102&r2=438103&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/WEB-INF/web.xml Tue Aug 29 08:33:02 2006
@@ -66,6 +66,11 @@
<param-name>org.apache.myfaces.trinidad.CHANGE_PERSISTENCE</param-name>
<param-value>session</param-value>
</context-param>
+
+ <context-param>
+ <param-name>org.apache.myfaces.trinidad.resource.DEBUG</param-name>
+ <param-value>false</param-value>
+ </context-param>
<!-- With setting this parameter you are able to specify the logical
outcome prefix to launch the dialog framework. If not set, the
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/jsLibs/passwordValidator.js
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/jsLibs/passwordValidator.js?rev=438103&r1=438102&r2=438103&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/jsLibs/passwordValidator.js (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/jsLibs/passwordValidator.js Tue Aug 29 08:33:02 2006
@@ -22,7 +22,7 @@
if (value == '******')
return null;
- var messageKey = PasswordValidator.NUMBER;
+ var hasNumber = false;
for (var i = 0; i < value.length; i++)
{
@@ -30,12 +30,19 @@
if (!isNaN(parseInt(subValue)))
{
- messageKey = null;break;
+ hasNumber = true;
+ break;
}
}
- if (messageKey != null)
- throw new ValidatorException(this._messages[messageKey]);
+ if (hasNumber == false)
+ {
+ var facesMessage = new FacesMessage(
+ this._messages[PasswordValidator.NUMBER_SUMMARY],
+ this._messages[PasswordValidator.NUMBER_DETAIL],
+ FacesMessage.SEVERITY_ERROR)
+ throw new ValidatorException(null, facesMessage);
+ }
return null;
}
@@ -44,4 +51,5 @@
{this._messages = messages;}
PasswordValidator.prototype = new Validator();
PasswordValidator.prototype.validate = passwordValidate;
-PasswordValidator.NUMBER = 'N';
+PasswordValidator.NUMBER_DETAIL = 'ND';
+PasswordValidator.NUMBER_SUMMARY = 'NS';
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/jsLibs/ssnConverter.js
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/jsLibs/ssnConverter.js?rev=438103&r1=438102&r2=438103&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/jsLibs/ssnConverter.js (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/jsLibs/ssnConverter.js Tue Aug 29 08:33:02 2006
@@ -42,7 +42,11 @@
}
if (messageKey!=null && this._messages!=null)
{
- throw new ConverterException(this._messages[messageKey]);
+ var facesMessage = new FacesMessage(
+ this._messages[SSNConverter.SUMMARY],
+ this._messages[messageKey],
+ FacesMessage.SEVERITY_ERROR)
+ throw new ConverterException(null, facesMessage);
}
return null;
}
@@ -51,6 +55,7 @@
SSNConverter.prototype = new Converter();
SSNConverter.prototype.getAsString = ssnGetAsString;
SSNConverter.prototype.getAsObject = ssnGetAsObject;
+SSNConverter.SUMMARY = 'SUM';
SSNConverter.SHORT = 'S';
SSNConverter.LONG = 'L';
SSNConverter.NOT = 'N';
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?rev=438103&r1=438102&r2=438103&view=diff
==============================================================================
--- 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 Aug 29 08:33:02 2006
@@ -19,6 +19,7 @@
import java.util.Collections;
import java.util.Map;
+import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -73,9 +74,7 @@
// FIX - figure out size!!!
StringBuffer buff = new StringBuffer();
- // -= Simon Lessard =-
- // FIXME: JSF 1.2 specifies <String, Object>
- Map<Object, Object> requestMap = context.getExternalContext().getRequestMap();
+ Map<String, Object> requestMap = context.getExternalContext().getRequestMap();
// =-=JRF Only if Javascript...
if (requestMap.get(_PATTERN_WRITTEN_KEY) == null)
{
@@ -169,8 +168,10 @@
sb.append(",false,'");
}
- String msg = _getConvertMessageDetail(context);
- sb.append(XhtmlLafUtils.escapeJS(msg));
+ FacesMessage msg = _getConvertFacesMessage(context);
+ sb.append(XhtmlLafUtils.escapeJS(msg.getSummary()));
+ sb.append("','");
+ sb.append(XhtmlLafUtils.escapeJS(msg.getDetail()));
sb.append("','");
sb.append(XhtmlLafUtils.escapeJS(patternsString));
sb.append("')");
@@ -244,7 +245,7 @@
}
}
- private String _getConvertMessageDetail(FacesContext context)
+ private FacesMessage _getConvertFacesMessage(FacesContext context)
{
String convMsgDet = getConvertMessageDetail();
@@ -253,10 +254,10 @@
Object[] params = new Object[] {"{0}", "{1}", "{2}"};
return MessageFactory.getMessage(context, CONVERT_MESSAGE_ID,
- convMsgDet, params).getDetail();
+ convMsgDet, params);
}
private static final Collection<String> _IMPORT_NAMES = Collections.singletonList( "ColorFormat()" );
private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(ColorConverter.class);
- private static final Object _PATTERN_WRITTEN_KEY = "org.apache.myfaces.trinidadinternal.convert.ColorConverter._PATTERN_WRITTEN";
+ private static final String _PATTERN_WRITTEN_KEY = "org.apache.myfaces.trinidadinternal.convert.ColorConverter._PATTERN_WRITTEN";
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java?rev=438103&r1=438102&r2=438103&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java Tue Aug 29 08:33:02 2006
@@ -225,6 +225,9 @@
new Object[]{"{0}", "{1}", maxVal});
outBuffer.append(XhtmlLafUtils.escapeJS(maxMessage.getDetail()));
+
+ outBuffer.append("',LV_S:'");
+ outBuffer.append(XhtmlLafUtils.escapeJS(maxMessage.getSummary()));
outBuffer.append("',MV:'");
FacesMessage minMessage =
@@ -232,6 +235,9 @@
new Object[]{"{0}", "{1}", minVal});
outBuffer.append(XhtmlLafUtils.escapeJS(minMessage.getDetail()));
+
+ outBuffer.append("',MV_S:'");
+ outBuffer.append(XhtmlLafUtils.escapeJS(minMessage.getSummary()));
outBuffer.append("',D:'");
@@ -239,7 +245,10 @@
MessageFactory.getMessage(context, defaultId,
new Object[]{"{0}", "{1}"});
- outBuffer.append(XhtmlLafUtils.escapeJS(defaultMessage.getDetail()));
+ outBuffer.append(XhtmlLafUtils.escapeJS(defaultMessage.getDetail()));
+
+ outBuffer.append("',D_S:'");
+ outBuffer.append(XhtmlLafUtils.escapeJS(defaultMessage.getSummary()));
outBuffer.append("'},(void 0),0,");
outBuffer.append(maxVal);
@@ -267,6 +276,8 @@
new Object[]{"{0}", "{1}"});
outBuffer.append(XhtmlLafUtils.escapeJS(defaultMessage.getDetail()));
+ outBuffer.append("',D_S:'");
+ outBuffer.append(XhtmlLafUtils.escapeJS(defaultMessage.getSummary()));
outBuffer.append("'})");
return outBuffer.toString();
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java?rev=438103&r1=438102&r2=438103&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java Tue Aug 29 08:33:02 2006
@@ -25,6 +25,7 @@
import java.util.Map;
import java.util.TimeZone;
+import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.convert.ConverterException;
@@ -215,18 +216,22 @@
if (pattern == null)
pattern = getSecondaryPattern();
Object[] params = new Object[] {"{0}", "{1}", "{2}"};
- String msg = getParseErrorMessage(context, component,
- pattern, params).getDetail();
- String message = XhtmlLafUtils.escapeJS(msg);
+ FacesMessage msg = getParseErrorMessage(context, component,
+ pattern, params);
+ String detailMessage = XhtmlLafUtils.escapeJS(msg.getDetail());
+ String summaryMessage = XhtmlLafUtils.escapeJS(msg.getSummary());
String exampleString = XhtmlLafUtils.escapeJS(getExample(context));
- StringBuffer outBuffer = new StringBuffer(33 + jsPattern.length() +
- message.length() +
+ StringBuffer outBuffer = new StringBuffer(36 + jsPattern.length() +
+ detailMessage.length() +
+ summaryMessage.length() +
exampleString.length());
outBuffer.append("new SimpleDateFormat("); // 21
outBuffer.append(jsPattern); // jsPattern.length
outBuffer.append(",null,'"); // 7
- outBuffer.append(message); // message.length/
+ outBuffer.append(summaryMessage); // summary message.length
+ outBuffer.append("','"); // 3
+ outBuffer.append(detailMessage); // detail message.length/
outBuffer.append("','"); // 3
outBuffer.append(exampleString); // exampleString.length
outBuffer.append("')"); // 2
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/ByteLengthValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/ByteLengthValidator.java?rev=438103&r1=438102&r2=438103&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/ByteLengthValidator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/ByteLengthValidator.java Tue Aug 29 08:33:02 2006
@@ -24,6 +24,7 @@
import java.util.HashSet;
import java.util.Set;
+import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -108,15 +109,16 @@
}
}
- String lengthFailedMessage
- = _getEscapedJsMaximumMessageDetail(context);
-
+ FacesMessage message = _getEscapedJsMaximumMessage(context);
+
String maxLength = String.valueOf(getMaximum());
constr.append(maxLength);
constr.append(",{LF:'");
- constr.append(XhtmlLafUtils.escapeJS(lengthFailedMessage));
+ constr.append(XhtmlLafUtils.escapeJS(message.getDetail()));
+ constr.append("',LFS:'");
+ constr.append(XhtmlLafUtils.escapeJS(message.getSummary()));
constr.append( "'})");
return constr.toString();
@@ -178,7 +180,7 @@
return _UNSUPPORTED_TYPE;
}
- private String _getEscapedJsMaximumMessageDetail(
+ private FacesMessage _getEscapedJsMaximumMessage(
FacesContext context)
{
String maxMsgDetail = getMaximumMessageDetail();
@@ -187,14 +189,11 @@
Object[] params = new Object[] {label, "{1}", maxLength};
- String detailMsg
- = MessageFactory.getMessage(context,
+ return MessageFactory.getMessage(context,
ByteLengthValidator.MAXIMUM_MESSAGE_ID,
maxMsgDetail,
- params).getDetail();
-
+ params);
- return detailMsg;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/RegExpValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/RegExpValidator.java?rev=438103&r1=438102&r2=438103&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/RegExpValidator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/RegExpValidator.java Tue Aug 29 08:33:02 2006
@@ -18,6 +18,7 @@
import java.util.Collection;
import java.util.Collections;
+import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -63,19 +64,23 @@
String jsPattern = XhtmlUtils.escapeJS(getPattern());
-
- String esNoMatchMsgPattern = XhtmlUtils.escapeJS(
- _getNoMatchMessageDetail(context));
+ FacesMessage message = _getNoMatchMessage(context);
+ String esNoMatchMsgPattern = XhtmlUtils.escapeJS(message.getDetail());
+ String esNoMatchMsgSummaryPattern =
+ XhtmlUtils.escapeJS(message.getSummary());
- StringBuffer outBuffer = new StringBuffer(28
+ StringBuffer outBuffer = new StringBuffer(35
+ jsPattern.length()
- + esNoMatchMsgPattern.length());
+ + esNoMatchMsgPattern.length()
+ + esNoMatchMsgSummaryPattern.length());
outBuffer.append("new RegExpFormat('"); // 18
outBuffer.append(jsPattern);
outBuffer.append("',{NM:'"); // 7
outBuffer.append(esNoMatchMsgPattern);
+ outBuffer.append("',NMS:'"); // 7
+ outBuffer.append(esNoMatchMsgSummaryPattern);
outBuffer.append("'})"); // 3
return outBuffer.toString();
@@ -92,18 +97,16 @@
return null;
}
- private String _getNoMatchMessageDetail(
+ private FacesMessage _getNoMatchMessage(
FacesContext context)
{
String noMatchMsg = getNoMatchMessageDetail();
Object[] params = new Object[] {"{0}", "{1}", "{2}"};
- String noMatchDetMsg
- = MessageFactory.getMessage(context,
+ return MessageFactory.getMessage(context,
RegExpValidator.NO_MATCH_MESSAGE_ID,
noMatchMsg,
- params).getDetail();
- return noMatchDetMsg;
+ params);
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CharSets.js
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CharSets.js?rev=438103&r1=438102&r2=438103&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CharSets.js (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CharSets.js Tue Aug 29 08:33:02 2006
@@ -30,6 +30,8 @@
EncodingFormat.prototype = new Validator();
+//LFS - Length failed summary
+EncodingFormat.prototype.LFS = "LFS";
//LF - Length failed
EncodingFormat.prototype.LF = "LF";
@@ -48,7 +50,10 @@
if (length < 0)
{
- throw new ValidatorException(this._messages[this.LF]);
+ var facesMessage = new FacesMessage(this._messages[this.LFS],
+ this._messages[this.LF],
+ FacesMessage.SEVERITY_ERROR);
+ throw new ValidatorException(null, facesMessage);
}
i++;
@@ -96,7 +101,10 @@
if (length < 0)
{
- throw new ValidatorException(this._messages[this.LF]);
+ var facesMessage = new FacesMessage(this._messages[this.LFS],
+ this._messages[this.LF],
+ FacesMessage.SEVERITY_ERROR);
+ throw new ValidatorException(null, facesMessage);
}
i++;
@@ -128,7 +136,10 @@
{
if (this._length < parseString.length)
{
- throw new ValidatorException(this._messages[this.LF]);
+ var facesMessage = new FacesMessage(this._messages[this.LFS],
+ this._messages[this.LF],
+ FacesMessage.SEVERITY_ERROR);
+ throw new ValidatorException(null, facesMessage);
}
return parseString;
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?rev=438103&r1=438102&r2=438103&view=diff
==============================================================================
--- 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 Aug 29 08:33:02 2006
@@ -59,11 +59,14 @@
return new Color(0,0,0,0);
var pattern = this._pattern;
+ var facesMessage = new FacesMessage(this._msg_summary,
+ this._msg_detail,
+ FacesMessage.SEVERITY_ERROR);
if (typeof pattern == "string")
{
return _rgbColorParseImpl(parseString,
pattern,
- this._msg);
+ facesMessage);
}
else
{
@@ -73,7 +76,7 @@
try{
var color = _rgbColorParseImpl(parseString,
pattern[i],
- this._msg);
+ facesMessage);
return color;
}
catch (e)
@@ -95,7 +98,7 @@
var parseContext = new Object();
parseContext.currIndex = 0;
parseContext.parseString = parseString;
- parseContext.parseException = new ConverterException(msg);
+ parseContext.parseException = new ConverterException(null, msg);
var parsedColor = new Color(0x00, 0x00, 0x00);
@@ -554,18 +557,20 @@
function RGBColorFormat(
pattern,
allowsTransparent,
- msg,
+ msg_summary,
+ msg_detail,
patternsString)
{
// for debugging
this._class = "RGBColorFormat";
- this._allowsTransparent = allowsTransparent;
- // format the error string
- // {2} legal patterns
+ this._allowsTransparent = allowsTransparent;
+ this._msg_summary = msg_summary;
- if (msg != null)
+ // format the detail error string
+ // {2} legal patterns
+ if (msg_detail != null)
{
- this._msg = _formatErrorString(msg,
+ this._msg_detail = _formatErrorString(msg_detail,
{
"2":patternsString
});
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js?rev=438103&r1=438102&r2=438103&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CoreFormat.js Tue Aug 29 08:33:02 2006
@@ -20,6 +20,15 @@
return "" + number;
}
+function _decimalFacesMessage(
+ messages,
+ messageKey
+)
+{
+ return new FacesMessage(messages[(messageKey+ '_S')],
+ messages[messageKey],
+ FacesMessage.SEVERITY_ERROR);
+}
function _decimalParse(
numberString,
@@ -30,8 +39,12 @@
minValue
)
{
+ var facesMessage = null;
if (!numberString)
- throw new ConverterException(messages[DecimalFormat.D]);
+ {
+ facesMessage = _decimalFacesMessage(messages, DecimalFormat.D);
+ throw new ConverterException(null, facesMessage);
+ }
// Get LocaleSymbols (from Locale.js)
@@ -42,7 +55,10 @@
var grouping = symbols.getGroupingSeparator();
if ((numberString.indexOf(grouping) == 0) ||
(numberString.lastIndexOf(grouping) == (numberString.length - 1)))
- throw new ConverterException(messages[DecimalFormat.D]);
+ {
+ facesMessage = _decimalFacesMessage(messages, DecimalFormat.D);
+ throw new ConverterException(null, facesMessage);
+ }
// Remove the thousands separator - which Javascript doesn't want to see
var thousands = new RegExp("\\" + grouping, "g");
@@ -116,7 +132,10 @@
(messages[messageKey] == (void 0)))
throw new ConverterException("Conversion failed, but no appropriate message found"); // default error format
else
- throw new ConverterException(messages[messageKey]);
+ {
+ facesMessage = _decimalFacesMessage(messages, messageKey);
+ throw new ConverterException(null, facesMessage);
+ }
}
return result;
@@ -124,7 +143,8 @@
}
}
- throw new ConverterException(messages[DecimalFormat.D]);
+ facesMessage = _decimalFacesMessage(messages, DecimalFormat.D);
+ throw new ConverterException(null, facesMessage);
}
function _decimalGetAsObject(
@@ -244,7 +264,10 @@
});
}
- throw new ValidatorException(this._messages[RegExpFormat.NM]);
+ var facesMessage = new FacesMessage(this._messages[RegExpFormat.NMS],
+ this._messages[RegExpFormat.NM],
+ FacesMessage.SEVERITY_ERROR);
+ throw new ValidatorException(null, facesMessage);
}
}
@@ -259,8 +282,10 @@
this._class = "RegExpFormat";
}
-//Input Text does not match pattern
+// no match pattern
RegExpFormat.NM = 'NM';
+// no match pattern summary
+RegExpFormat.NMS = 'NMS';
RegExpFormat.prototype = new Validator();
RegExpFormat.prototype.validate = _regExpParse;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/DateFormat.js
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/DateFormat.js?rev=438103&r1=438102&r2=438103&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/DateFormat.js (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/DateFormat.js Tue Aug 29 08:33:02 2006
@@ -62,12 +62,15 @@
)
{
var pattern = this._pattern;
+ var facesMessage = new FacesMessage(this._msg_summary,
+ this._msg_detail,
+ FacesMessage.SEVERITY_ERROR);
if (typeof pattern == "string")
{
return _simpleDateParseImpl(parseString,
pattern,
this._localeSymbols,
- this._msg);
+ facesMessage);
}
else
{
@@ -78,7 +81,7 @@
var date = _simpleDateParseImpl(parseString,
pattern[i],
this._localeSymbols,
- this._msg);
+ facesMessage);
return date;
}
catch (e)
@@ -110,7 +113,7 @@
parseContext.parsedFullYear = (void 0);
parseContext.parsedMonth = (void 0);
parseContext.parsedDate = (void 0);
- parseContext.parseException = new ConverterException(msg);
+ parseContext.parseException = new ConverterException(null, msg);
var parsedTime = new Date(0);
parsedTime.setDate(1);
@@ -1246,18 +1249,20 @@
function SimpleDateFormat(
pattern,
locale,
- msg,
+ msg_summary,
+ msg_detail,
exampleString
)
{
// for debugging
this._class = "SimpleDateFormat";
+ this._msg_summary = msg_summary;
// format the error string
// {2} a legal example
- if (msg != null)
+ if (msg_detail != null)
{
- this._msg = _formatErrorString(msg,
+ this._msg_detail = _formatErrorString(msg_detail,
{
"2":exampleString
});