Changeset 3801

Timestamp:

Aug 31, 2010, 8:34:01 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed getViewUserPasswordForm method from FormFactory?.

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/user/ChangeUserPassword.java (modified) (2 diffs)
• action/user/ViewActiveUser.java (modified) (1 diff)
• action/user/ViewUser.java (modified) (2 diffs)
• gui/form/FormFactory.java (modified) (1 diff)
• gui/form/ProfilePasswordForm.java (modified) (1 diff)

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

@@ -31 +31 @@
 import org.proteios.core.DbControl;
 import org.proteios.core.User;
-import org.proteios.gui.form.Form;
-import org.proteios.gui.form.FormFactory;
+import org.proteios.gui.form.*;
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
@@ -46 +45 @@
       throws ActionException, InvalidParameterValue
   {
-    Form form = getFormFactory().getViewUserPasswordForm(null);
+    Form form = new ProfilePasswordForm();
     verifyParameters(form);
-    Integer id = getValidInteger(FormFactory.VID);
-    String pwd1 = getValidString(FormFactory.VPWD1);
-    String pwd2 = getValidString(FormFactory.VPWD2);
+    Integer id = getValidInteger(ItemIdField.VPARAM);
+    String pwd1 = getValidString(PasswordField.VPWD1);
+    String pwd2 = getValidString(PasswordField.VPWD2);
     if (pwd1 != null && pwd2 != null)
     {

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

@@ -89 +89 @@
   title = new Title("User");
 
-    passwordF = getFormFactory().getViewUserPasswordForm(user);
+    passwordF = new ProfilePasswordForm(user);
     rolesF = new UserRolesForm(user);
     groupsF = new GroupsForm(user);

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

@@ -29 +29 @@
 
 import org.proteios.action.ProteiosAction;
-import org.proteios.gui.form.FormFactory;
+import org.proteios.gui.form.ItemIdField;
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
@@ -43 +43 @@
       throws ActionException, InvalidParameterValue
   {
-    verifyParameters(FormFactory.VID);
-    Integer id = getValidInteger(FormFactory.VID);
+    verifyParameters(ItemIdField.VPARAM);
+    Integer id = getValidInteger(ItemIdField.VPARAM);
     setSessionAttribute(ViewActiveUser.VUSERID.getName(), id);
     setForwardTo(ViewActiveUser.class);

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

@@ -929 +929 @@
   }
 
+
+
+  public Form getViewUserPropertiesForm(User user)
+  {
+    return getForm(User.class, user);
+  }
+
  // Cleaning up from here
-
-  public Form getViewUserPropertiesForm(User user)
-  {
-    return getForm(User.class, user);
-  }
-
-
-  public Form getViewUserPasswordForm(User user)
-  {
-    Form form = new Form("passwordForm");
-    Fieldset passwords = new Fieldset();
-    passwords.getLegendTitle().setTitle("Password");
-    // user id
-    TextField<Integer> userIdF = newHiddenItemIdField();
-    passwords.add(userIdF);
-    if (user != null)
-      userIdF.setValue(user.getId());
-    // password fields
-    passwords.add(new PasswordField(VPWD1).setLabel("Password"));
-    passwords.add(new PasswordField(VPWD2).setLabel("VerifyPassword"));
-    form.addFieldset(passwords);
-    return form;
-  }
-
 
   /**

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

@@ -51 +51 @@
  public ProfilePasswordForm()
  {
+  super("profilePasswordForm");
   propertiesFS = new Fieldset();
   userIdF = new ItemIdField();