Changeset 3869

Timestamp:

Sep 24, 2010, 7:51:17 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed method getNewXtandemParameterSetStorageForm from FormFactory.

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/xTandemInput/AddXTandemParameterSetStorage.java (modified) (1 diff)
• action/xTandemInput/NewXTandemParameterSetStorage.java (modified) (2 diffs)
• action/xTandemInput/SelectXTandemParameterFileStep1a.java (modified) (1 diff)
• gui/form/FormFactory.java (modified) (1 diff)
• gui/form/XTandemStorageForm.java (added)

trunk/client/servlet/src/org/proteios/action/xTandemInput/AddXTandemParameterSetStorage.java

@@ -62 +62 @@
      * Verify parameters
      */
-    Form form = getFormFactory().getNewXTandemParameterSetStorageForm(null);
+    Form form = new XTandemStorageForm();
     verifyParameters(form);
     // Get values

trunk/client/servlet/src/org/proteios/action/xTandemInput/NewXTandemParameterSetStorage.java

@@ -80 +80 @@
       forwardTo = forward2Id;
     }
-    log.debug("name = \"" + name + "\"");
-    log.debug("description = \"" + description + "\"");
-    log.debug("spectrumFileId = " + spectrumFileId);
-    log.debug("parameterTemplateFileId = " + parameterTemplateFileId);
-    log.debug("forward2Id = " + forward2Id);
-    log.debug("forwardTo = \"" + forwardTo + "\"");
+
     //Create XTandemParameterSetStorage item as place holder for XTandemParameterSetStorage values
     DbControl dc = newDbControl();
-    ItemFactory factory = getItemFactory();
-    factory.setDc(dc);
+    ItemFactory factory = getItemFactory(dc);
     XTandemParameterSetStorage xTandemParameterSetStorage = factory.create(XTandemParameterSetStorage.class);
     // XTandemParameterSetStorage name
@@ -113 +107 @@
      * XTandemParameterSetStorage form
      */
-    Form form = getFormFactory().getNewXTandemParameterSetStorageForm(xTandemParameterSetStorage);
+    Form form = new XTandemStorageForm(xTandemParameterSetStorage);
     // Toolbar
     Toolbar tb = new Toolbar();

trunk/client/servlet/src/org/proteios/action/xTandemInput/SelectXTandemParameterFileStep1a.java

@@ -54 +54 @@
      * Verify parameters
      */
-    Form form = getFormFactory().getNewXTandemParameterSetStorageForm(null);
+    Form form = new XTandemStorageForm();
     verifyParameters(form);
     String name = getString(NameField.VPARAM);

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

@@ -2290 +2290 @@
 
 
-  /**
-   * Form for new XTandemParameterSetStorage item. The difference between
-   * calling getNewXTandemParameterSetStorageForm(xTandemParameterSetStorage)
-   * and getForm(XTandemParameterSetStorage.class, xTandemParameterSetStorage)
-   * when xTandemParameterSetStorage != null, is that
-   * getForm(XTandemParameterSetStorage.class, xTandemParameterSetStorage)
-   * assumes that the xTandemParameterSetStorage argument is stored in the
-   * database, i.e. that xTandemParameterSetStorage.getId() is a valid item
-   * id, that can be used as value for a newIdField(), without an exception
-   * being thrown. Method getNewXTandemParameterSetStorageForm() on the other
-   * hand only uses the xTandemParameterSetStorage argument as a convenient
-   * place holder for default values for the XTandemParameterSetStorage form
-   * fields.
-   * 
-   * @param xTandemParameterSetStorage XTandemParameterSetStorage object (need
-   *        not be stored in database) with default field values.
-   * @return Form A form for setting XTandemParameterSetStorage values.
-   */
-  public Form getNewXTandemParameterSetStorageForm(
-      XTandemParameterSetStorage xTandemParameterSetStorage)
-  {
-    Form form = new Form("NewXTandemParameterSetStorage");
-    form.setTitle("NewXTandemParameterSetStorage");
-    Fieldset fs = new Fieldset();
-    fs.setTitle("NewXTandemParameterSetStorage");
-    // XTandemParameterSetStorage Name
-    TextField<String> nameF = new NameField();
-    fs.add(nameF);
-    nameF.setValue("X!Tandem parameter set storage");
-    if (xTandemParameterSetStorage != null)
-    {
-      nameF.setValue(xTandemParameterSetStorage.getName());
-    }
-    // XTandemParameterSetStorage Description
-    TextArea descF = new DescriptionField();
-    fs.add(descF);
-    descF.setValue("X!Tandem parameter set storage");
-    if (xTandemParameterSetStorage != null)
-    {
-      descF.setValue(xTandemParameterSetStorage.getDescription());
-    }
-    // XTandem Parameters Template File
-    TextField<String> parameterFileF = new FileNameField();
-    fs.add(parameterFileF);
-    parameterFileF.setLabel("XTandemParameterTemplateFile");
-    parameterFileF.setValue(getLocale().get("NotSpecifiedDefaultUsed"));
-    if (xTandemParameterSetStorage != null)
-    {
-      if (xTandemParameterSetStorage.getParameterFile() != null)
-      {
-        parameterFileF.setValue(xTandemParameterSetStorage
-          .getParameterFile().getPath().toString());
-      }
-    }
-    parameterFileF.setDisabled(true);
-    // XTandem Parameters Template File id
-    TextField<Integer> parameterFileIdF = new TextField<Integer>(AddXTandemParameterSetStorage.VXTANDEMPARAMETERTEMPLATEFILEID);
-    fs.add(parameterFileIdF);
-    parameterFileIdF.setHidden(true);
-    parameterFileIdF.setLabel("XTandemParameterTemplateFileId");
-    parameterFileIdF.setValue(0);
-    if (xTandemParameterSetStorage != null)
-    {
-      if (xTandemParameterSetStorage.getParameterFile() != null)
-      {
-        parameterFileIdF.setValue(xTandemParameterSetStorage
-          .getParameterFile().getId());
-      }
-    }
-    // Hidden text field for forward action id after file selection
-    TextField<String> forwardF = new ForwardField();
-    forwardF.setValue(NewXTandemParameterSetStorage.class.getName());
-    fs.add(forwardF);
-    //
-    form.addFieldset(fs);
-    return form;
-  }
-
-
+  
   /**
    * Form for saving an XTandemParameterSetStorage item under a new name. This