Changeset 3832

Timestamp:

Sep 8, 2010, 11:02:02 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Replaced references to FormFactory.VEMAIL with EmailField.VPARAM

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/user/SaveMyProfileProperties.java (modified) (1 diff)
• action/user/SaveUserProperties.java (modified) (1 diff)
• gui/form/FormFactory.java (modified) (3 diffs)

trunk/client/servlet/src/org/proteios/action/user/SaveMyProfileProperties.java

@@ -54 +54 @@
 
     name = getString(NameField.VPARAM);
-    email = getString(FormFactory.VEMAIL);
+    email = getString(EmailField.VPARAM);
     descr = getString(DescriptionField.VPARAM);
     phone = getString(FormFactory.VPHONE);

trunk/client/servlet/src/org/proteios/action/user/SaveUserProperties.java

@@ -56 +56 @@
     userId = getValidInteger(FormFactory.VID);
     name = getString(NameField.VPARAM);
-    email = getString(FormFactory.VEMAIL);
+    email = getString(EmailField.VPARAM);
     descr = getString(DescriptionField.VPARAM);
     phone = getString(FormFactory.VPHONE);

trunk/client/servlet/src/org/proteios/gui/form/FormFactory.java

@@ -208 +208 @@
   public static final VInteger VGROUPID = new VInteger("groupId", 1, false);
   public static final VString VANNONAME = new VString("annotationName", 1,64, false);
-  public static final VString VEMAIL = new VString("email", 1, 255, true);
   public static final VString VPHONE = new VString("phone", 0, 255);
   public static final VString VADDRESS = new VString("address", 0, 255);
@@ -629 +628 @@
       .setHidden(true);
     return field;
-  }
-
-  private TextField<String> newEmailField()
-  {
-    TextField<String> emailF = new TextField<String>(VEMAIL);
-    emailF.setLabel("EMail");
-    return emailF;
   }
 
@@ -9523 +9515 @@
     if (User.class.isAssignableFrom(cls))
     {
-      TextField<String> emailF = newEmailField();
+      TextField<String> emailF = new EmailField();
       fs.add(fs.size()-1, emailF);