1 files changed, 7 insertions, 30 deletions
diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/PasswordSafeImpl.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/PasswordSafeImpl.java
index 34aee7aaad38..6d5127b376ad 100644
--- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/PasswordSafeImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/PasswordSafeImpl.java
@@ -22,7 +22,6 @@ import com.intellij.ide.passwordSafe.impl.providers.masterKey.MasterKeyPasswordS
 import com.intellij.ide.passwordSafe.impl.providers.masterKey.PasswordDatabase;
 import com.intellij.ide.passwordSafe.impl.providers.memory.MemoryPasswordSafe;
 import com.intellij.ide.passwordSafe.impl.providers.nil.NilProvider;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
@@ -71,19 +70,11 @@ public class PasswordSafeImpl extends PasswordSafe {
   }
 
   @Nullable
-  @Override
   public String getPassword(@Nullable Project project, @NotNull Class requester, String key) throws PasswordSafeException {
-    return getPassword(project, requester, key, null);
-  }
-
-  @Nullable
-  @Override
-  public String getPassword(@Nullable Project project, @NotNull Class requester, String key,
-                            @Nullable ModalityState modalityState) throws PasswordSafeException {
     if (mySettings.getProviderType().equals(PasswordSafeSettings.ProviderType.MASTER_PASSWORD)) {
-      String password = getMemoryProvider().getPassword(project, requester, key, modalityState);
+      String password = getMemoryProvider().getPassword(project, requester, key);
       if (password == null) {
-        password = provider().getPassword(project, requester, key, modalityState);
+        password = provider().getPassword(project, requester, key);
         if (password != null) {
           // cache the password in memory as well for easier access during the session
           getMemoryProvider().storePassword(project, requester, key, password);
@@ -91,35 +82,21 @@ public class PasswordSafeImpl extends PasswordSafe {
       }
       return password;
     }
-    return provider().getPassword(project, requester, key, modalityState);
+    return provider().getPassword(project, requester, key);
   }
 
-  @Override
-  public void removePassword(@Nullable Project project, @NotNull Class requestor, String key) throws PasswordSafeException {
-    removePassword(project, requestor, key, null);
-  }
-
-  @Override
-  public void removePassword(@Nullable Project project, @NotNull Class requester, String key,
-                             @Nullable ModalityState modalityState) throws PasswordSafeException {
+  public void removePassword(@Nullable Project project, @NotNull Class requester, String key) throws PasswordSafeException {
     if (mySettings.getProviderType().equals(PasswordSafeSettings.ProviderType.MASTER_PASSWORD)) {
       getMemoryProvider().removePassword(project, requester, key);
     }
-    provider().removePassword(project, requester, key, modalityState);
-  }
-
-  @Override
-  public void storePassword(@Nullable Project project, @NotNull Class requestor, String key, String value) throws PasswordSafeException {
-    storePassword(project, requestor, key, value, null);
+    provider().removePassword(project, requester, key);
   }
 
-  @Override
-  public void storePassword(@Nullable Project project, @NotNull Class requester, String key, String value,
-                            @Nullable ModalityState modalityState) throws PasswordSafeException {
+  public void storePassword(@Nullable Project project, @NotNull Class requester, String key, String value) throws PasswordSafeException {
     if (mySettings.getProviderType().equals(PasswordSafeSettings.ProviderType.MASTER_PASSWORD)) {
       getMemoryProvider().storePassword(project, requester, key, value);
     }
-    provider().storePassword(project, requester, key, value, modalityState);
+    provider().storePassword(project, requester, key, value);
   }
 
   /**