diff --git a/java/src/org/broadinstitute/sting/gatk/WalkerManager.java b/java/src/org/broadinstitute/sting/gatk/WalkerManager.java index 575e8a8df..93f4585c9 100755 --- a/java/src/org/broadinstitute/sting/gatk/WalkerManager.java +++ b/java/src/org/broadinstitute/sting/gatk/WalkerManager.java @@ -79,7 +79,8 @@ public class WalkerManager extends PluginManager { public Map>> getWalkerNamesByPackage() { Map>> walkersByPackage = new HashMap>>(); for(Class walker: pluginsByName.values()) { - String walkerPackage = walker.getPackage() != null ? walker.getPackage().getName() : ""; + // Extract the name for the package; if the walker is in the unnamed package, use the empty string + String walkerPackage = walker.getPackage() != null ? walker.getPackage().getName() : ""; if(!walkersByPackage.containsKey(walkerPackage)) walkersByPackage.put(walkerPackage,new ArrayList>()); walkersByPackage.get(walkerPackage).add(walker); @@ -93,8 +94,17 @@ public class WalkerManager extends PluginManager { * @return A suitable display name for the package. */ public String getPackageDisplayName(String packageName) { - String specifiedDisplayName = helpText.getProperty(packageName+"."+ DisplayNameTaglet.NAME); - return specifiedDisplayName != null ? specifiedDisplayName : packageName.substring(packageName.lastIndexOf('.')+1); + // Try to find an override for the display name of this package. + String displayName = helpText.getProperty(packageName+"."+ DisplayNameTaglet.NAME); + // If no override exists... + if(displayName == null) { + // ...try to compute the override from the text of the package name, while accounting for + // unpackaged walkers. + displayName = packageName.substring(packageName.lastIndexOf('.')+1); + if(displayName.trim().equals("")) displayName = ""; + + } + return displayName; } /**