|
17 | 17 |
|
18 | 18 | import java.util.List;
|
19 | 19 | import java.util.Map;
|
| 20 | +import java.util.Set; |
20 | 21 | import com.vaadin.data.Property.ValueChangeEvent;
|
21 | 22 | import com.vaadin.data.Property.ValueChangeListener;
|
22 | 23 | import com.vaadin.data.Validator;
|
|
32 | 33 | import com.vaadin.ui.HorizontalLayout;
|
33 | 34 | import com.vaadin.ui.TextField;
|
34 | 35 | import com.vaadin.ui.themes.ValoTheme;
|
| 36 | +import ch.systemsx.cisd.common.collection.RegExValidator; |
35 | 37 | import life.qbic.datamodel.persons.Affiliation;
|
36 | 38 | import life.qbic.datamodel.persons.Person;
|
37 | 39 | import life.qbic.portal.Styles;
|
| 40 | +import life.qbic.userdb.helpers.EmailFreeValidator; |
38 | 41 | import life.qbic.userdb.helpers.RegExHelper;
|
39 | 42 |
|
40 | 43 | public class PersonInput extends HorizontalLayout {
|
@@ -99,10 +102,14 @@ public PersonInput(List<String> titles, Map<String, Integer> affiliations, List<
|
99 | 102 | last.setRequired(true);
|
100 | 103 | left.addComponent(last);
|
101 | 104 |
|
102 |
| - Validator mailValidator = new RegexpValidator(RegExHelper.VALID_EMAIL_ADDRESS_REGEX, |
| 105 | +// CompositeValidator mailValidator = new CompositeValidator(CombinationMode.AND, ""); |
| 106 | + RegexpValidator mailRegExVal = new RegexpValidator(RegExHelper.VALID_EMAIL_ADDRESS_REGEX, |
103 | 107 | "Please input a valid e-mail address.");
|
| 108 | +// mailValidator.addValidator(mailRegExVal); |
| 109 | +// mailValidator.addValidator(new EmailFreeValidator(existingEmails)); |
| 110 | + |
104 | 111 | eMail =
|
105 |
| - prepSizeValidationForTextField("E-Mail", colNamesToMaxLength.get("email"), mailValidator); |
| 112 | + prepSizeValidationForTextField("E-Mail", colNamesToMaxLength.get("email"), mailRegExVal); |
106 | 113 | eMail.setRequired(true);
|
107 | 114 | left.addComponent(eMail);
|
108 | 115 |
|
|
0 commit comments