mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-01-04 17:20:55 +07:00
[project] sanitizing RemoteSdkException API and simplifying implementation
GitOrigin-RevId: be4e387f9b9e0e5626f252a896536c224220f81c
This commit is contained in:
committed by
intellij-monorepo-bot
parent
18e9a036a2
commit
aa5eee604e
@@ -303,8 +303,6 @@ c:com.intellij.remote.RemoteSdkException
|
||||
- <init>(java.lang.String,java.lang.Throwable,java.lang.String,java.lang.String):V
|
||||
- s:cantObtainRemoteCredentials(java.lang.Throwable):com.intellij.remote.RemoteSdkException
|
||||
- getMessage():java.lang.String
|
||||
- isAuthFailed():Z
|
||||
- isNoRouteToHost():Z
|
||||
com.intellij.remote.RemoteSdkProperties
|
||||
- com.intellij.remote.RemoteSdkPropertiesPaths
|
||||
- a:getDefaultHelpersName():java.lang.String
|
||||
|
||||
@@ -3,4 +3,3 @@ display.name.key.pair.openssh.or.putty=Key pair (OpenSSH or PuTTY)
|
||||
display.name.openssh.config.and.authentication.agent=OpenSSH config and authentication agent
|
||||
credentials.type.filetype.description.unknown=Unknown
|
||||
remote.sdk.exception.cant.obtain.remote.credentials=Cannot obtain remote credentials
|
||||
authentication.failed=Authentication failed
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
|
||||
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.intellij.remote;
|
||||
|
||||
import com.intellij.execution.ExecutionExceptionWithAttachments;
|
||||
@@ -9,10 +9,7 @@ import org.jetbrains.annotations.Nullable;
|
||||
import java.net.NoRouteToHostException;
|
||||
|
||||
public class RemoteSdkException extends ExecutionExceptionWithAttachments {
|
||||
private final boolean myNoRouteToHost;
|
||||
private final boolean myAuthFailed;
|
||||
|
||||
private Throwable myCause;
|
||||
private final Throwable myCause;
|
||||
|
||||
public RemoteSdkException(@DialogMessage String s, Throwable throwable) {
|
||||
this(s, throwable, null, null);
|
||||
@@ -21,18 +18,14 @@ public class RemoteSdkException extends ExecutionExceptionWithAttachments {
|
||||
public RemoteSdkException(@DialogMessage String s, Throwable throwable, @Nullable String stdout, @Nullable String stderr) {
|
||||
super(s, throwable, stdout, stderr);
|
||||
|
||||
myAuthFailed = false;
|
||||
Throwable t = throwable;
|
||||
while (t != null) {
|
||||
if (t instanceof NoRouteToHostException) {
|
||||
myCause = t;
|
||||
myNoRouteToHost = true;
|
||||
return;
|
||||
}
|
||||
|
||||
t = t.getCause();
|
||||
}
|
||||
myNoRouteToHost = false;
|
||||
myCause = throwable;
|
||||
}
|
||||
|
||||
@@ -42,29 +35,12 @@ public class RemoteSdkException extends ExecutionExceptionWithAttachments {
|
||||
|
||||
public RemoteSdkException(@DialogMessage String s, @Nullable String stdout, @Nullable String stderr) {
|
||||
super(s, stdout, stderr);
|
||||
myAuthFailed = false;
|
||||
myNoRouteToHost = false;
|
||||
}
|
||||
|
||||
public boolean isNoRouteToHost() {
|
||||
return myNoRouteToHost;
|
||||
}
|
||||
|
||||
public boolean isAuthFailed() {
|
||||
return myAuthFailed;
|
||||
myCause = null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMessage() {
|
||||
if (myNoRouteToHost) {
|
||||
return myCause.getMessage();
|
||||
}
|
||||
else if (myAuthFailed) {
|
||||
return RemoteBundle.message("authentication.failed");
|
||||
}
|
||||
else {
|
||||
return super.getMessage();
|
||||
}
|
||||
return myCause instanceof NoRouteToHostException ? myCause.getMessage() : super.getMessage();
|
||||
}
|
||||
|
||||
public static @NotNull RemoteSdkException cantObtainRemoteCredentials(@NotNull Throwable e) {
|
||||
|
||||
Reference in New Issue
Block a user