Changeset 3840

Timestamp:

Sep 9, 2010, 3:16:45 PM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed getImportHitsWizardStep2Form method from FormFactory

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/hit/ImportHitsWizard.java (modified) (1 diff)
• action/hit/ImportHitsWizardStep2a.java (modified) (1 diff)
• gui/form/FormFactory.java (modified) (1 diff)
• gui/form/ImportHitsWizardStep2Form.java (added)

trunk/client/servlet/src/org/proteios/action/hit/ImportHitsWizard.java

@@ -99 +99 @@
     toolbar = new Toolbar();
 
-    step2 = getFormFactory().getImportHitsWizardStep2Form(project);
+    step2 = new ImportHitsWizardStep2Form(project, getActionFactory().getId(ImportHitsWizardStep2b.class));
     step2.setToolbar(toolbar);
 

trunk/client/servlet/src/org/proteios/action/hit/ImportHitsWizardStep2a.java

@@ -57 +57 @@
     DbControl dc = newDbControl();
     Project project = isProjectActive(dc);
-    Form impForm = getFormFactory().getImportHitsWizardStep2Form(project);
+    Form impForm = new ImportHitsWizardStep2Form(project, getActionFactory().getId(ImportHitsWizardStep2b.class));
     verifyParameters(impForm);
     saveToSession(ExternalPlateIdField.VPARAM);

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

@@ -2153 +2153 @@
 
  // Cleaning up from here
-
-  public Form getImportHitsWizardStep2Form(Project project)
-  {
-    DbControl dc = project.getDbControl();
-    Form form = new Form("importHitsWizardStep2Form");
-    if (dc != null && dc.isConnected())
-    {
-      // Properties fieldset
-      Fieldset properties = new Fieldset();
-      properties.getLegendTitle().setTitle(
-        "ImportHitsWizardStep2FormLegend");
-      form.addFieldset(properties);
-      /*
-       * This hidden text field sets title to be used for file selection
-       * form.
-       */
-      TextField<String> titleF = new TitleField();
-      titleF.setValue("Step 2a. Select PeakList File[s]");
-      properties.add(titleF);
-      /*
-       * This hidden text field sets name to be used for the "Next" button
-       * in the file selection form.
-       */
-      TextField<String> buttonNameF = new NextButtonNameField();
-      buttonNameF.setValue("Import");
-      properties.add(buttonNameF);
-      /*
-       * Hidden text field for storing plugin id to use.
-       */
-      TextField<Integer> pluginIdF = new PluginIdField();
-      PluginDefinition pluginDef = PluginDefinition.getByClassName(
-        project.getDbControl(),
-        "org.proteios.plugins.PeakListToHitPlugin");
-      pluginIdF.setValue(pluginDef.getId());
-      properties.add(pluginIdF);
-      /*
-       * This hidden forward field sets action id used by the file
-       * selection action called by ImportHitsWizardStep1a.
-       */
-      TextField<String> forwardF = new ForwardField();
-      forwardF
-        .setValue(actionFactory.getId(ImportHitsWizardStep2b.class));
-      properties.add(forwardF);
-      // Plate id selector
-      Select<VString> plateIdS = new PlateSelect(dc, project);
-      properties.add(plateIdS);
-    }
-    return form;
-  }
-
 
   public Form getImportHitsWizardStep3Form(Project project)