Changeset 3816

Timestamp:

Sep 6, 2010, 10:57:24 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed method getGelExternalIdField from FormFactory.

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/hit/CreateProteinAssemblyJob.java (modified) (2 diffs)
• action/hit/ImportHits.java (modified) (2 diffs)
• action/hit/ImportHitsStep2.java (modified) (2 diffs)
• action/hit/ImportHitsWizardStep1a.java (modified) (2 diffs)
• action/hit/ImportHitsWizardStep1b.java (modified) (2 diffs)
• action/hit/SelectPrideProtocolFileStep1a.java (modified) (5 diffs)
• gui/form/ExternalGelIdField.java (added)
• gui/form/FormFactory.java (modified) (4 diffs)

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

@@ -41 +41 @@
 import org.proteios.core.Project;
 import org.proteios.core.StringParameterType;
-import org.proteios.gui.form.FormFactory;
+import org.proteios.gui.form.*;
 
 import se.lu.thep.waf.ActionException;
@@ -87 +87 @@
     Project project = isProjectActive(dc);
     ItemFactory factory = getItemFactory(dc);
-    String gelId = getString(FormFactory.VREQUIRED_GELEXTERNALID);
+    String gelId = getString(ExternalGelIdField.VPARAM_REQUIRED);
     String localSampleId = getString(FormFactory.VLOCALSAMPLEIDSELECTED);
     log.debug("gelId:" + gelId);

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

@@ -39 +39 @@
 import org.proteios.core.Project;
 import org.proteios.core.StringParameterType;
-import org.proteios.gui.form.FormFactory;
+import org.proteios.gui.form.*;
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
@@ -64 +64 @@
     DbControl dc = newDbControl();
     Project project = isProjectActive(dc);
-    String gelId = getSessionAttribute(FormFactory.VGELEXTERNALID);
+    String gelId = getSessionAttribute(ExternalGelIdField.VPARAM);
     String plateId = getSessionAttribute(FormFactory.VPLATEEXTERNALID);
     Integer pluginDefId = getSessionAttribute(FormFactory.VPLUGINDEFID);
