Minor code cleanup

Author: bbimber

SequenceAnalysis/src/org/labkey/sequenceanalysis/analysis/UpdateReadsetFilesHandler.java

@@ -131,18 +131,18 @@ private SAMFileHeader getAndValidateHeaderForBam(SequenceOutputFile so, String n
                 Set<String> distinctLibraries = rgs.stream().map(SAMReadGroupRecord::getLibrary).collect(Collectors.toSet());
                 if (distinctLibraries.size() > 1)
                 {
-                    throw new PipelineJobException("File has more than one library in read group(s), found: " + distinctLibraries.stream().collect(Collectors.joining(", ")));
+                    throw new PipelineJobException("File has more than one library in read group(s), found: " + String.join(", ", distinctLibraries));
                 }
 
                 Set<String> distinctSamples = rgs.stream().map(SAMReadGroupRecord::getSample).collect(Collectors.toSet());
                 if (distinctSamples.size() > 1)
                 {
-                    throw new PipelineJobException("File has more than one sample in read group(s), found: " + distinctSamples.stream().collect(Collectors.joining(", ")));
+                    throw new PipelineJobException("File has more than one sample in read group(s), found: " + String.join(", ", distinctSamples));
                 }
 
                 if (
-                        distinctLibraries.stream().filter(x -> !x.equals(newRsName)).count() == 0L &&
-                        distinctSamples.stream().filter(x -> !x.equals(newRsName)).count() == 0L
+                        distinctLibraries.stream().allMatch(x -> x.equals(newRsName)) &&
+                        distinctSamples.stream().allMatch(x -> x.equals(newRsName))
                 )
                 {
                     throw new PipelineJobException("Sample and library names match in read group(s), aborting");

SequenceAnalysis/src/org/labkey/sequenceanalysis/pipeline/CacheGenomePipelineJob.java

@@ -146,7 +146,7 @@ public List<String> getProtocolActionNames()
             }
 
             @Override
-            public PipelineJob.Task createTask(PipelineJob job)
+            public PipelineJob.Task<?> createTask(PipelineJob job)
             {
                 return new CacheGenomesTask(this, job);
             }

singlecell/resources/web/singlecell/panel/PoolImportPanel.js

@@ -299,7 +299,7 @@ Ext4.define('SingleCell.panel.PoolImportPanel', {
         },
 
         hto: function(val, panel){
-            if (val === 'N/A' || val === 'NA') {
+            if (val === 'N/A' || val === 'NA' || val === 'N') {
                 return null;
             }