Changeset 3817

Timestamp:

Sep 6, 2010, 11:19:39 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removing sequential hits import actions as they are not used. Also removed selectPlateId method from FormFactory.

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/gel/NewGel.java (modified) (2 diffs)
• action/gel/ViewGelOrNewGel.java (modified) (3 diffs)
• action/hit/CombineHits.java (modified) (1 diff)
• action/hit/CreatePrideExportJob.java (modified) (2 diffs)
• action/hit/ImportHits.java (modified) (1 diff)
• action/hit/ImportHitsStep1.java (deleted)
• action/hit/ImportHitsStep2.java (deleted)
• action/hit/ImportHitsWizardStep2a.java (modified) (2 diffs)
• action/hit/ImportHitsWizardStep2b.java (modified) (2 diffs)
• action/hit/SequentialImport.java (deleted)
• gui/form/ExternalPlateIdField.java (added)
• gui/form/FormFactory.java (modified) (5 diffs)
• gui/form/PlateSelect.java (added)

trunk/client/servlet/src/org/proteios/action/gel/NewGel.java

@@ -33 +33 @@
 import org.proteios.gui.Title;
 import org.proteios.gui.Toolbar;
-import org.proteios.gui.form.Form;
-import org.proteios.gui.form.FormFactory;
+import org.proteios.gui.form.*;
 import org.proteios.gui.layout.RowLayout;
 import se.lu.thep.waf.ActionException;
@@ -61 +60 @@
     // Create
     form = getFormFactory().getForm(GelElectrophoresis.class, null);    
-    gelExternalId = getValidString(FormFactory.VGELEXTERNALID);
+    gelExternalId = getValidString(ExternalGelIdField.VPARAM);
     if (gelExternalId != null)
     {

trunk/client/servlet/src/org/proteios/action/gel/ViewGelOrNewGel.java

@@ -34 +34 @@
 import org.proteios.core.ItemFactory;
 import org.proteios.core.ItemQuery;
-import org.proteios.gui.form.FormFactory;
+import org.proteios.gui.form.*;
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
@@ -51 +51 @@
      * Verify parameters
      */
-    verifyParameters(FormFactory.VID);
-    Integer hitId = getValidInteger(FormFactory.VID);
+    verifyParameters(ItemIdField.VPARAM);
+    Integer hitId = getValidInteger(ItemIdField.VPARAM);
     log.debug("hitId = " + hitId);
     /***********************************************************************
@@ -90 +90 @@
     else
     {
-      setAttribute(FormFactory.VGELEXTERNALID, gelExternalId);
+      setAttribute(ExternalGelIdField.VPARAM, gelExternalId);
       setForwardTo(NewGel.class);
     }

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

@@ -80 +80 @@
     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/CreatePrideExportJob.java

@@ -49 +49 @@
 import org.proteios.core.query.Hql;
 import org.proteios.core.query.Restrictions;
-import org.proteios.gui.form.FormFactory;
+import org.proteios.gui.form.*;
 import org.proteios.plugins.PrideExportPlugin;
 
@@ -99 +99 @@
     Project project = isProjectActive(dc);
     ItemFactory factory = getItemFactory(dc);
-    String gelId = getSessionAttribute(FormFactory.VREQUIRED_GELEXTERNALID);
+    String gelId = getSessionAttribute(ExternalGelIdField.VPARAM_REQUIRED);
     log.debug("gelId = " + gelId);
     String localSampleId = getSessionAttribute(FormFactory.VLOCALSAMPLEIDSELECTED);

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

@@ -65 +65 @@
     Project project = isProjectActive(dc);
     String gelId = getSessionAttribute(ExternalGelIdField.VPARAM);
-    String plateId = getSessionAttribute(FormFactory.VPLATEEXTERNALID);
+    String plateId = getSessionAttribute(ExternalPlateIdField.VPARAM);
     Integer pluginDefId = getSessionAttribute(FormFactory.VPLUGINDEFID);
     List<Integer> fileIds = getValidIntegerList(ItemIdField.VPARAM);

trunk/client/servlet/src/org/proteios/action/hit/ImportHitsWizardStep2a.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().getImportHitsWizardStep2Form(project);
     verifyParameters(impForm);
-    saveToSession(FormFactory.VPLATEEXTERNALID);
-    saveToSession(FormFactory.VFWDACTION);
+    saveToSession(ExternalPlateIdField.VPARAM);
+    saveToSession(ForwardField.VPARAM);
     saveToSession(FormFactory.VPLUGINDEFID);
     setSessionAttribute(ViewActiveDirectory.VDIRID, project

trunk/client/servlet/src/org/proteios/action/hit/ImportHitsWizardStep2b.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;
@@ -66 +66 @@
     DbControl dc = newDbControl();
     Project project = isProjectActive(dc);
-    String plateId = getSessionAttribute(FormFactory.VPLATEEXTERNALID);
+    String plateId = getSessionAttribute(ExternalPlateIdField.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/gui/form/FormFactory.java

@@ -242 +242 @@
   public static final VString VROLEPERMISSIONID = new VString("rolePermId",
     1, 64, true);
-  public static final VString VPLATEEXTERNALID = new VString("plateExtId", 0,
-    32, false);
   public static final VString VWELLPOSITION = new VString("wellPosition", 0,
     8, false);
@@ -2422 +2420 @@
       properties.add(new ExternalGelIdField(false));
       //
-      properties.add(getPlateExternalIdField());
+      properties.add(new ExternalPlateIdField());
       // Selector of plugins
       properties.add(new PluginSelect(dc, Plugin.MainType.IMPORT,
@@ -2527 +2525 @@
       properties.add(forwardF);
       // Plate id selector
-      Select<VString> plateIdS = selectPlateId(dc, project);
+      Select<VString> plateIdS = new PlateSelect(dc, project);
       properties.add(plateIdS);
     }
@@ -2710 +2708 @@
 
 
-  @SuppressWarnings("unused")
-  private Select<VString> selectPlateId(DbControl dc, Project project)
-  {
-    Select<VString> select = new Select<VString>(VPLATEEXTERNALID);
-    select.setLabel("PlateExternalId");
-    if (dc != null && dc.isConnected())
-    {
-      List<String> plateIdList = Hit.getUniquePlateIds(project, dc);
-      /*
-       * Add select options for unique plate ids
-       */
-      for (int i = 0; i < plateIdList.size(); i++)
-      {
-        // Get plate id
-        String plateId = plateIdList.get(i);
-        if (plateId != null)
-        {
-          // Add option for plate id
-          Option o = new Option("" + plateId);
-          o.setContent(plateId);
-          select.addOption(o);
-        }
-      }
-    }
-    /*
-     * Add dummy option with message if no real options available.
-     */
-    if (select.getOptions().size() == 0)
-    {
-      Option noPlateId = new Option("0");
-      noPlateId.setContent("No plate id available");
-      select.addOption(noPlateId);
-    }
-    return select;
-  }
-
-
   private Select<VString> selectMultiSelectionExternalGelId(DbControl dc,
       Project project, VString vStringParam)
@@ -3492 +3453 @@
   }
 
-
-  private TextField<String> getPlateExternalIdField()
-  {
-    TextField<String> plateIdF = new TextField<String>(VPLATEEXTERNALID);
-    plateIdF.setLabel("PlateExternalId");
-    return plateIdF;
-  }