From ac7de5b30883d743a9e769e01ae5b4a9f97e9c44 Mon Sep 17 00:00:00 2001 From: Anthony Bargnesi Date: Mon, 24 Nov 2014 11:33:17 -0500 Subject: [PATCH] report error/exit if kam cannot be found --- .../openbel/framework/tools/kamstore/KamManager.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/org.openbel.framework.tools/src/main/java/org/openbel/framework/tools/kamstore/KamManager.java b/org.openbel.framework.tools/src/main/java/org/openbel/framework/tools/kamstore/KamManager.java index 9603fb30..ef9985a7 100644 --- a/org.openbel.framework.tools/src/main/java/org/openbel/framework/tools/kamstore/KamManager.java +++ b/org.openbel.framework.tools/src/main/java/org/openbel/framework/tools/kamstore/KamManager.java @@ -461,7 +461,7 @@ private ExportFormat determineType() { } /** - * If {@link determineType} returns {@code null} then this function may be able to determine + * If {@link #determineType} returns {@code null} then this function may be able to determine * an appropriate type of KAM file from its file extension. * @param file * @return @@ -571,6 +571,10 @@ private void runExportCommand(final String kamName, String outputFilename, setUp(); kam = kAMStore.getKam(kamName); + if (kam == null) { + fatal(format("No KAM named \"%s\" exists in the catalog", kamName)); + } + // establish a default if output path is not set if (outputFilename == null) { outputFilename = @@ -625,6 +629,7 @@ private void runExportCommand(final String kamName, String outputFilename, } } + private static String defaultExtension(final ExportFormat type) { switch (type) { case PORTABLE_KAM: @@ -650,6 +655,9 @@ private void runSummarizeCommand(final String kamName, if (kamName != null) { // Look up the requested KAM and summarize. kam = kAMStore.getKam(kamName); + if (kam == null) { + fatal(format("No KAM named \"%s\" exists in the catalog", kamName)); + } KamSummarizer summarizer = new KamSummarizer(reportable); KamSummary summary = KamSummarizer.summarizeKam(kAMStore, kam); summarizer.printKamSummary(kAMStore, summary); @@ -862,7 +870,6 @@ private void runRenameCommand(final String oldKamName, /* * The following are utility methods used for usage and error messages: */ - private static String showCommandAliases() { final Command[] commands = Command.values(); StringBuilder sb = new StringBuilder();