From 610d8f147a51bfbc337edbc5fe525d4707a3a573 Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Wed, 16 Apr 2014 18:57:10 +0400 Subject: [PATCH] cleanup --- .../passwordSafe/ui/PasswordPromptComponent.java | 6 +++++- .../passwordSafe/ui/PasswordSafePromptDialog.java | 14 +------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/ui/PasswordPromptComponent.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/ui/PasswordPromptComponent.java index a9a0a7b66dd3..6ea43344bda4 100644 --- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/ui/PasswordPromptComponent.java +++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/ui/PasswordPromptComponent.java @@ -105,7 +105,11 @@ public class PasswordPromptComponent { myPasswordField.setText(text); } - public boolean isRememberChecked() { + public boolean isRememberSelected() { return myRememberCheckBox.isSelected(); } + + public void setRememberSelected(boolean selected) { + myRememberCheckBox.setSelected(selected); + } } diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/ui/PasswordSafePromptDialog.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/ui/PasswordSafePromptDialog.java index dfe478b11f31..def7aa96ce9b 100644 --- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/ui/PasswordSafePromptDialog.java +++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/ui/PasswordSafePromptDialog.java @@ -25,9 +25,7 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Ref; -import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -72,16 +70,6 @@ public class PasswordSafePromptDialog extends DialogWrapper { return myComponent.getPreferredFocusedComponent(); } - @Nullable - public static Pair showUserPasswordDialog(Project project, String title, String message, String defUser) { - PasswordPromptComponent component = new PasswordPromptComponent(PasswordSafeSettings.ProviderType.DO_NOT_STORE, message, true, null, null); - component.setUserName(StringUtil.notNullize(defUser)); - if (new PasswordSafePromptDialog(project, title, component).showAndGet()) { - return Pair.create(component.getUserName(), new String(component.getPassword())); - } - return null; - } - /** * Ask password possibly asking password database first. The method could be invoked from any thread. If UI needs to be shown, * the method invokes {@link UIUtil#invokeAndWaitIfNeeded(Runnable)} @@ -211,7 +199,7 @@ public class PasswordSafePromptDialog extends DialogWrapper { if (d.showAndGet()) { ref.set(new String(component.getPassword())); try { - if (component.isRememberChecked()) { + if (component.isRememberSelected()) { ps.storePassword(project, requestor, key, ref.get()); } else if (!type.equals(PasswordSafeSettings.ProviderType.DO_NOT_STORE)) {