From 7397d477cc5c775521f544dc1e497ad9c839ea24 Mon Sep 17 00:00:00 2001 From: David Dykstal Date: Tue, 13 Mar 2012 02:49:39 +0000 Subject: [PATCH] [225320] Renaming some private methods prior to adding code for secure storage. --- .../eclipse/rse/core/PasswordPersistenceManager.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/PasswordPersistenceManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/PasswordPersistenceManager.java index d0c57b48298..87fda795404 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/PasswordPersistenceManager.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/PasswordPersistenceManager.java @@ -252,7 +252,7 @@ public class PasswordPersistenceManager { } } - private boolean removePassword(Map passwords, String hostname, String userid) { + private boolean removeFromPasswordMap(Map passwords, String hostname, String userid) { boolean removed = false; String password = null; @@ -295,7 +295,7 @@ public class PasswordPersistenceManager { } - private String getPassword(Map passwords, String hostname, String userid) { + private String getFromPasswordMap(Map passwords, String hostname, String userid) { String password = null; String passwordKey = getPasswordKey(hostname, userid); @@ -375,10 +375,10 @@ public class PasswordPersistenceManager { if (passwords == null) { passwords = new HashMap(5); } - String oldPassword = getPassword(passwords, hostName, userId); + String oldPassword = getFromPasswordMap(passwords, hostName, userId); if (oldPassword != null) { if (overwrite) { - removePassword(passwords, hostName, userId); + removeFromPasswordMap(passwords, hostName, userId); } else { result = RC_ALREADY_EXISTS; } @@ -445,7 +445,7 @@ public class PasswordPersistenceManager { Map passwords = getPasswordMap(systemtype); if (passwords != null) { - String password = getPassword(passwords, hostname, userid); + String password = getFromPasswordMap(passwords, hostname, userid); if (password != null) { return new SystemSignonInformation(hostname, userid, password, systemtype); @@ -512,7 +512,7 @@ public class PasswordPersistenceManager { } Map passwords = getPasswordMap(systemType); if (passwords != null) { - if (removePassword(passwords, hostname, userid)) { + if (removeFromPasswordMap(passwords, hostname, userid)) { savePasswordMap(systemType.getId(), passwords); } }