From acb41fce19004ff37e6d4b25fe7a5aa09919e37b Mon Sep 17 00:00:00 2001 From: hecy7 Date: Mon, 11 Dec 2023 12:32:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E6=95=88=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E3=80=81=E8=A1=A5=E9=BD=90=E7=BC=BA=E5=A4=B1=E7=9A=84?= =?UTF-8?q?@Override=E6=B3=A8=E8=A7=A3=EF=BC=8C=E9=87=87=E7=94=A8=E5=86=85?= =?UTF-8?q?=E7=BD=AElist.sort=E5=87=BD=E6=95=B0=E6=97=A0=E9=9C=80=E5=BC=95?= =?UTF-8?q?=E5=85=A5=E5=B7=A5=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hecy7 --- boot/src/main/java/com/taobao/arthas/boot/ProcessUtils.java | 2 +- .../java/com/taobao/arthas/core/shell/cli/CompletionUtils.java | 2 -- .../com/taobao/arthas/core/shell/cli/impl/CliTokenImpl.java | 2 ++ .../arthas/core/shell/session/impl/SessionManagerImpl.java | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/boot/src/main/java/com/taobao/arthas/boot/ProcessUtils.java b/boot/src/main/java/com/taobao/arthas/boot/ProcessUtils.java index 33a94e21b..d6ed32c5f 100644 --- a/boot/src/main/java/com/taobao/arthas/boot/ProcessUtils.java +++ b/boot/src/main/java/com/taobao/arthas/boot/ProcessUtils.java @@ -375,7 +375,7 @@ public class ProcessUtils { // find the shortest path, jre path longer than jdk path if (javaList.size() > 1) { - Collections.sort(javaList, new Comparator() { + javaList.sort(new Comparator() { @Override public int compare(File file1, File file2) { try { diff --git a/core/src/main/java/com/taobao/arthas/core/shell/cli/CompletionUtils.java b/core/src/main/java/com/taobao/arthas/core/shell/cli/CompletionUtils.java index f2e51e267..61525852c 100644 --- a/core/src/main/java/com/taobao/arthas/core/shell/cli/CompletionUtils.java +++ b/core/src/main/java/com/taobao/arthas/core/shell/cli/CompletionUtils.java @@ -209,10 +209,8 @@ public class CompletionUtils { // retrieve the class name String className; if (StringUtils.isBlank(lastToken)) { - // tokens = { " ", "CLASS_NAME", " "} className = tokens.get(tokens.size() - 2).value(); } else { - // tokens = { " ", "CLASS_NAME", " ", "PARTIAL_METHOD_NAME"} className = tokens.get(tokens.size() - 3).value(); } diff --git a/core/src/main/java/com/taobao/arthas/core/shell/cli/impl/CliTokenImpl.java b/core/src/main/java/com/taobao/arthas/core/shell/cli/impl/CliTokenImpl.java index ca956e556..8d30f7525 100644 --- a/core/src/main/java/com/taobao/arthas/core/shell/cli/impl/CliTokenImpl.java +++ b/core/src/main/java/com/taobao/arthas/core/shell/cli/impl/CliTokenImpl.java @@ -36,10 +36,12 @@ public class CliTokenImpl implements CliToken { return !text; } + @Override public String raw() { return raw; } + @Override public String value() { return value; } diff --git a/core/src/main/java/com/taobao/arthas/core/shell/session/impl/SessionManagerImpl.java b/core/src/main/java/com/taobao/arthas/core/shell/session/impl/SessionManagerImpl.java index 3edf548be..899c84a61 100644 --- a/core/src/main/java/com/taobao/arthas/core/shell/session/impl/SessionManagerImpl.java +++ b/core/src/main/java/com/taobao/arthas/core/shell/session/impl/SessionManagerImpl.java @@ -55,8 +55,6 @@ public class SessionManagerImpl implements SessionManager { session.put(Session.COMMAND_MANAGER, commandManager); session.put(Session.INSTRUMENTATION, instrumentation); session.put(Session.PID, pid); - //session.put(Session.SERVER, server); - //session.put(Session.TTY, term); String sessionId = UUID.randomUUID().toString(); session.put(Session.ID, sessionId);