Author: norman
Date: Sun Aug 23 13:14:53 2009
New Revision: 806966
URL: http://svn.apache.org/viewvc?rev=806966&view=rev
Log:
move validators to extra package
Added:
labs/hupa/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java
- copied, changed from r806964,
labs/hupa/src/main/java/org/apache/hupa/client/validation/RegexValidator.java
Removed:
labs/hupa/src/main/java/org/apache/hupa/client/validation/RegexValidator.java
Modified:
labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
Modified:
labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java?rev=806966&r1=806965&r2=806966&view=diff
==============================================================================
---
labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
Sun Aug 23 13:14:53 2009
@@ -29,8 +29,8 @@
import net.customware.gwt.presenter.client.widget.WidgetPresenter;
import org.apache.hupa.client.MyAsyncCallback;
+import org.apache.hupa.client.validation.EmailListValidator;
import org.apache.hupa.client.validation.NotEmptyValidator;
-import org.apache.hupa.client.validation.RegexValidator;
import org.apache.hupa.client.widgets.HasEnable;
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.IMAPMessage;
@@ -208,17 +208,16 @@
}));
- String emailRegex =
"^[a-za-z0-9._%+...@[a-za-z0-9.-]+\\.[a-za-z]{2,}$";
FocusAction fAction = new FocusAction();
- validator.addValidators("cc", new
RegexValidator(display.getCcText(), emailRegex)
+ validator.addValidators("cc", new
EmailListValidator(display.getCcText())
.addActionForFailure(
new
StyleAction("hupa-validationErrorBorder"))
.addActionForFailure(fAction));
- validator.addValidators("bcc", new
RegexValidator(display.getBccText(), emailRegex)
+ validator.addValidators("bcc", new
EmailListValidator(display.getBccText())
.addActionForFailure(
new
StyleAction("hupa-validationErrorBorder"))
.addActionForFailure(fAction));
- validator.addValidators("to", new
RegexValidator(display.getToText(), emailRegex)
+ validator.addValidators("to", new
EmailListValidator(display.getToText())
.addActionForFailure(
new
StyleAction("hupa-validationErrorBorder"))
.addActionForFailure(fAction), new
NotEmptyValidator(display.getToText())
Copied:
labs/hupa/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java
(from r806964,
labs/hupa/src/main/java/org/apache/hupa/client/validation/RegexValidator.java)
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java?p2=labs/hupa/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java&p1=labs/hupa/src/main/java/org/apache/hupa/client/validation/RegexValidator.java&r1=806964&r2=806966&rev=806966&view=diff
==============================================================================
---
labs/hupa/src/main/java/org/apache/hupa/client/validation/RegexValidator.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java
Sun Aug 23 13:14:53 2009
@@ -26,10 +26,10 @@
import eu.maydu.gwt.validation.client.Validator;
import eu.maydu.gwt.validation.client.i18n.ValidationMessages;
-public class RegexValidator extends Validator<RegexValidator>{
+public class EmailListValidator extends Validator<EmailListValidator>{
private HasText text;
- private String regex;
- public RegexValidator(HasText text, String regex) {
+ private String emailRegex =
"^[a-za-z0-9._%+...@[a-za-z0-9.-]+\\.[a-za-z]{2,}$";
+ public EmailListValidator(HasText text) {
this.text = text;
}
@@ -65,6 +65,6 @@
}
private boolean isValidAddress(String email) {
- return email.matches(regex);
+ return email.matches(emailRegex);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
