diff options
author | Tor Norbye <tnorbye@google.com> | 2014-09-04 20:44:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-04 20:44:01 +0000 |
commit | fb5a02906f644d044eb0286bf27d413ba0e05216 (patch) | |
tree | bca7d49005d81d10c70bc3f547df041c636b4300 /plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/AuthCallbackCase.java | |
parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
parent | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (diff) | |
download | idea-fb5a02906f644d044eb0286bf27d413ba0e05216.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/AuthCallbackCase.java')
-rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/AuthCallbackCase.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/AuthCallbackCase.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/AuthCallbackCase.java index 8a55a6e89860..77cca02a04fb 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/AuthCallbackCase.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/AuthCallbackCase.java @@ -16,6 +16,7 @@ package org.jetbrains.idea.svn.commandLine; import org.jetbrains.annotations.NotNull; +import org.jetbrains.idea.svn.auth.AuthenticationService; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNURL; @@ -25,10 +26,10 @@ import org.tmatesoft.svn.core.SVNURL; public abstract class AuthCallbackCase { protected final SVNURL myUrl; protected boolean myTried = false; - @NotNull protected final AuthenticationCallback myAuthenticationCallback; + @NotNull protected final AuthenticationService myAuthenticationService; - AuthCallbackCase(@NotNull AuthenticationCallback callback, SVNURL url) { - myAuthenticationCallback = callback; + AuthCallbackCase(@NotNull AuthenticationService authenticationService, SVNURL url) { + myAuthenticationService = authenticationService; myUrl = url; } |