Changeset 3862

Timestamp:

Sep 20, 2010, 9:03:32 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed method getMascotSearchUserDataInputForm from FormFactory.

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/file/UseSpectrumFileForMascotSearchExtension.java (modified) (4 diffs)
• gui/form/FormFactory.java (modified) (1 diff)
• gui/form/MascotNameAndEmailForm.java (added)

trunk/client/servlet/src/org/proteios/action/file/UseSpectrumFileForMascotSearchExtension.java

@@ -39 +39 @@
 import org.proteios.gui.Title;
 import org.proteios.gui.Toolbar;
-import org.proteios.gui.form.Form;
-import org.proteios.gui.form.FormFactory;
+import org.proteios.gui.form.*;
 import org.proteios.gui.layout.RowLayout;
 import org.proteios.gui.table.Table;
@@ -69 +68 @@
       throws ActionException, InvalidParameterValue
   {
-  FormFactory formFactory;
-   formFactory = this.getFormFactory();
     /***********************************************************************
      * Check input
      */
     /*
-     * Get the id's of all selected files. FormFactory.VID is the valid
+     * Get the id's of all selected files. ItemIdField.VPARAM is the valid
      * identifier used when rendering the list of files, thus we use it to
      * get the valid list of item ids.
      */
-    List<Integer> spectrumFileIds = getValidIntegerList(FormFactory.VID);
+    List<Integer> spectrumFileIds = getValidIntegerList(ItemIdField.VPARAM);
     log.debug("spectrumFileIds = " + spectrumFileIds);
     /*
@@ -107 +104 @@
     log.debug("user = \"" + user + "\"");
     // Get form
-    Form mascotSearchUserDataInputForm = formFactory.getMascotSearchUserDataInputForm(user);
+    Form mascotSearchUserDataInputForm = new MascotNameAndEmailForm(user);
     // Add tool bar with 'Next' button to the form
     Toolbar toolbar = new Toolbar();
@@ -115 +112 @@
     for (Integer spectrumFileId : spectrumFileIds)
     {
-    formFactory.addHiddenField(mascotSearchUserDataInputForm,SearchMascot.VSPECTRUMFILEID,spectrumFileId);
+    getFormFactory().addHiddenField(mascotSearchUserDataInputForm,SearchMascot.VSPECTRUMFILEID,spectrumFileId);
     }
     nextSelect.addParameter(SearchMascot.VMASCOTUSEWEBINTERFACEFLAG, true);

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

@@ -2336 +2336 @@
 
  //Cleaning up from here
-
-
-
-
-  /**
-   * Returns a form for entering user data for a Mascot search.
-   * 
-   * @param user User The user from whose profile default contact information
-   *        should be taken.
-   * @return Form for entering Mascot search user data.
-   */
-  public Form getMascotSearchUserDataInputForm(User user)
-  {
-    Form form = new Form("mascotSearchUserDataInputForm");
-    // Get potential default contact information from user profile
-    String defaultName = new String("");
-    String defaultEmail = new String("");
-    if (user != null)
-    {
-      // Default name
-      if (user.getName() != null)
-      {
-        defaultName = user.getName();
-      }
-      // Default e-mail
-      if (user.getEmail() != null)
-      {
-        defaultEmail = user.getEmail();
-      }
-    }
-    //
-    Fieldset mascotSearchUserDataInputFS = new Fieldset();
-    mascotSearchUserDataInputFS.setTitle(
-      "MascotSearchUserDataInput");
-    form.addFieldset(mascotSearchUserDataInputFS);
-    //
-    TextField<String> nameF = new TextField<String>(
-      SearchMascot.VMASCOT_SEARCH_USER_NAME);
-    nameF.setValue(defaultName);
-    nameF.setLabel("Name");
-    mascotSearchUserDataInputFS.add(nameF);
-    //
-    TextField<String> emailF = new TextField<String>(
-      SearchMascot.VMASCOT_SEARCH_USER_EMAIL);
-    emailF.setValue(defaultEmail);
-    emailF.setLabel("email");
-    mascotSearchUserDataInputFS.add(emailF);
-    //
-    return form;
-  }