You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2015/04/30 10:02:15 UTC
[4/4] karaf git commit: [KARAF-3633] Fix commands list not displaying
commands descriptions
[KARAF-3633] Fix commands list not displaying commands descriptions
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/4cd9307c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/4cd9307c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/4cd9307c
Branch: refs/heads/master
Commit: 4cd9307cbb680fa8ead3fbd93b3a4d5e0b7c8364
Parents: b3a2a1c
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Wed Apr 29 10:38:29 2015 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Apr 30 09:50:17 2015 +0200
----------------------------------------------------------------------
.../console/commands/help/CommandListHelpProvider.java | 10 +++++++---
.../impl/console/commands/help/ShellHelpProvider.java | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/4cd9307c/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/CommandListHelpProvider.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/CommandListHelpProvider.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/CommandListHelpProvider.java
index 6612402..857f56e 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/CommandListHelpProvider.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/CommandListHelpProvider.java
@@ -129,9 +129,9 @@ public class CommandListHelpProvider implements HelpProvider {
} else if (mode.equals("cyan")) {
cyan = true;
} else if (mode.equals("indent")) {
- indent = 4;
+ indent = 3;
} else if (mode.startsWith("indent=")) {
- indent = Integer.parseInt(mode.substring("indent=".length()));
+ indent = Integer.parseInt(mode.substring("indent=".length())) - 1;
}
}
@@ -158,7 +158,11 @@ public class CommandListHelpProvider implements HelpProvider {
if (list) {
prefix += " *";
}
- table.addRow().addContent(prefix, key, entry.getValue());
+ if (indent > 0 || list) {
+ table.addRow().addContent(prefix, key, entry.getValue());
+ } else {
+ table.addRow().addContent(key, entry.getValue());
+ }
}
table.print(out, true);
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/4cd9307c/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/ShellHelpProvider.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/ShellHelpProvider.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/ShellHelpProvider.java
index 8285c3e..ab45585 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/ShellHelpProvider.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/ShellHelpProvider.java
@@ -138,7 +138,7 @@ public class ShellHelpProvider implements HelpProvider {
out.println("\t" + SimpleAnsi.INTENSITY_BOLD + path + SimpleAnsi.INTENSITY_NORMAL);
out.println();
out.println(SimpleAnsi.INTENSITY_BOLD + "COMMANDS" + SimpleAnsi.INTENSITY_NORMAL);
- out.println("${command-list|" + path + "|embedded}");
+ out.println("${command-list|" + path + "|indent}");
}
}
\ No newline at end of file