Changeset 3845

Timestamp:

Sep 14, 2010, 8:06:04 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed method VLOCALSAMPLEID from FormFactory

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/hit/ImportHitsNonGelWizard.java (modified) (4 diffs)
• action/hit/ImportHitsNonGelWizardStep1a.java (modified) (2 diffs)
• action/hit/ImportHitsNonGelWizardStep1b.java (modified) (1 diff)
• gui/form/FormFactory.java (modified) (3 diffs)
• gui/form/ImportHitsNonGelWizardStep1Form.java (added)
• gui/form/SampleIdField.java (added)
• gui/form/UseRegexCheckbox.java (added)

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

@@ -28 +28 @@
 package org.proteios.action.hit;
 
+
 import org.proteios.ActionLink;
 import org.proteios.Context;
@@ -38 +39 @@
 import org.proteios.gui.Title;
 import org.proteios.gui.Toolbar;
-import org.proteios.gui.form.Form;
 import org.proteios.gui.layout.RowLayout;
 import se.lu.thep.waf.ActionException;
@@ -44 +44 @@
 import java.util.ArrayList;
 import java.util.List;
+import org.proteios.gui.form.*;
 
 /**
@@ -65 +66 @@
      * Step 1 Form
      */
-    Form formStep1 = getFormFactory().getImportHitsNonGelWizardStep1Form(project);
+    Form formStep1 = new ImportHitsNonGelWizardStep1Form(project);
     // Toolbar
     Toolbar tb1 = new Toolbar();

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

@@ -56 +56 @@
     DbControl dc = newDbControl();
     Project project = isProjectActive(dc);
-    Form impForm = getFormFactory().getImportHitsNonGelWizardStep1Form(project);
+    Form impForm = new ImportHitsNonGelWizardStep1Form(project);
     // Check input for local sample id
     verifyParameters(impForm);
-    String enteredLocalSampleId = getString(FormFactory.VLOCALSAMPLEID);
+    String enteredLocalSampleId = getString(SampleIdField.VPARAM);
     String selectedLocalSampleId = getString(LocalSampleSelect.VPARAM);
     Boolean useRegexPattern = getValidBoolean(ImportHitsNonGelWizardStep1b.VUSEREGEXPATTERN);
@@ -80 +80 @@
       {
         // User selected a local sample id, use it
-        setAttribute(FormFactory.VLOCALSAMPLEID, selectedLocalSampleId);
+        setAttribute(SampleIdField.VPARAM, selectedLocalSampleId);
       }
     }
-    saveToSession(FormFactory.VLOCALSAMPLEID);
+    saveToSession(SampleIdField.VPARAM);
     setSessionAttribute(ImportHitsNonGelWizardStep1b.VUSEREGEXPATTERN, useRegexPattern);
     saveToSession(RegexField.VPARAM);

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

@@ -69 +69 @@
     DbControl dc = newDbControl();
     Project project = isProjectActive(dc);
-    String localSampleId = getSessionAttribute(FormFactory.VLOCALSAMPLEID);
+    String localSampleId = getSessionAttribute(SampleIdField.VPARAM);
     Integer pluginDefId = getSessionAttribute(PluginIdField.VPARAM);
     List<Integer> fileIds = getValidIntegerList(ItemIdField.VPARAM);

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

@@ -105 +105 @@
   public static final VString VROLEPERMISSIONID = new VString("rolePermId",1, 64, true);
   public static final VString VWELLPOSITION = new VString("wellPosition", 0,8, false);
-  public static final VString VREQUIRED_LOCALSAMPLEID = new VString("localSampleId", 0, 32, true);
-  public static final VString VLOCALSAMPLEID = new VString("localSampleId",0, 32, false);
   public static final VInteger VDIRID = new VInteger("dirId", 1, true);
   public static final VInteger VSPOTID = new VInteger("spotId", 0, false);
@@ -2154 +2152 @@
  // Cleaning up from here
 
-  public Form getImportHitsNonGelWizardStep1Form(Project project)
-  {
-    DbControl dc = project.getDbControl();
-    Form form = new Form("importHitsNonGelWizardStep1Form");
-    if (dc != null && dc.isConnected())
-    {
-      // Properties fieldset
-      Fieldset properties = new Fieldset("ImportHitsNonGelWizardStep1FormLegend");
-      form.addFieldset(properties);
-      /*
-       * Hidden text field for storing plugin id to use.
-       */
-      TextField<Integer> pluginIdF = new PluginIdField();
-      PluginDefinition pluginDef = PluginDefinition.getByClassName(
-        dc,
-        "org.proteios.plugins.PeakListToHitNonGelPlugin");
-      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("Step 1a. 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);
-      /*
-       * This hidden forward field sets action id used by the file
-       * selection action called by ImportHitsNonGelWizardStep1a.
-       */
-      TextField<String> forwardF = new ForwardField();
-      forwardF.setValue(actionFactory
-        .getId(ImportHitsNonGelWizardStep1b.class));
-      properties.add(forwardF);
-      // Local sample id select box
-      Select<VString> localSampleIdS = new LocalSampleSelect(Hit.getUniqueLocalSampleIds(project, dc));
-      localSampleIdS.setLabel("SelectLocalSampleId");
-      properties.add(localSampleIdS);
-      // Local sample id entry field
-      TextField<String> newLocalSampleIdF = getLocalSampleIdField(false);
-      newLocalSampleIdF.setLabel("EnterNewLocalSampleId");
-      properties.add(newLocalSampleIdF);
-      // Use regex fraction id parse pattern check box
-      Checkbox<VBoolean> useRegexPatternCB = new Checkbox<VBoolean>(
-        ImportHitsNonGelWizardStep1b.VUSEREGEXPATTERN);
-      useRegexPatternCB.setLabel("ImportHitsNonGelWizardUseRegexPattern");
-      useRegexPatternCB.setValue("true");
-      useRegexPatternCB.isChecked(false);
-      properties.add(useRegexPatternCB);
-      // Optional regex pattern entry field
-      TextField<String> regexPatternF = new RegexField();
-      regexPatternF.setLabel("ImportHitsNonGelWizardRegexPattern");
-      regexPatternF.setValue(".+\\_(.+)\\..+");
-      properties.add(regexPatternF);
-    }
-    return form;
-  }
-
-
+  
   public Form getImportHitsNonGelWizardStep2Form(Project project)
   {
@@ -2951 +2886 @@
 
 
-
-  private TextField<String> getLocalSampleIdField(boolean isRequired)
-  {
-    TextField<String> field;
-    if (isRequired)
-      field = new TextField<String>(VREQUIRED_LOCALSAMPLEID);
-    else
-      field = new TextField<String>(VLOCALSAMPLEID);
-    field.setLabel("LocalSampleId");
-    return field;
-  }