Skip to content

删除无效代码、补齐缺失的@Override注解，采用内置list.sort函数无需引入工具类 #2766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tubaobao3 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

删除无效代码、补齐缺失的@Override注解，采用内置list.sort函数无需引入工具类 #2766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion boot/src/main/java/com/taobao/arthas/boot/ProcessUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ private static File findJava(String javaHome) {

// find the shortest path, jre path longer than jdk path
if (javaList.size() > 1) {
Collections.sort(javaList, new Comparator<File>() {
javaList.sort(new Comparator<File>() {
@Override
public int compare(File file1, File file2) {
try {
Expand Down
2 changes: 0 additions & 2 deletions core/src/main/java/com/taobao/arthas/core/shell/cli/CompletionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,8 @@ public static boolean completeMethodName(Completion completion) {
// 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();
}

Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/com/taobao/arthas/core/shell/cli/impl/CliTokenImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,12 @@ public boolean isBlank() {
return !text;
}

@Override
public String raw() {
return raw;
}

@Override
public String value() {
return value;
}
Expand Down
2 changes: 0 additions & 2 deletions core/src/main/java/com/taobao/arthas/core/shell/session/impl/SessionManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ public Session createSession() {
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);

Expand Down