From fb14907fa89e693ea35c89aa1bb978c8dee1f9cd Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 23 Nov 2022 09:06:01 -0500 Subject: [PATCH] Console: Remove brackets on /debug update and app manager sections and other cleanups for readability --- .../net/i2p/router/update/ConsoleUpdateManager.java | 10 +++++----- .../src/net/i2p/router/startup/RouterAppManager.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java index 480b46c051..39b8739975 100644 --- a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java +++ b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java @@ -1651,7 +1651,7 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp { @Override public String toString() { - return "RegisteredChecker " + checker.getClass().getName() + " for " + type + " (" + method + ") @pri " + priority; + return "RegisteredChecker " + checker.getClass().getName() + " for " + type + " (" + method + ") @priority " + priority; } } @@ -1683,8 +1683,8 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp { @Override public String toString() { if ("".equals(id)) - return "UpdateItem " + type; - return "UpdateItem " + type + ' ' + id; + return type.toString(); + return type.toString() + ' ' + id; } } @@ -1807,7 +1807,7 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp { } Collections.sort(list); for (String e : list) { - buf.append("[").append(e).append("]
"); + buf.append(e).append("
"); } } @@ -1817,7 +1817,7 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp { for (Map.Entry entry : map.entrySet()) { String key = entry.getKey().toString(); String val = entry.getValue().toString(); - list.add("[" + key + "] = " + val + "
"); + list.add("" + key + ": " + val + "
"); } Collections.sort(list); for (String e : list) { diff --git a/router/java/src/net/i2p/router/startup/RouterAppManager.java b/router/java/src/net/i2p/router/startup/RouterAppManager.java index 9bb2d4e221..ec3636f796 100644 --- a/router/java/src/net/i2p/router/startup/RouterAppManager.java +++ b/router/java/src/net/i2p/router/startup/RouterAppManager.java @@ -249,7 +249,7 @@ public class RouterAppManager extends ClientAppManagerImpl { for (Map.Entry entry : _clients.entrySet()) { ClientApp key = entry.getKey(); String[] val = entry.getValue(); - list.add("[" + key.getName() + "] = [" + key.getClass().getName() + ' ' + Arrays.toString(val) + "] " + key.getState() + "
"); + list.add("" + key.getName() + ": " + key.getClass().getName() + ' ' + Arrays.toString(val) + " " + key.getState() + "
"); } Collections.sort(list, Collator.getInstance()); for (String e : list) { @@ -266,7 +266,7 @@ public class RouterAppManager extends ClientAppManagerImpl { for (Map.Entry entry : _registered.entrySet()) { String key = entry.getKey(); ClientApp val = entry.getValue(); - list.add("[" + key + "] = [" + val.getClass().getName() + "]
"); + list.add("" + key + ": " + val.getClass().getName() + "
"); } Collections.sort(list, Collator.getInstance()); for (String e : list) {