Changeset 3843

Timestamp:

Sep 10, 2010, 2:33:11 PM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed method selectLocalSampleId method from FormFactory

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/hit/ExclusionList.java (modified) (1 diff)
• gui/form/FormFactory.java (modified) (7 diffs)

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

@@ -87 +87 @@
       // properties.add(forwardF);
       //
-      properties.add(getFormFactory().selectLocalSampleId(dc, project));
+      properties.add(new LocalSampleSelect(Hit.getUniqueLocalSampleIds(project, dc)));
       TextField<String> nameF = new TextField<String>(
         FileNameField.VPARAM);

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

@@ -2142 +2142 @@
       //
       properties.add(new ExternalGelIdSelect(dc, project));
-      properties.add(selectLocalSampleId(dc, project));
+      properties.add(
+new LocalSampleSelect(Hit.getUniqueLocalSampleIds(project, dc))
+);
       TextField<String> nameF = new FileNameField();
       nameF.setValue("ProteinReport.tsv");
@@ -2160 +2162 @@
     {
       // Properties fieldset
-      Fieldset properties = new Fieldset();
-      properties.setTitle(
-        "ImportHitsNonGelWizardStep1FormLegend");
+      Fieldset properties = new Fieldset("ImportHitsNonGelWizardStep1FormLegend");
       form.addFieldset(properties);
       /*
@@ -2169 +2169 @@
       TextField<Integer> pluginIdF = new PluginIdField();
       PluginDefinition pluginDef = PluginDefinition.getByClassName(
-        project.getDbControl(),
+        dc,
         "org.proteios.plugins.PeakListToHitNonGelPlugin");
       pluginIdF.setValue(pluginDef.getId());
@@ -2195 +2195 @@
       properties.add(forwardF);
       // Local sample id select box
-      Select<VString> localSampleIdS = selectLocalSampleId(dc, project);
+      Select<VString> localSampleIdS = new LocalSampleSelect(Hit.getUniqueLocalSampleIds(project, dc));
       localSampleIdS.setLabel("SelectLocalSampleId");
       properties.add(localSampleIdS);
@@ -2315 +2315 @@
       Project project)
   {
-    Select<VString> select = selectLocalSampleId(dc, project);
+    Select<VString> select = new LocalSampleSelect(Hit.getUniqueLocalSampleIds(project, dc));
     // Will be disabled if no options available
     if (!select.isDisabled())
@@ -2322 +2322 @@
       allSampleIds.setContent("All in project");
       select.addOption(allSampleIds);
-    }
-    return select;
-  }
-
-
-  public Select<VString> selectLocalSampleId(DbControl dc, Project project)
-  {
-    Select<VString> select = new Select<VString>(VLOCALSAMPLEIDSELECTED);
-    select.setLabel("LocalSampleId");
-    if (dc != null && dc.isConnected())
-    {
-      List<String> localSampleIdList = Hit.getUniqueLocalSampleIds(
-        project, dc);
-      log.debug("localSampleIdList = " + localSampleIdList);
-      // Check if valid local sample id values exist
-      boolean validValuesExist = false;
-      if (localSampleIdList != null)
-      {
-        log.debug("localSampleIdList.size() = " + localSampleIdList
-          .size());
-        for (int i = 0; i < localSampleIdList.size(); i++)
-        {
-          log
-            .debug("localSampleIdList.get(" + i + ") = " + localSampleIdList
-              .get(i));
-          // Get local sample id
-          String localSampleId = localSampleIdList.get(i);
-          if (localSampleId != null)
-          {
-            validValuesExist = true;
-            continue;
-          }
-        }
-      }
-      /*
-       * Add dummy option with empty string as value
-       */
-      Option dummyLocalSampleId = new Option("");
-      if (validValuesExist)
-      {
-        dummyLocalSampleId.setContent("None selected");
-      }
-      else
-      {
-        dummyLocalSampleId.setContent("No local sample ID available");
-      }
-      select.addOption(dummyLocalSampleId);
-      /*
-       * Add select options for unique local sample ids
-       */
-      for (int i = 0; i < localSampleIdList.size(); i++)
-      {
-        // Get local sample id
-        String localSampleId = localSampleIdList.get(i);
-        if (localSampleId != null)
-        {
-          // Add option for local sample id
-          Option o = new Option("" + localSampleId);
-          o.setContent(localSampleId);
-          select.addOption(o);
-        }
-      }
-      /*
-       * Disable select box if no valid options
-       */
-      if (!validValuesExist)
-      {
-        select.setDisabled(true);
-      }
     }
     return select;
@@ -2931 +2862 @@
     if (dc != null && dc.isConnected())
     {
-      prideFilterSettingsFS.add(selectLocalSampleId(dc, project));
+      prideFilterSettingsFS.add(
+new LocalSampleSelect(Hit.getUniqueLocalSampleIds(project, dc))
+);
     }
     //