Skip to content

Commit 4c56e4d

Browse files
committed
Missed with prior commit
1 parent edd587a commit 4c56e4d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

singlecell/src/org/labkey/singlecell/analysis/AbstractSingleCellHandler.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public boolean doRunLocal()
139139
public Collection<String> getAllowableActionNames()
140140
{
141141
Set<String> allowableNames = new HashSet<>();
142-
for (PipelineStepProvider provider: SequencePipelineService.get().getProviders(SingleCellStep.class))
142+
for (PipelineStepProvider<?> provider: SequencePipelineService.get().getProviders(SingleCellStep.class))
143143
{
144144
allowableNames.add(provider.getLabel());
145145
}
@@ -604,7 +604,7 @@ else if (step.createsSeuratObjects())
604604
File finalHtml = new File(ctx.getOutputDir(), "finalHtml.html");
605605
List<String> lines = new ArrayList<>();
606606
lines.add("rmarkdown::render(output_file = '" + finalHtml.getName() + "', input = '" + finalMarkdownFile.getName() + "', intermediates_dir = '" + ctx.getWorkingDirectory() + "')");
607-
AbstractSingleCellPipelineStep.executeR(ctx, AbstractCellMembraneStep.CONTAINER_NAME, "pandoc", lines, null, null);
607+
AbstractSingleCellPipelineStep.executeR(ctx, AbstractCellMembraneStep.CONTAINER_NAME, "pandoc", lines, null, null, null);
608608
_resumer.getFileManager().addIntermediateFile(finalMarkdownFile);
609609
_resumer.getFileManager().addIntermediateFiles(_resumer.getMarkdownsInOrder());
610610
_resumer.getFileManager().addIntermediateFiles(_resumer.getHtmlFilesInOrder());
@@ -630,7 +630,7 @@ else if (step.createsSeuratObjects())
630630
Integer id = NumberUtils.createInteger(output.getDatasetId());
631631
if (!inputMap.containsKey(id))
632632
{
633-
ctx.getLogger().warn("No input found matching dataset Id: " + output.getDatasetId());
633+
ctx.getLogger().warn("No input found matching dataset Id: {}", output.getDatasetId());
634634
}
635635
else
636636
{
@@ -641,7 +641,7 @@ else if (step.createsSeuratObjects())
641641
}
642642
catch (NumberFormatException e)
643643
{
644-
ctx.getLogger().error("Expected dataset ID to be an integer: " + output.getDatasetId());
644+
ctx.getLogger().error("Expected dataset ID to be an integer: {}", output.getDatasetId());
645645
}
646646
}
647647
else

0 commit comments

Comments
 (0)