From: James Moger <james.moger@gitblit.com>
Date: Fri, 14 Mar 2014 16:12:26 +0000 (-0400)
Subject: Fix deleteAllKeys method signature
X-Git-Tag: v1.5.0~68^2~96
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8ee7c8d2f1f53c72c4f47dde1093cb3db1f27dcb;p=gitblit.git

Fix deleteAllKeys method signature
---

diff --git a/src/main/java/com/gitblit/transport/ssh/FileKeyManager.java b/src/main/java/com/gitblit/transport/ssh/FileKeyManager.java
index f590ab2f..04b42fc8 100644
--- a/src/main/java/com/gitblit/transport/ssh/FileKeyManager.java
+++ b/src/main/java/com/gitblit/transport/ssh/FileKeyManager.java
@@ -147,7 +147,7 @@ public class FileKeyManager implements IKeyManager {
 	}
 
 	@Override
-	public boolean removeAllKey(String username) {
+	public boolean removeAllKeys(String username) {
 		return FileUtils.delete(getKeystore(username));
 	}
 
diff --git a/src/main/java/com/gitblit/transport/ssh/IKeyManager.java b/src/main/java/com/gitblit/transport/ssh/IKeyManager.java
index 3528bf19..cb32a020 100644
--- a/src/main/java/com/gitblit/transport/ssh/IKeyManager.java
+++ b/src/main/java/com/gitblit/transport/ssh/IKeyManager.java
@@ -37,5 +37,5 @@ public interface IKeyManager {
 	
 	boolean removeKey(String username, String data);
 
-	boolean removeAllKey(String username);
+	boolean removeAllKeys(String username);
 }
diff --git a/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java b/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
index 6990d0de..454d3cfc 100644
--- a/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
+++ b/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
@@ -65,7 +65,7 @@ public class NullKeyManager implements IKeyManager {
 	}
 
 	@Override
-	public boolean removeAllKey(String username) {
+	public boolean removeAllKeys(String username) {
 		return false;
 	}
 }
diff --git a/src/main/java/com/gitblit/transport/ssh/commands/SetAccountCommand.java b/src/main/java/com/gitblit/transport/ssh/commands/SetAccountCommand.java
index 98d9aba2..767f3cb4 100644
--- a/src/main/java/com/gitblit/transport/ssh/commands/SetAccountCommand.java
+++ b/src/main/java/com/gitblit/transport/ssh/commands/SetAccountCommand.java
@@ -84,7 +84,7 @@ public class SetAccountCommand extends SshCommand {
 	private void deleteSshKeys(List<String> sshKeys) {
 		IKeyManager keyManager = authenticator.getKeyManager();
 		if (sshKeys.contains(ALL)) {
-			keyManager.removeAllKey(user);
+			keyManager.removeAllKeys(user);
 		} else {
 			for (String sshKey : sshKeys) {
 				keyManager.removeKey(user, sshKey);