Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"

1 files changed, 3 insertions, 10 deletions

diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/nil/NilProvider.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/nil/NilProvider.java
index e3a77325b06e..4bf024d697c2 100644
--- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/nil/NilProvider.java
+++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/nil/NilProvider.java
@@ -17,7 +17,6 @@ package com.intellij.ide.passwordSafe.impl.providers.nil;
 
 import com.intellij.ide.passwordSafe.PasswordSafeException;
 import com.intellij.ide.passwordSafe.impl.PasswordSafeProvider;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -42,22 +41,16 @@ public final class NilProvider extends PasswordSafeProvider {
     return "Do not Store";
   }
 
-  @Nullable
-  public String getPassword(@Nullable Project project, @NotNull Class requester, String key,
-                            @Nullable ModalityState modalityState) throws PasswordSafeException {
+  public String getPassword(@Nullable Project project, @NotNull Class requester, String key) throws PasswordSafeException {
     // nothing is stored
     return 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 {
     // do nothing
   }
 
-  @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 {
     // just forget about password
   }
 }