diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-19 22:27:03 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-19 21:25:05 +0000 |
commit | 4ca751c002784c4bfd349cc5240b045b62277c80 (patch) | |
tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /plugins/git4idea/src/git4idea/commands/GitSSHGUIHandler.java | |
parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
parent | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (diff) | |
download | idea-4ca751c002784c4bfd349cc5240b045b62277c80.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'plugins/git4idea/src/git4idea/commands/GitSSHGUIHandler.java')
-rw-r--r-- | plugins/git4idea/src/git4idea/commands/GitSSHGUIHandler.java | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/plugins/git4idea/src/git4idea/commands/GitSSHGUIHandler.java b/plugins/git4idea/src/git4idea/commands/GitSSHGUIHandler.java index 982270421968..4d1c13415ec2 100644 --- a/plugins/git4idea/src/git4idea/commands/GitSSHGUIHandler.java +++ b/plugins/git4idea/src/git4idea/commands/GitSSHGUIHandler.java @@ -16,7 +16,6 @@ package git4idea.commands; import com.intellij.ide.passwordSafe.ui.PasswordSafePromptDialog; -import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; @@ -39,17 +38,9 @@ import java.util.concurrent.atomic.AtomicReference; */ public class GitSSHGUIHandler { @Nullable private final Project myProject; - @Nullable private final ModalityState myState; - /** - * A constructor - * - * @param project a project to use - * @param state modality state using which any prompts initiated by the git process should be shown in the UI. - */ - GitSSHGUIHandler(@Nullable Project project, @Nullable ModalityState state) { + GitSSHGUIHandler(@Nullable Project project) { myProject = project; - myState = state; } public boolean verifyServerHostKey(final String hostname, @@ -76,7 +67,7 @@ public class GitSSHGUIHandler { @Nullable public String askPassphrase(final String username, final String keyPath, boolean resetPassword, final String lastError) { String error = processLastError(resetPassword, lastError); - return PasswordSafePromptDialog.askPassphrase(myProject, myState, GitBundle.getString("ssh.ask.passphrase.title"), + return PasswordSafePromptDialog.askPassphrase(myProject, GitBundle.getString("ssh.ask.passphrase.title"), GitBundle.message("ssh.askPassphrase.message", keyPath, username), GitSSHGUIHandler.class, "PASSPHRASE:" + keyPath, resetPassword, error ); @@ -165,7 +156,7 @@ public class GitSSHGUIHandler { @Nullable public String askPassword(final String username, boolean resetPassword, final String lastError) { String error = processLastError(resetPassword, lastError); - return PasswordSafePromptDialog.askPassword(myProject, myState, GitBundle.getString("ssh.password.title"), + return PasswordSafePromptDialog.askPassword(myProject, GitBundle.getString("ssh.password.title"), GitBundle.message("ssh.password.message", username), GitSSHGUIHandler.class, "PASSWORD:" + username, resetPassword, error); } |