You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/11/25 20:40:03 UTC
karaf git commit: [KARAF-4146] Add option to show only package name
in Package:import and package:export commands
Repository: karaf
Updated Branches:
refs/heads/master 54b46154c -> ab8040f3c
[KARAF-4146] Add option to show only package name in Package:import and package:export commands
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ab8040f3
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ab8040f3
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ab8040f3
Branch: refs/heads/master
Commit: ab8040f3c035c97b102fb334699c054d1ecbb60c
Parents: 54b4615
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Nov 25 18:01:54 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Nov 25 18:01:55 2015 +0100
----------------------------------------------------------------------
.../apache/karaf/packages/command/Exports.java | 17 ++++++++---
.../apache/karaf/packages/command/Imports.java | 31 ++++++++++++++------
2 files changed, 35 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/ab8040f3/package/src/main/java/org/apache/karaf/packages/command/Exports.java
----------------------------------------------------------------------
diff --git a/package/src/main/java/org/apache/karaf/packages/command/Exports.java b/package/src/main/java/org/apache/karaf/packages/command/Exports.java
index e6a1492..12370ff 100644
--- a/package/src/main/java/org/apache/karaf/packages/command/Exports.java
+++ b/package/src/main/java/org/apache/karaf/packages/command/Exports.java
@@ -47,6 +47,9 @@ public class Exports implements Action {
@Option(name = "--no-format", description = "Disable table rendered output", required = false, multiValued = false)
boolean noFormat;
+ @Option(name = "--show-name-only", description = "Show only package name", required = false, multiValued = false)
+ boolean showOnlyName = false;
+
@Option(name = "-b", description = "Only show packages exported by given bundle id", required = false, multiValued = false)
private Integer bundleId;
@@ -73,16 +76,22 @@ public class Exports implements Action {
List<PackageVersion> exports = packageService.getExports();
ShellTable table = new ShellTable();
table.column("Package Name");
- table.column("Version");
- table.column("ID");
- table.column("Bundle Name");
+ if (!showOnlyName) {
+ table.column("Version");
+ table.column("ID");
+ table.column("Bundle Name");
+ }
for (PackageVersion pVer : exports) {
for (Bundle bundle : pVer.getBundles()) {
if (matchesFilter(pVer, bundle)) {
- table.addRow().addContent(pVer.getPackageName(),
+ if (!showOnlyName) {
+ table.addRow().addContent(pVer.getPackageName(),
pVer.getVersion().toString(),
bundle.getBundleId(),
bundle.getSymbolicName());
+ } else {
+ table.addRow().addContent(pVer.getPackageName());
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/ab8040f3/package/src/main/java/org/apache/karaf/packages/command/Imports.java
----------------------------------------------------------------------
diff --git a/package/src/main/java/org/apache/karaf/packages/command/Imports.java b/package/src/main/java/org/apache/karaf/packages/command/Imports.java
index b070dd0..f065579 100644
--- a/package/src/main/java/org/apache/karaf/packages/command/Imports.java
+++ b/package/src/main/java/org/apache/karaf/packages/command/Imports.java
@@ -17,7 +17,6 @@
package org.apache.karaf.packages.command;
import java.util.List;
-import java.util.SortedMap;
import org.apache.karaf.packages.core.PackageRequirement;
import org.apache.karaf.packages.core.PackageService;
@@ -40,6 +39,9 @@ public class Imports implements Action {
@Option(name = "--no-format", description = "Disable table rendered output", required = false, multiValued = false)
boolean noFormat;
+ @Option(name = "--show-name-only", description = "Show only package name", required = false, multiValued = false)
+ boolean showOnlyName = false;
+
@Option(name = "-p", description = "Only show package starting with given name", required = false, multiValued = false)
String packageName;
@@ -55,13 +57,18 @@ public class Imports implements Action {
ShellTable table = new ShellTable();
if (showFilter) {
table.column("Filter");
+ table.column("Optional");
+ table.column("ID");
+ table.column("Bundle Name");
} else {
table.column("Package");
- table.column("Version");
+ if (!showOnlyName) {
+ table.column("Version");
+ table.column("Optional");
+ table.column("ID");
+ table.column("Bundle Name");
+ }
}
- table.column("Optional");
- table.column("ID");
- table.column("Bundle Name");
for (PackageRequirement req : imports) {
if (matchesFilter(req)) {
@@ -69,12 +76,18 @@ public class Imports implements Action {
Row row = table.addRow();
if (showFilter) {
row.addContent(req.getFilter());
+ row.addContent(getOptional(req),
+ bundle.getBundleId(),
+ bundle.getSymbolicName());
} else {
- row.addContent(req.getPackageName(), req.getVersionRange());
+ row.addContent(req.getPackageName());
+ if (!showOnlyName) {
+ row.addContent(req.getVersionRange());
+ row.addContent(getOptional(req),
+ bundle.getBundleId(),
+ bundle.getSymbolicName());
+ }
}
- row.addContent(getOptional(req),
- bundle.getBundleId(),
- bundle.getSymbolicName());
}
}
table.print(System.out, !noFormat);