You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/08/05 15:16:49 UTC
[1/2] camel git commit: Polished karaf command
Repository: camel
Updated Branches:
refs/heads/master 371f90e75 -> 06db3cd24
Polished karaf command
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/887a21ea
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/887a21ea
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/887a21ea
Branch: refs/heads/master
Commit: 887a21ea213bf52c9f917c0c6af0a7ab7ae3164e
Parents: 371f90e
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Aug 5 15:13:37 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Aug 5 15:24:11 2015 +0200
----------------------------------------------------------------------
.../org/apache/camel/commands/EndpointStatisticCommand.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/887a21ea/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
index 9e33f12..d123414 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
@@ -222,6 +222,9 @@ public class EndpointStatisticCommand extends AbstractCamelCommand {
int dynamicLen = Math.min(columnWidths.get(DYNAMIC_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
dynamicLen = Math.max(MIN_COLUMN_WIDTH, dynamicLen);
+ int totalLen = Math.min(columnWidths.get(HITS_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
+ totalLen = Math.max(MIN_COLUMN_WIDTH, totalLen);
+
// last row does not have min width
final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
@@ -231,7 +234,7 @@ public class EndpointStatisticCommand extends AbstractCamelCommand {
retval.append(fieldPreamble).append("%-").append(directionLen).append('.').append(directionLen).append('s').append(fieldPostamble).append(' ');
retval.append(fieldPreamble).append("%-").append(staticLen).append('.').append(staticLen).append('s').append(fieldPostamble).append(' ');
retval.append(fieldPreamble).append("%-").append(dynamicLen).append('.').append(dynamicLen).append('s').append(fieldPostamble).append(' ');
- retval.append(fieldPreamble).append("%s").append(fieldPostamble).append(' ');
+ retval.append(fieldPreamble).append("%").append(totalLen).append('.').append(totalLen).append('s').append(fieldPostamble).append(' ');
return retval.toString();
}
[2/2] camel git commit: Polished karaf command
Posted by da...@apache.org.
Polished karaf command
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/06db3cd2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/06db3cd2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/06db3cd2
Branch: refs/heads/master
Commit: 06db3cd24626287cfddaff4dd5c11df419a4500a
Parents: 887a21e
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Aug 5 15:23:49 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Aug 5 15:24:18 2015 +0200
----------------------------------------------------------------------
.../commands/AbstractLocalCamelController.java | 17 +++++++++++++++++
.../jolokia/DefaultJolokiaCamelController.java | 16 ++++++++++++++++
2 files changed, 33 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/06db3cd2/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
index 4fa7da0..8061b7c 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
@@ -457,6 +457,23 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
answer.add(row);
}
}
+
+ // sort the list
+ Collections.sort(answer, new Comparator<Map<String, String>>() {
+ @Override
+ public int compare(Map<String, String> endpoint1, Map<String, String> endpoint2) {
+ String route1 = endpoint1.get("routeId");
+ String route2 = endpoint2.get("routeId");
+ int num = route1.compareTo(route2);
+ if (num == 0) {
+ String uri1 = endpoint1.get("uri");
+ String uri2 = endpoint2.get("uri");
+ num = uri1.compareTo(uri2);
+ }
+ return num;
+ }
+
+ });
}
return answer;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/06db3cd2/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
index bcf37e2..eb08b71 100644
--- a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
+++ b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
@@ -571,6 +571,22 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
answer.add(row);
}
}
+
+ // sort the list
+ Collections.sort(answer, new Comparator<Map<String, String>>() {
+ @Override
+ public int compare(Map<String, String> endpoint1, Map<String, String> endpoint2) {
+ String route1 = endpoint1.get("routeId");
+ String route2 = endpoint2.get("routeId");
+ int num = route1.compareTo(route2);
+ if (num == 0) {
+ String uri1 = endpoint1.get("uri");
+ String uri2 = endpoint2.get("uri");
+ num = uri1.compareTo(uri2);
+ }
+ return num;
+ }
+ });
}
return answer;