Changeset 3844

Timestamp:

Sep 13, 2010, 9:00:15 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed method VLOCALSAMPLEIDSELECT from FormFactory

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/hit/CombineHits.java (modified) (1 diff)
• action/hit/CreateExclusionListJob.java (modified) (1 diff)
• action/hit/CreatePrideExportJob.java (modified) (5 diffs)
• action/hit/CreateProteinAssemblyJob.java (modified) (1 diff)
• action/hit/ImportHitsNonGelWizardStep1a.java (modified) (1 diff)
• action/hit/SelectPrideProtocolFileStep1a.java (modified) (2 diffs)
• gui/form/FormFactory.java (modified) (1 diff)

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

@@ -80 +80 @@
     ItemFactory factory = getItemFactory(dc);
     String gelId = getString(ExternalGelIdField.VPARAM_REQUIRED);
-    String localSampleId = getString(FormFactory.VLOCALSAMPLEIDSELECTED);
+    String localSampleId = getString(LocalSampleSelect.VPARAM);
     log.debug("gelId:" + gelId);
     log.debug("localSampleId:" + localSampleId);

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

@@ -76 +76 @@
     Project project = isProjectActive(dc);
     ItemFactory factory = getItemFactory(dc);
-    String localSampleId = getString(FormFactory.VLOCALSAMPLEIDSELECTED);
+    String localSampleId = getString(LocalSampleSelect.VPARAM);
     log.debug("localSampleId:" + localSampleId);
     String filename = getValidString(FileNameField.VPARAM);

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

@@ -28 +28 @@
 package org.proteios.action.hit;
 
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.List;
 import org.proteios.action.ProteiosAction;
 import org.proteios.action.job.ListJobs;
@@ -39 +43 @@
 import org.proteios.core.ItemFactory;
 import org.proteios.core.ItemParameterType;
+import org.proteios.core.ItemQuery;
 import org.proteios.core.ItemResultList;
-import org.proteios.core.ItemQuery;
 import org.proteios.core.Job;
 import org.proteios.core.PluginDefinition;
@@ -51 +55 @@
 import org.proteios.gui.form.*;
 import org.proteios.plugins.PrideExportPlugin;
-
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
@@ -58 +61 @@
 import se.lu.thep.waf.constraints.VInteger;
 import se.lu.thep.waf.constraints.VString;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.List;
 
 /**
@@ -101 +99 @@
     String gelId = getSessionAttribute(ExternalGelIdField.VPARAM_REQUIRED);
     log.debug("gelId = " + gelId);
-    String localSampleId = getSessionAttribute(FormFactory.VLOCALSAMPLEIDSELECTED);
+    String localSampleId = getSessionAttribute(LocalSampleSelect.VPARAM);
     String expTitle = getSessionAttribute(VEXPERIMENTTITLE);
     log.debug("localSampleId = " + localSampleId);

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

@@ -87 +87 @@
     ItemFactory factory = getItemFactory(dc);
     String gelId = getString(ExternalGelIdField.VPARAM_REQUIRED);
-    String localSampleId = getString(FormFactory.VLOCALSAMPLEIDSELECTED);
+    String localSampleId = getString(LocalSampleSelect.VPARAM);
     log.debug("gelId:" + gelId);
     log.debug("localSampleId:" + localSampleId);

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

@@ -60 +60 @@
     verifyParameters(impForm);
     String enteredLocalSampleId = getString(FormFactory.VLOCALSAMPLEID);
-    String selectedLocalSampleId = getString(FormFactory.VLOCALSAMPLEIDSELECTED);
+    String selectedLocalSampleId = getString(LocalSampleSelect.VPARAM);
     Boolean useRegexPattern = getValidBoolean(ImportHitsNonGelWizardStep1b.VUSEREGEXPATTERN);
     String regexPattern = getValidString(RegexField.VPARAM);

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

@@ -71 +71 @@
     String gelId = getString(ExternalGelIdField.VPARAM_REQUIRED);
     log.debug("gelId = " + gelId);
-    String localSampleId = getString(FormFactory.VLOCALSAMPLEIDSELECTED);
+    String localSampleId = getString(LocalSampleSelect.VPARAM);
     String experimentTitle = getString(CreatePrideExportJob.VEXPERIMENTTITLE);
     log.debug("localSampleId = " + localSampleId);
@@ -89 +89 @@
     setSessionAttribute(CreatePrideExportJob.VEXPERIMENTTITLE, experimentTitle);
     setSessionAttribute(ExternalGelIdField.VPARAM_REQUIRED, gelId);
-    setSessionAttribute(FormFactory.VLOCALSAMPLEIDSELECTED, localSampleId);
+    setSessionAttribute(LocalSampleSelect.VPARAM, localSampleId);
     setSessionAttribute(CreatePrideExportJob.VCUTOFFSTRING, fdrCutoffStr);
     setSessionAttribute(FormFactory.VNONREQUIRED_FILENAME, filenamePrefix);

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

@@ -107 +107 @@
   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 VString VLOCALSAMPLEIDSELECTED = new VString("localSampleIdSelected", 0, 32, false);
   public static final VInteger VDIRID = new VInteger("dirId", 1, true);
   public static final VInteger VSPOTID = new VInteger("spotId", 0, false);