Changeset 3846

Timestamp:

Sep 14, 2010, 8:51:11 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed method getImportHitsNonGelWizardStep2Form from FormFactory

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/hit/ImportHitsNonGelWizard.java (modified) (1 diff)
• action/hit/ImportHitsNonGelWizardStep2a.java (modified) (1 diff)
• gui/form/FormFactory.java (modified) (1 diff)
• gui/form/ForwardField.java (modified) (2 diffs)
• gui/form/ImportHitsNonGelWizardStep2Form.java (added)
• gui/form/NextButtonNameField.java (modified) (1 diff)

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

@@ -76 +76 @@
      * Step 2 Form
      */
-    Form formStep2 = getFormFactory().getImportHitsNonGelWizardStep2Form(project);
+    Form formStep2 = new ImportHitsNonGelWizardStep2Form(project);
     // Toolbar
     Toolbar tb2 = new Toolbar();

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

@@ -56 +56 @@
     DbControl dc = newDbControl();
     Project project = isProjectActive(dc);
-    Form impForm = getFormFactory().getImportHitsNonGelWizardStep2Form(project);
+    Form impForm = new ImportHitsNonGelWizardStep2Form(project);
     verifyParameters(impForm);
     saveToSession(ForwardField.VPARAM);

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

@@ -2152 +2152 @@
  // Cleaning up from here
 
-  
-  public Form getImportHitsNonGelWizardStep2Form(Project project)
-  {
-    DbControl dc = project.getDbControl();
-    Form form = new Form("importHitsNonGelWizardStep2Form");
-    if (dc != null && dc.isConnected())
-    {
-      // Properties fieldset
-      Fieldset properties = new Fieldset();
-      properties.setTitle(
-        "ImportHitsNonGelWizardStep2FormLegend");
-      form.addFieldset(properties);
-      /*
-       * Disabled text field with info.
-       */
-      TextField<String> infoF = new DummyField();
-      infoF.setDisabled(true);
-      infoF.setLabel("SearchResults");
-      properties.add(infoF);
-      /*
-       * Hidden text field for storing plugin id to use.
-       */
-      TextField<Integer> pluginIdF = new PluginIdField();
-      PluginDefinition pluginDef = PluginDefinition.getByClassName(
-        project.getDbControl(),
-        "org.proteios.plugins.SearchResultsImporter");
-      pluginIdF.setValue(pluginDef.getId());
-      properties.add(pluginIdF);
-      /*
-       * This hidden text field sets title to be used for file selection
-       * form.
-       */
-      TextField<String> titleF = new TitleField();
-      titleF.setValue("Step 2a. Select Search Result 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);
-      /*
-       * This hidden forward field sets action id used by the file
-       * selection action called by ImportHitsNonGelWizardStep2a.
-       */
-      TextField<String> forwardF = new ForwardField();
-      forwardF.setValue(actionFactory
-        .getId(ImportHitsNonGelWizardStep2b.class));
-      properties.add(forwardF);
-    }
-    return form;
-  }
-
-
-  private Select<VString> selectMultiSelectionExternalGelId(DbControl dc,
+    private Select<VString> selectMultiSelectionExternalGelId(DbControl dc,
       Project project, VString vStringParam)
   {

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

@@ -30 +30 @@
 import se.lu.thep.waf.constraints.VString;
 
-public final class ForwardField
- extends TextField<String>
+public final class ForwardField extends TextField<String>
 {
   public static final VString VPARAM = new VString("forwardActionId", 1,  255, false);
@@ -40 +39 @@
   setHidden(true);
  }
+
+ public ForwardField(String value)
+ {
+   this();
+  setValue(value);
+ }
 }

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

@@ -42 +42 @@
     setHidden(true);
   }
+
+  public NextButtonNameField(String value)
+  {
+    this();
+    setValue(value);
+  }
+
 }