-    List<Integer> fileIds = getValidIntegerList(FormFactory.VID);
+    List<Integer> fileIds = getValidIntegerList(ItemIdField.VPARAM);
     ItemFactory factory = new ItemFactory(dc);
     /***********************************************************************

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

@@ -32 +32 @@
 import org.proteios.core.DbControl;
 import org.proteios.core.Project;
-import org.proteios.gui.form.Form;
-import org.proteios.gui.form.FormFactory;
+import org.proteios.gui.form.*;
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
@@ -59 +58 @@
     Form impForm = getFormFactory().getImportHitsForm(project);
     verifyParameters(impForm);
-    saveToSession(FormFactory.VGELEXTERNALID);
+    saveToSession(ExternalGelIdField.VPARAM);
     saveToSession(FormFactory.VPLATEEXTERNALID);
-    saveToSession(FormFactory.VFWDACTION);
+    saveToSession(ForwardField.VPARAM);
     saveToSession(FormFactory.VPLUGINDEFID);
     setForwardTo(SelectFile.class);

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

@@ -32 +32 @@
 import org.proteios.core.DbControl;
 import org.proteios.core.Project;
-import org.proteios.gui.form.Form;
-import org.proteios.gui.form.FormFactory;
+import org.proteios.gui.form.*;
 
 import se.lu.thep.waf.ActionException;
@@ -60 +59 @@
     Form impForm = getFormFactory().getImportHitsWizardStep1Form(project);
     verifyParameters(impForm);
-    saveToSession(FormFactory.VGELEXTERNALID);
-    saveToSession(FormFactory.VFWDACTION);
+    saveToSession(ExternalGelIdField.VPARAM);
+    saveToSession(ForwardField.VPARAM);
     saveToSession(FormFactory.VPLUGINDEFID);
     setSessionAttribute(ViewActiveDirectory.VDIRID, project

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

@@ -39 +39 @@
 import org.proteios.core.Project;
 import org.proteios.core.StringParameterType;
-import org.proteios.gui.form.FormFactory;
+import org.proteios.gui.form.*;
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
@@ -64 +64 @@
     DbControl dc = newDbControl();
     Project project = isProjectActive(dc);
-    String gelId = getSessionAttribute(FormFactory.VGELEXTERNALID);
+    String gelId = getSessionAttribute(ExternalGelIdField.VPARAM);
     Integer pluginDefId = getSessionAttribute(FormFactory.VPLUGINDEFID);
-    List<Integer> fileIds = getValidIntegerList(FormFactory.VID);
+    List<Integer> fileIds = getValidIntegerList(ItemIdField.VPARAM);
   if(fileIds == null || fileIds.isEmpty())
   {

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

@@ -35 +35 @@
 import org.proteios.core.Project;
 import org.proteios.core.User;
-import org.proteios.gui.form.Form;
-import org.proteios.gui.form.FormFactory;
+import org.proteios.gui.form.*;
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
@@ -70 +69 @@
       activeProject, null);
     verifyParameters(form);
-    String gelId = getString(FormFactory.VREQUIRED_GELEXTERNALID);
+    String gelId = getString(ExternalGelIdField.VPARAM_REQUIRED);
     log.debug("gelId = " + gelId);
     String localSampleId = getString(FormFactory.VLOCALSAMPLEIDSELECTED);
@@ -89 +88 @@
     // Save parameter values as session attributes
     setSessionAttribute(CreatePrideExportJob.VEXPERIMENTTITLE, experimentTitle);
-    setSessionAttribute(FormFactory.VREQUIRED_GELEXTERNALID, gelId);
+    setSessionAttribute(ExternalGelIdField.VPARAM_REQUIRED, gelId);
     setSessionAttribute(FormFactory.VLOCALSAMPLEIDSELECTED, localSampleId);
     setSessionAttribute(CreatePrideExportJob.VCUTOFFSTRING, fdrCutoffStr);
@@ -100 +99 @@
     setSessionAttribute(CreatePrideExportJob.VCONTACTINST, getString(CreatePrideExportJob.VCONTACTINST));   
     // Get original forward action
-    String forward2Id = getValidString(FormFactory.VFWDACTION);
+    String forward2Id = getValidString(ForwardField.VPARAM);
     String forwardId = getActionFactory().getId(SelectPrideProtocolFileStep1b.class);
     log.debug("forward2Id = " + forward2Id);
@@ -128 +127 @@
     setSessionAttribute(FormFactory.VFILESELECTIONNEXTBUTTONNAME, "NextCreateExportJobs");
     setSessionAttribute(FormFactory.VFWD2ACTION, forward2Id);
-    setSessionAttribute(FormFactory.VFWDACTION, forwardId);
+    setSessionAttribute(ForwardField.VPARAM, forwardId);
     setForwardTo(ViewActiveDirectory.class);
   }

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

@@ -246 +246 @@
   public static final VString VWELLPOSITION = new VString("wellPosition", 0,
     8, false);
-  public static final VString VGELEXTERNALID = new VString("gelExtId", 0, 32,
-    false);
-  public static final VString VREQUIRED_GELEXTERNALID = new VString(
-    "gelExtId", 0, 32, true);
   public static final VString VREQUIRED_LOCALSAMPLEID = new VString(
     "localSampleId", 0, 32, true);
@@ -2424 +2420 @@
       properties.add(forwardF);
       //
-      properties.add(getGelExternalIdField(false));
+      properties.add(new ExternalGelIdField(false));
       //
       properties.add(getPlateExternalIdField());
@@ -2482 +2478 @@
       properties.add(forwardF);
       // Gel id (optional)
-      properties.add(getGelExternalIdField(false));
+      properties.add(new ExternalGelIdField(false));
     }
     return form;
@@ -3502 +3498 @@
     plateIdF.setLabel("PlateExternalId");
     return plateIdF;
-  }
-
-
-  private TextField<String> getGelExternalIdField(boolean isRequired)
-  {
-    TextField<String> field;
-    if (isRequired)
-      field = new TextField<String>(VREQUIRED_GELEXTERNALID);
-    else
-      field = new TextField<String>(VGELEXTERNALID);
-    field.setLabel("GelExternalId");
-    return field;
   }