Changeset 3797

Timestamp:

Aug 30, 2010, 12:52:01 PM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removing getNewUserForm() method from FormFactory?. Introducing NewUserForm? and related fields. Also added gui test NewUserFormTest?. Note that you should run 'ant test' from client/servlet. This will produce static html files in www/ which you can inspect visually.

Location:

trunk/client/servlet

Files:

• src/org/proteios/action/execute/Login.java (modified) (1 diff)
• src/org/proteios/action/user/AddUser.java (modified) (3 diffs)
• src/org/proteios/action/user/NewUser.java (modified) (2 diffs)
• src/org/proteios/action/user/SaveUserRoles.java (modified) (2 diffs)
• src/org/proteios/gui/form/EmailField.java (added)
• src/org/proteios/gui/form/FormFactory.java (modified) (3 diffs)
• src/org/proteios/gui/form/LoginField.java (added)
• src/org/proteios/gui/form/NewUserForm.java (added)
• src/org/proteios/gui/form/ProfilePasswordForm.java (modified) (1 diff)
• src/org/proteios/gui/form/RoleCheckbox.java (added)
• src/org/proteios/gui/form/TemplateForm.java (modified) (1 diff)
• src/org/proteios/gui/form/UsernameField.java (modified) (1 diff)
• test/build.xml (modified) (2 diffs)
• test/src/org/proteios/gui/HtmlOutputUtil.java (modified) (1 diff)
• test/src/org/proteios/gui/form (added)
• test/src/org/proteios/gui/form/NewUserFormTest.java (added)
• test/src/org/proteios/gui/web/WebGUITest.java (modified) (1 diff)

trunk/client/servlet/src/org/proteios/action/execute/Login.java

@@ -58 +58 @@
   try
   {
-    username = getString(UsernameField.VUSERNAME);
+    username = getString(UsernameField.VPARAM);
   }
   catch(InvalidParameterValue e)

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

@@ -33 +33 @@
 import org.proteios.core.Quota;
 import org.proteios.core.User;
-import org.proteios.gui.form.Form;
-import org.proteios.gui.form.FormFactory;
+import org.proteios.gui.form.*;
 import org.proteios.method.write.SaveUserRolesMethod;
 import se.lu.thep.waf.ActionException;
@@ -52 +51 @@
     DbControl dc = newDbControl();
     ItemFactory factory = new ItemFactory(dc);
-    Form form = getFormFactory().getNewUserForm(dc);
+    Form form = new NewUserForm(dc);
     verifyParameters(form);
-    ArrayList<Integer> roleIds = getValidIntegerList(FormFactory.VROLEID);
+    ArrayList<Integer> roleIds = getValidIntegerList(RoleCheckbox.VPARAM);
     // parameters are all there, verify that the passwords match
     String pwd1 = getString(FormFactory.VPWD1);
@@ -65 +64 @@
     }
     // All is ok, get the values
-    String login = getString(FormFactory.VLOGIN);
-    String name = getString(FormFactory.VNAME);
-    String email = getString(FormFactory.VEMAIL);
+    String login = getString(LoginField.VPARAM);
+    String name = getString(UsernameField.VPARAM);
+    String email = getString(EmailField.VPARAM);
     // Save a new user
     User user = factory.createUser(login, pwd1);

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

@@ -33 +33 @@
 import org.proteios.gui.Title;
 import org.proteios.gui.form.Form;
+import org.proteios.gui.form.NewUserForm;
 import org.proteios.gui.layout.RowLayout;
 import se.lu.thep.waf.ActionException;
@@ -56 +57 @@
   dc = newDbControl();
     layout = getLayoutFactory().getRowLayout();
-    form = getFormFactory().getNewUserForm(dc);
+    form = new NewUserForm(dc);
     populateForm(form);
 

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

@@ -30 +30 @@
 import org.proteios.action.ProteiosAction;
 import org.proteios.core.DbControl;
-import org.proteios.gui.form.Form;
-import org.proteios.gui.form.FormFactory;
+import org.proteios.gui.form.*;
 import org.proteios.method.write.SaveUserRolesMethod;
 import se.lu.thep.waf.ActionException;
@@ -50 +49 @@
     Form form = getFormFactory().getViewUserRolesForm(dc, null);
     verifyParameters(form);
-    ArrayList<Integer> roleIds = getValidIntegerList(FormFactory.VROLEID);
+    ArrayList<Integer> roleIds = getValidIntegerList(RoleCheckbox.VPARAM);
     // All is ok, get the values
