This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/artemis.git
The following commit(s) were added to refs/heads/main by this push:
new a6ff9dd6fd ARTEMIS-5952 Improve Shell colors
a6ff9dd6fd is described below
commit a6ff9dd6fdddfa515a99c46a474c12ac61d25b09
Author: Clebert Suconic <[email protected]>
AuthorDate: Thu Mar 12 18:15:26 2026 -0400
ARTEMIS-5952 Improve Shell colors
---
.../src/main/java/org/apache/activemq/artemis/cli/Shell.java | 8 ++++----
.../src/main/java/org/apache/activemq/artemis/cli/Terminal.java | 5 +++--
.../org/apache/activemq/artemis/cli/commands/InputAbstract.java | 4 ++--
.../org/apache/activemq/artemis/cli/commands/queue/StatQueue.java | 6 +++---
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Shell.java
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Shell.java
index 1e06c93169..3c627e49d0 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Shell.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Shell.java
@@ -134,8 +134,8 @@ public class Shell implements Runnable {
printBanner();
}
- System.out.println("For a list of commands, type " +
org.apache.activemq.artemis.cli.Terminal.RED_UNICODE + "help" +
org.apache.activemq.artemis.cli.Terminal.CLEAR_UNICODE + " or press " +
org.apache.activemq.artemis.cli.Terminal.RED_UNICODE + "<TAB>" +
org.apache.activemq.artemis.cli.Terminal.CLEAR_UNICODE + ":");
- System.out.println("Type " +
org.apache.activemq.artemis.cli.Terminal.RED_UNICODE + "exit" +
org.apache.activemq.artemis.cli.Terminal.CLEAR_UNICODE + " or press " +
org.apache.activemq.artemis.cli.Terminal.RED_UNICODE + "<CTRL-D>" +
org.apache.activemq.artemis.cli.Terminal.CLEAR_UNICODE + " to leave the
session:");
+ System.out.println("For a list of commands, type " +
org.apache.activemq.artemis.cli.Terminal.WARNING_COLOR_UNICODE + "help" +
org.apache.activemq.artemis.cli.Terminal.CLEAR_UNICODE + " or press " +
org.apache.activemq.artemis.cli.Terminal.WARNING_COLOR_UNICODE + "<TAB>" +
org.apache.activemq.artemis.cli.Terminal.CLEAR_UNICODE + ":");
+ System.out.println("Type " +
org.apache.activemq.artemis.cli.Terminal.WARNING_COLOR_UNICODE + "exit" +
org.apache.activemq.artemis.cli.Terminal.CLEAR_UNICODE + " or press " +
org.apache.activemq.artemis.cli.Terminal.WARNING_COLOR_UNICODE + "<CTRL-D>" +
org.apache.activemq.artemis.cli.Terminal.CLEAR_UNICODE + " to leave the
session:");
// start the shell and process input until the user quits with
Ctrl-D
String line;
@@ -172,7 +172,7 @@ public class Shell implements Runnable {
}
private static void printBanner() {
-
System.out.print(org.apache.activemq.artemis.cli.Terminal.YELLOW_UNICODE);
+
System.out.print(org.apache.activemq.artemis.cli.Terminal.INFO_COLOR_UNICODE);
try {
Artemis.printBanner(System.out);
} catch (Exception e) {
@@ -202,7 +202,7 @@ public class Shell implements Runnable {
}
public static void setPrompt(String prompt) {
- PROMPT.set(org.apache.activemq.artemis.cli.Terminal.YELLOW_UNICODE +
prompt + " > " + org.apache.activemq.artemis.cli.Terminal.CLEAR_UNICODE);
+ PROMPT.set(org.apache.activemq.artemis.cli.Terminal.INPUT_COLOR_UNICODE
+ prompt + " > " + org.apache.activemq.artemis.cli.Terminal.CLEAR_UNICODE);
}
}
diff --git
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Terminal.java
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Terminal.java
index 420701c3fb..bf26228cea 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Terminal.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Terminal.java
@@ -19,7 +19,8 @@ package org.apache.activemq.artemis.cli;
public class Terminal {
- public static String RED_UNICODE = "\u001B[31m";
- public static String YELLOW_UNICODE = "\u001B[33m";
+ public static String WARNING_COLOR_UNICODE = "\u001B[31m";
+ public static String INPUT_COLOR_UNICODE = "\u001B[32m";
+ public static String INFO_COLOR_UNICODE = "\u001B[33m";
public static String CLEAR_UNICODE = "\u001B[0m";
}
\ No newline at end of file
diff --git
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/InputAbstract.java
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/InputAbstract.java
index 463eff699f..a49452125d 100644
---
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/InputAbstract.java
+++
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/InputAbstract.java
@@ -70,12 +70,12 @@ public class InputAbstract extends ActionAbstract {
@Override
public String readLine(String prompt) {
- return reader.readLine(Terminal.YELLOW_UNICODE + prompt + ":" +
Terminal.CLEAR_UNICODE);
+ return reader.readLine(Terminal.INPUT_COLOR_UNICODE + prompt + ":" +
Terminal.CLEAR_UNICODE);
}
@Override
public String readPassword(String prompt) {
- return reader.readLine(Terminal.YELLOW_UNICODE + prompt + ":" +
Terminal.CLEAR_UNICODE, '*');
+ return reader.readLine(Terminal.INPUT_COLOR_UNICODE + prompt + ":" +
Terminal.CLEAR_UNICODE, '*');
}
}
diff --git
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/queue/StatQueue.java
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/queue/StatQueue.java
index d422b3a369..6bb42bb60b 100644
---
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/queue/StatQueue.java
+++
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/queue/StatQueue.java
@@ -259,7 +259,7 @@ public class StatQueue extends ConnectionAbstract {
JsonArray topology = simpleManagement.listNetworkTopology();
if (clustered && topology.size() > 1) {
- context.out.println(Terminal.YELLOW_UNICODE +
"*******************************************************************************************************************************");
+ context.out.println(Terminal.INFO_COLOR_UNICODE +
"*******************************************************************************************************************************");
context.out.println(">>> Queue stats on node " + nodeID + ", url="
+ brokerURL + Terminal.CLEAR_UNICODE);
printStats(brokerURL, filter);
@@ -271,7 +271,7 @@ public class StatQueue extends ConnectionAbstract {
String url = "tcp://" + node.getString("live");
- context.out.println(Terminal.YELLOW_UNICODE +
"*******************************************************************************************************************************");
+ context.out.println(Terminal.INFO_COLOR_UNICODE +
"*******************************************************************************************************************************");
context.out.println(">>> Queue stats on node " +
node.getString("nodeID") + ", url=" + url + Terminal.CLEAR_UNICODE);
printStats(url, filter);
@@ -280,7 +280,7 @@ public class StatQueue extends ConnectionAbstract {
printStats(brokerURL, filter);
if (topology.size() > 1) {
context.out.println();
- context.out.println("Note: Use " + Terminal.RED_UNICODE +
"--clustered" + Terminal.CLEAR_UNICODE + " to expand the report to other nodes
in the topology.");
+ context.out.println("Note: Use " +
Terminal.WARNING_COLOR_UNICODE + "--clustered" + Terminal.CLEAR_UNICODE + " to
expand the report to other nodes in the topology.");
context.out.println();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
