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/27 10:16:54 UTC
[1/3] karaf git commit: [KARAF-2966] scr:details - Sort the
properties so its easier for humans to read
Repository: karaf
Updated Branches:
refs/heads/master 1db79544c -> 6d402cd43
[KARAF-2966] scr:details - Sort the properties so its easier for humans to read
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/34b160da
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/34b160da
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/34b160da
Branch: refs/heads/master
Commit: 34b160daa6d32b812955a84455d800b309572420
Parents: ab8040f
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Nov 26 17:32:00 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Nov 26 17:32:00 2015 +0100
----------------------------------------------------------------------
.../apache/karaf/scr/command/action/DetailsAction.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/34b160da/scr/command/src/main/java/org/apache/karaf/scr/command/action/DetailsAction.java
----------------------------------------------------------------------
diff --git a/scr/command/src/main/java/org/apache/karaf/scr/command/action/DetailsAction.java b/scr/command/src/main/java/org/apache/karaf/scr/command/action/DetailsAction.java
index 0304b00..dcf0076 100644
--- a/scr/command/src/main/java/org/apache/karaf/scr/command/action/DetailsAction.java
+++ b/scr/command/src/main/java/org/apache/karaf/scr/command/action/DetailsAction.java
@@ -32,6 +32,9 @@ import org.osgi.framework.ServiceReference;
import org.osgi.service.component.ComponentConstants;
import java.util.Hashtable;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.TreeMap;
/**
* Display the details associated with a given component by supplying its component name.
@@ -57,10 +60,11 @@ public class DetailsAction extends ScrActionSupport {
printDetail(" State : ", ScrUtils.getState(component.getState()));
Hashtable props = (Hashtable)component.getProperties();
- if (!props.isEmpty()) {
+ Map map = new TreeMap(props);
+ if (!map.isEmpty()) {
System.out.println(SimpleAnsi.INTENSITY_BOLD + " Properties : " + SimpleAnsi.INTENSITY_NORMAL);
- for (Object key : props.keySet()) {
- Object value = props.get(key);
+ for (Object key : map.keySet()) {
+ Object value = map.get(key);
printDetail(" ", key + "=" + value);
}
}
[3/3] karaf git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/karaf
Posted by jb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6d402cd4
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6d402cd4
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6d402cd4
Branch: refs/heads/master
Commit: 6d402cd43d115d1bac265f4f0f810ae437bdc5bf
Parents: 39ea2ad 1db7954
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Nov 27 10:16:28 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Nov 27 10:16:28 2015 +0100
----------------------------------------------------------------------
README | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[2/3] karaf git commit: Merge branch 'KARAF-2966' of
https://github.com/oscerd/karaf
Posted by jb...@apache.org.
Merge branch 'KARAF-2966' of https://github.com/oscerd/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/39ea2ad0
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/39ea2ad0
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/39ea2ad0
Branch: refs/heads/master
Commit: 39ea2ad0bed821a8a60be4a0b001b329fc46f247
Parents: f641a70 34b160d
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Nov 27 09:59:16 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Nov 27 09:59:16 2015 +0100
----------------------------------------------------------------------
.../apache/karaf/scr/command/action/DetailsAction.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------