-    Integer userId = getValidInteger(FormFactory.VID);
+    Integer userId = getValidInteger(ItemIdField.VPARAM);
     // Save user roles
     new SaveUserRolesMethod(dc, userId, roleIds);

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

@@ -214 +214 @@
   public static final VInteger VANNOTYPEID = new VInteger("annotationTypeId",
     0, true);
-  public static final VInteger VROLEID = new VInteger("roleId", 1, true);
   public static final VInteger VGROUPID = new VInteger("groupId", 1, false);
   public static final VString VNAME = NameField.VPARAM;
@@ -931 +930 @@
 
  // Cleaning up from here
-  public Form getNewUserForm(DbControl dc)
-  {
-    Form form = new Form("newUserForm");
-    // properties
-    Fieldset properties = new Fieldset();
-    properties.getLegendTitle().setTitle("Properties");
-    properties.add(newLoginField());
-    properties.add(new NameField());
-    properties.add(newEmailField());
-    properties.add(newDescriptionField());
-    form.addFieldset(properties);
-    // password
-    Fieldset passwords = new Fieldset();
-    passwords.getLegendTitle().setTitle("Password");
-    passwords.add(new PasswordField(VPWD1).setLabel("Password"));
-    passwords.add(new PasswordField(VPWD2).setLabel("VerifyPassword"));
-    form.addFieldset(passwords);
-    // Roles
-    Fieldset roles = new Fieldset();
-    roles.getLegendTitle().setTitle("Roles");
-    ItemQuery<Role> query = Role.getQuery();
-    for (Role r : query.list(dc))
-    {
-      Checkbox<VInteger> cb = new Checkbox<VInteger>(VROLEID);
-      cb.setValue("" + r.getId());
-      cb.setLabel(r.getName());
-      if (r.getSystemId().equals(org.proteios.core.Role.USER))
-        cb.isChecked(true);
-      roles.add(cb);
-    }
-    form.addFieldset(roles);
-    return form;
-  }
-
-
   public Form getGroupsForm(DbControl dc, User user)
   {
@@ -1022 +986 @@
     for (Role r : query.list(dc))
     {
-      Checkbox<VInteger> cb = new Checkbox<VInteger>(VROLEID);
+      Checkbox<VInteger> cb = new RoleCheckbox();
       cb.setValue("" + r.getId());
       cb.setLabel(r.getName());

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

@@ -55 +55 @@
   pwd1 = new PasswordField(PasswordField.VPWD1);
   pwd2 = new PasswordField(PasswordField.VPWD2);
-
   userIdF.setHidden(true);
   pwd1.setLabel("Password");

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

@@ -32 +32 @@
  TODO
 
- @author Gregory Vincic
+ @author gregory
 */
 public final class TemplateForm

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

@@ -33 +33 @@
  extends TextField<String>
 {
-  public static final VString VUSERNAME = new VString("username", 1, 32, true);
+  public static final VString VPARAM = new VString("username", 1, 32, true);
 
  public UsernameField()
  {
-  super(UsernameField.VUSERNAME);
+  super(UsernameField.VPARAM);
   this.setLabel("Username");
   this.setCharWidth(15);

trunk/client/servlet/test/build.xml

@@ -44 +44 @@
       <include name="**/*.jar" />
     </fileset>
+    <dirset dir="../build" />
     <fileset dir="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/lib">
       <include name="*.jar" />
     </fileset>
-    <dirset dir="../build" />
   
     <pathelement location="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/classes"/>
@@ -75 +75 @@
     <fileset dir=".">
       <include name="TEST*.txt"/>
+    </fileset>
+    <fileset dir="../www">
+      <include name="TEST_*.html"/>
     </fileset>
   </delete>

trunk/client/servlet/test/src/org/proteios/gui/HtmlOutputUtil.java

@@ -12 +12 @@
   public void printToFile(Tag html, String filename)
   {
-    String dir = System.getProperty("java.io.tmpdir");
-    File file = new File(dir + File.separatorChar + filename);
+  // You must be in client servlet when you run ant test
+    File file = new File("." + File.separatorChar + "www" + File.separatorChar + filename);
     HtmlTagWriter output;
     try

trunk/client/servlet/test/src/org/proteios/gui/web/WebGUITest.java

@@ -89 +89 @@
     layout.setConverter(lconverter);
     Tag html = layout.getHtml(".", null);
-    out.printToFile(html, "webGUITest.html");
+    out.printToFile(html, "TEST_WebGUITest.html"); // Name the file TEST_TestClassName.html
   }
 }