You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by an...@apache.org on 2007/09/28 13:45:28 UTC
svn commit: r580318 - in /tapestry/tapestry4/trunk/tapestry-framework/src:
java/org/apache/tapestry/form/translator/
java/org/apache/tapestry/form/validator/
test/org/apache/tapestry/form/translator/
test/org/apache/tapestry/form/validator/
Author: andyhot
Date: Fri Sep 28 04:45:27 2007
New Revision: 580318
URL: http://svn.apache.org/viewvc?rev=580318&view=rev
Log:
TAPESTRY-1770: use tapestry js object
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Email.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxLength.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinLength.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestEmail.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxLength.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinLength.java
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java?rev=580318&r1=580317&r2=580318&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java Fri Sep 28 04:45:27 2007
@@ -141,7 +141,7 @@
}
cons.accumulate(field.getClientId(),
- new JSONLiteral("[dojo.i18n.number.isReal,null,{"
+ new JSONLiteral("[tapestry.form.validation.isReal,null,{"
+ "places:" + format.getMaximumFractionDigits() + ","
+ "decimal:"
+ JSONObject.quote(format.getDecimalFormatSymbols().getDecimalSeparator())
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Email.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Email.java?rev=580318&r1=580317&r2=580318&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Email.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Email.java Fri Sep 28 04:45:27 2007
@@ -85,7 +85,7 @@
JSONObject cons = profile.getJSONObject(ValidationConstants.CONSTRAINTS);
accumulateProperty(cons, field.getClientId(),
- new JSONLiteral("[dojo.validate.isEmailAddress,false,true]"));
+ new JSONLiteral("[tapestry.form.validation.isEmailAddress,false,true]"));
accumulateProfileProperty(field, profile,
ValidationConstants.CONSTRAINTS, buildMessage(context, field));
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxLength.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxLength.java?rev=580318&r1=580317&r2=580318&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxLength.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxLength.java Fri Sep 28 04:45:27 2007
@@ -86,7 +86,7 @@
JSONObject cons = profile.getJSONObject(ValidationConstants.CONSTRAINTS);
accumulateProperty(cons, field.getClientId(),
- new JSONLiteral("[dojo.validate.isText,{"
+ new JSONLiteral("[tapestry.form.validation.isText,{"
+ "maxlength:" + _maxLength + "}]"));
accumulateProfileProperty(field, profile,
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinLength.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinLength.java?rev=580318&r1=580317&r2=580318&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinLength.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinLength.java Fri Sep 28 04:45:27 2007
@@ -85,7 +85,7 @@
JSONObject cons = profile.getJSONObject(ValidationConstants.CONSTRAINTS);
accumulateProperty(cons, field.getClientId(),
- new JSONLiteral("[dojo.validate.isText,{"
+ new JSONLiteral("[tapestry.form.validation.isText,{"
+ "minlength:" + _minLength + "}]"));
accumulateProfileProperty(field, profile,
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java?rev=580318&r1=580317&r2=580318&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java Fri Sep 28 04:45:27 2007
@@ -255,7 +255,7 @@
assertEquals(json.toString(),
"{\"constraints\":{\"numberField\":" +
- "[[dojo.i18n.number.isReal,null,{places:0,decimal:\".\",separator:\"\"}]]}," +
+ "[[tapestry.form.validation.isReal,null,{places:0,decimal:\".\",separator:\"\"}]]}," +
"\"numberField\":{\"constraints\":[\"invalid number message\"]}}");
}
@@ -288,7 +288,7 @@
assertEquals(json.toString(),
"{\"constraints\":{\"numberField\":" +
- "[[dojo.i18n.number.isReal,null," +
+ "[[tapestry.form.validation.isReal,null," +
"{places:0,decimal:\".\",separator:\",\",groupSize:2}]]}," +
"\"numberField\":{\"constraints\":[\"invalid number message\"]}}");
}
@@ -328,7 +328,7 @@
verify();
assertEquals(json.toString(),
- "{\"constraints\":{\"myfield\":[[dojo.i18n.number.isReal,null," +
+ "{\"constraints\":{\"myfield\":[[tapestry.form.validation.isReal,null," +
"{places:0,decimal:\".\",separator:\"\"}]]}," +
"\"myfield\":{\"constraints\":[\"Blah Blah 'Field Name' Blah.\"]}}");
}
@@ -365,7 +365,7 @@
assertEquals(json.toString(),
"{\"trim\":[\"myfield\"]," +
- "\"constraints\":{\"myfield\":[[dojo.i18n.number.isReal,null," +
+ "\"constraints\":{\"myfield\":[[tapestry.form.validation.isReal,null," +
"{places:0,decimal:\".\",separator:\"\"}]]}," +
"\"myfield\":{\"constraints\":[\"invalid number message\"]}}");
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestEmail.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestEmail.java?rev=580318&r1=580317&r2=580318&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestEmail.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestEmail.java Fri Sep 28 04:45:27 2007
@@ -137,7 +137,7 @@
verify();
- assertEquals("{\"constraints\":{\"myfield\":[[dojo.validate.isEmailAddress,false,true]]},"
+ assertEquals("{\"constraints\":{\"myfield\":[[tapestry.form.validation.isEmailAddress,false,true]]},"
+"\"myfield\":{\"constraints\":[\"default\\\\message\"]}}",
json.toString());
}
@@ -170,7 +170,7 @@
verify();
- assertEquals("{\"constraints\":{\"barney\":[[dojo.validate.isEmailAddress,false,true]]},"
+ assertEquals("{\"constraints\":{\"barney\":[[tapestry.form.validation.isEmailAddress,false,true]]},"
+ "\"barney\":{\"constraints\":[\"custom message\"]}}",
json.toString());
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxLength.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxLength.java?rev=580318&r1=580317&r2=580318&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxLength.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxLength.java Fri Sep 28 04:45:27 2007
@@ -116,7 +116,7 @@
verify();
- assertEquals("{\"constraints\":{\"myfield\":[[dojo.validate.isText,{maxlength:20}]]},"
+ assertEquals("{\"constraints\":{\"myfield\":[[tapestry.form.validation.isText,{maxlength:20}]]},"
+"\"myfield\":{\"constraints\":[\"default\\\\message\"]}}",
json.toString());
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinLength.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinLength.java?rev=580318&r1=580317&r2=580318&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinLength.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinLength.java Fri Sep 28 04:45:27 2007
@@ -117,7 +117,7 @@
verify();
- assertEquals("{\"constraints\":{\"myfield\":[[dojo.validate.isText,{minlength:25}]]},"
+ assertEquals("{\"constraints\":{\"myfield\":[[tapestry.form.validation.isText,{minlength:25}]]},"
+"\"myfield\":{\"constraints\":[\"default\\\\message\"]}}",
json.toString());
}
@@ -151,7 +151,7 @@
verify();
- assertEquals("{\"constraints\":{\"customField\":[[dojo.validate.isText,{minlength:25}]]},"
+ assertEquals("{\"constraints\":{\"customField\":[[tapestry.form.validation.isText,{minlength:25}]]},"
+ "\"customField\":{\"constraints\":[\"custom\\\\message\"]}}",
json.toString());
}