From 59bbb58b67ec88696339e3c51cb6bee0514813b7 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Sat, 23 Mar 2013 18:41:15 +0400 Subject: [PATCH] [git] Fix method signature setLastSuccessful doesn't return any interesting value, and it is never used => make it void. --- .../rt/src/org/jetbrains/git4idea/ssh/GitSSHHandler.java | 2 +- .../src/org/jetbrains/git4idea/ssh/GitSSHXmlRpcClient.java | 6 +++--- .../src/org/jetbrains/git4idea/ssh/GitXmlRpcSshService.java | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/plugins/git4idea/rt/src/org/jetbrains/git4idea/ssh/GitSSHHandler.java b/plugins/git4idea/rt/src/org/jetbrains/git4idea/ssh/GitSSHHandler.java index c5ed99e20966..a388b27fdd5d 100644 --- a/plugins/git4idea/rt/src/org/jetbrains/git4idea/ssh/GitSSHHandler.java +++ b/plugins/git4idea/rt/src/org/jetbrains/git4idea/ssh/GitSSHHandler.java @@ -124,7 +124,7 @@ public interface GitSSHHandler { * @param method the authentication method, the empty string means that authentication failed * @param error the error shown in the case when authentication process failed */ - String setLastSuccessful(final int handlerNo, final String userName, final String method, final String error); + void setLastSuccessful(final int handlerNo, final String userName, final String method, final String error); /** * Get last successful authentication method diff --git a/plugins/git4idea/rt/src/org/jetbrains/git4idea/ssh/GitSSHXmlRpcClient.java b/plugins/git4idea/rt/src/org/jetbrains/git4idea/ssh/GitSSHXmlRpcClient.java index a000949f1ce6..935b5eaa2f03 100644 --- a/plugins/git4idea/rt/src/org/jetbrains/git4idea/ssh/GitSSHXmlRpcClient.java +++ b/plugins/git4idea/rt/src/org/jetbrains/git4idea/ssh/GitSSHXmlRpcClient.java @@ -182,9 +182,9 @@ public class GitSSHXmlRpcClient implements GitSSHHandler { */ @Override @SuppressWarnings("unchecked") - public String setLastSuccessful(int handlerNo, String userName, String method, String error) { + public void setLastSuccessful(int handlerNo, String userName, String method, String error) { if (myClient == null) { - return ""; + return; } Vector parameters = new Vector(); parameters.add(handlerNo); @@ -192,7 +192,7 @@ public class GitSSHXmlRpcClient implements GitSSHHandler { parameters.add(method); parameters.add(error); try { - return (String)myClient.execute(methodName("setLastSuccessful"), parameters); + myClient.execute(methodName("setLastSuccessful"), parameters); } catch (XmlRpcException e) { throw new RuntimeException("Invocation failed " + e.getMessage(), e); diff --git a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitXmlRpcSshService.java b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitXmlRpcSshService.java index 3b0d89e44976..0ba2e94e4d84 100644 --- a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitXmlRpcSshService.java +++ b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitXmlRpcSshService.java @@ -86,9 +86,8 @@ public class GitXmlRpcSshService extends GitXmlRpcHandlerService