Repository: karaf Updated Branches: refs/heads/master 36c23d065 -> bdc4ee05b
Small cleanups Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/bdc4ee05 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/bdc4ee05 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/bdc4ee05 Branch: refs/heads/master Commit: bdc4ee05b0721e97f7a74c0efc3326415e5cfca6 Parents: 36c23d0 Author: Jean-Baptiste Onofré <[email protected]> Authored: Wed Jun 18 22:11:29 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Wed Jun 18 22:11:29 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/bdc4ee05/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 1f45aa0..b81e411 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 @@ -34,7 +34,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) @Completion(AvailableFeatureCompleter.class) List<String> features; http://git-wip-us.apache.org/repos/asf/karaf/blob/bdc4ee05/obr/src/main/java/org/apache/karaf/obr/command/ListCommand.java ---------------------------------------------------------------------- diff --git a/obr/src/main/java/org/apache/karaf/obr/command/ListCommand.java b/obr/src/main/java/org/apache/karaf/obr/command/ListCommand.java index 45db82f..f560992 100644 --- a/obr/src/main/java/org/apache/karaf/obr/command/ListCommand.java +++ b/obr/src/main/java/org/apache/karaf/obr/command/ListCommand.java @@ -54,14 +54,6 @@ public class ListCommand extends ObrCommandSupport { query = "(|(presentationname=*" + substr + "*)(symbolicname=*" + substr + "*))"; } Resource[] resources = admin.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");
