Changeset 3794

Timestamp:

Aug 25, 2010, 12:40:11 PM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Adding ProfilePasswordForm and removing getMyProfilePasswordForm(...) method in FormFactory

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/user/ChangeMyPassword.java (modified) (2 diffs)
• action/user/ViewMyProfileAction.java (modified) (2 diffs)
• gui/form/FormFactory.java (modified) (1 diff)
• gui/form/PasswordField.java (modified) (2 diffs)
• gui/form/ProfilePasswordForm.java (added)

trunk/client/servlet/src/org/proteios/action/user/ChangeMyPassword.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 frm = getFormFactory().getMyProfilePasswordForm(getOwner());
+    Form frm = new ProfilePasswordForm(getOwner());
     verifyParameters(frm);
     String pwd1 = getValidString(FormFactory.VPWD1);

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

@@ -41 +41 @@
 import org.proteios.gui.ColumnContainer;
 import org.proteios.gui.RowContainer;
-import org.proteios.gui.form.Form;
+import org.proteios.gui.form.*;
 import org.proteios.gui.layout.RowLayout;
 
@@ -92 +92 @@
     if (!user.isMultiuserAccount())
     {
-      pwdForm = getFormFactory().getMyProfilePasswordForm(user);
+      pwdForm = new ProfilePasswordForm(user);
       tb2 = new Toolbar();
       changePassword = getActionFactory().getActionLink(

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

@@ -775 +775 @@
 
  // Cleaning up from here
-  public Form getMyProfilePasswordForm(User user)
-  {
-    Form form = new Form("myPasswordForm");
-    Fieldset fs = new Fieldset();
-    form.addFieldset(fs);
-    fs.getLegendTitle().setTitle("Password");
-    TextField<Integer> userIdF = newHiddenItemIdField();
-    fs.add(userIdF);
-    if (user != null)
-      userIdF.setValue(user.getId());
-    fs.add(new PasswordField(VPWD1).setLabel("Password"));
-    fs.add(new PasswordField(VPWD2).setLabel("VerifyPassword"));
-    return form;
-  }
-
-
   private TextField<String> newEmailField()
   {

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

@@ -38 +38 @@
 {
   public static final VString VPWD1 = new VString("pwd1", 1, 32, true);
+ public static final VString VPWD2 = new VString("pwd2", 1, 32, true);
 
   public PasswordField(String id)
@@ -44 +45 @@
   }
 
-  public PasswordField(VParameter vpwd1)
+  public PasswordField(VParameter vpwd)
   {
-    super(vpwd1);
+    super(vpwd);
   this.setCharWidth(15);
   }