Changeset 4098

Timestamp:

Jan 21, 2011, 3:55:29 PM (12 years ago)

Author:

olle

Message:

Refs #730. Refs #535. Class/file action/hit/CreateHitsComparisonReportJob.java in client/servlet/ updated to check that at least one gel id or local sample id is selected for each hit selection, and otherwise return to the selection page and display an error message:

1. Protected method void runMe() updated to call new private convenience method boolean stringListHasNonTrivialItem(List<String> stringList) to check that at least one gel id or local sample id is selected for each hit selection, and otherwise return to the selection page and display an error message.

2. New private convenience method boolean stringListHasNonTrivialItem(List<String> stringList) added. It returns true if the list is not null, and contains at least one item that is not null or an empty string, otherwise false is returned.

File:

• trunk/client/servlet/src/org/proteios/action/hit/CreateHitsComparisonReportJob.java (modified) (2 diffs)

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

@@ -105 +105 @@
         String comparisonType = getValidString(HitsComparisonReport.VHITSCOMPARISONTYPE);
         
+        // Check that at least one gel external id or local sample id has been selected
+        log.debug("hitSelection1GelExtIdList = " + hitSelection1GelExtIdList);
+        log.debug("hitSelection1LocalSampleIdList = " + hitSelection1LocalSampleIdList);
+        log.debug("hitSelection2GelExtIdList = " + hitSelection2GelExtIdList);
+        log.debug("hitSelection2LocalSampleIdList = " + hitSelection2LocalSampleIdList);
+        boolean hitSelection1GelSelected = stringListHasNonTrivialItem(hitSelection1GelExtIdList);
+        boolean hitSelection1LocalSampleIdSelected = stringListHasNonTrivialItem(hitSelection1LocalSampleIdList);
+        boolean hitSelection2GelSelected = stringListHasNonTrivialItem(hitSelection2GelExtIdList);
+        boolean hitSelection2LocalSampleIdSelected = stringListHasNonTrivialItem(hitSelection2LocalSampleIdList);
+        log.debug("hitSelection1GelSelected = " + hitSelection1GelSelected);
+        log.debug("hitSelection1LocalSampleIdSelected = " + hitSelection1LocalSampleIdSelected);
+        log.debug("hitSelection2GelSelected = " + hitSelection2GelSelected);
+        log.debug("hitSelection2LocalSampleIdSelected = " + hitSelection2LocalSampleIdSelected);
+        if ((!hitSelection1GelSelected && !hitSelection1LocalSampleIdSelected) ||
+          (!hitSelection2GelSelected && !hitSelection2LocalSampleIdSelected))
+        {
+          setError("Select at least one gel id or local sample id for each hit selection");
+          return;
+        }
         //
         Boolean ignoreFdrCutoff = getValidBoolean(HitsComparisonReport.VIGNORECOMBINEDFDRUPPERCUTOFF);
@@ -346 +365 @@
     }
     
+
+    /**
+     * Checks if a string list has any item that
+     * is not null or an empty string.
+     * 
+     * @param stringList List<String> The string list to check.
+     * @return boolean Returns true if any non-trivial item is found, else false.
+     */
+    private boolean stringListHasNonTrivialItem(List<String> stringList)
+    {
+      boolean hasNonTrivialItem = false;
+      if (stringList != null)
+      {
+        for (String item: stringList)
+        {
+          if (item != null && !item.equals(""))
+          {
+            hasNonTrivialItem = true;
+            break;
+          }
+        }
+      }
+      return hasNonTrivialItem;
+    }
+
+
     /**
         * Fetch localizer key string list.