Repository: karaf Updated Branches: refs/heads/karaf-3.0.x bc1164e91 -> fab0ca62d
Small cleanup Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/fab0ca62 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/fab0ca62 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/fab0ca62 Branch: refs/heads/karaf-3.0.x Commit: fab0ca62d7439d2afe8a9e724ec5ac7f21794144 Parents: bc1164e Author: Jean-Baptiste Onofré <[email protected]> Authored: Wed Jun 18 22:09:59 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Wed Jun 18 22:09:59 2014 +0200 ---------------------------------------------------------------------- .../apache/karaf/features/command/InstallFeatureCommand.java | 2 +- .../main/java/org/apache/karaf/obr/command/ListCommand.java | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/fab0ca62/features/command/src/main/java/org/apache/karaf/features/command/InstallFeatureCommand.java ---------------------------------------------------------------------- diff --git a/features/command/src/main/java/org/apache/karaf/features/command/InstallFeatureCommand.java b/features/command/src/main/java/org/apache/karaf/features/command/InstallFeatureCommand.java index 1fa6885..a9eccb3 100644 --- a/features/command/src/main/java/org/apache/karaf/features/command/InstallFeatureCommand.java +++ b/features/command/src/main/java/org/apache/karaf/features/command/InstallFeatureCommand.java @@ -29,7 +29,7 @@ public class InstallFeatureCommand extends FeaturesCommandSupport { private static String DEFAULT_VERSION = "0.0.0"; - @Argument(index = 0, name = "feature", description = "The name and version of the features to install. A feature id looks like name/version. The version is optional.", required = true, multiValued = true) + @Argument(index = 0, name = "features", description = "The name and version of the features to install. A feature id looks like name/version. The version is optional.", required = true, multiValued = true) List<String> features; @Option(name = "-c", aliases = "--no-clean", description = "Do not uninstall bundles on failure", required = false, multiValued = false) boolean noClean; http://git-wip-us.apache.org/repos/asf/karaf/blob/fab0ca62/obr/command/src/main/java/org/apache/karaf/obr/command/ListCommand.java ---------------------------------------------------------------------- diff --git a/obr/command/src/main/java/org/apache/karaf/obr/command/ListCommand.java b/obr/command/src/main/java/org/apache/karaf/obr/command/ListCommand.java index ca17ba2..a9d014b 100644 --- a/obr/command/src/main/java/org/apache/karaf/obr/command/ListCommand.java +++ b/obr/command/src/main/java/org/apache/karaf/obr/command/ListCommand.java @@ -60,14 +60,6 @@ public class ListCommand implements Action { query = "(|(presentationname=*" + substr + "*)(symbolicname=*" + substr + "*))"; } Resource[] resources = repoAdmin.discoverResources(query); - int maxPName = 4; - int maxSName = 13; - int maxVersion = 7; - for (Resource resource : resources) { - maxPName = Math.max(maxPName, emptyIfNull(resource.getPresentationName()).length()); - maxSName = Math.max(maxSName, emptyIfNull(resource.getSymbolicName()).length()); - maxVersion = Math.max(maxVersion, emptyIfNull(resource.getVersion()).length()); - } ShellTable table = new ShellTable(); table.column("Name");
