From 8e54bf13b281d1299c3dc33f89940bd3a06d1a30 Mon Sep 17 00:00:00 2001 From: Iaccidentally Date: Mon, 14 Jan 2013 20:02:22 -0500 Subject: Remove Transient :: Formatting Cleanup --- .../dataholder/OverloadedWorldHolder.java | 131 +++++++++++++-------- 1 file changed, 82 insertions(+), 49 deletions(-) (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java') diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java index 84561b6e5..4bc32cb4e 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java @@ -10,22 +10,24 @@ import java.util.HashMap; import java.util.Map; import org.anjocaido.groupmanager.data.User; + /** - * + * * @author gabrielcouto */ -public class OverloadedWorldHolder extends WorldDataHolder { - +public class OverloadedWorldHolder extends WorldDataHolder +{ /** - * - */ + * + */ protected Map overloadedUsers = new HashMap(); /** - * + * * @param ph */ - public OverloadedWorldHolder(WorldDataHolder ph) { + public OverloadedWorldHolder(WorldDataHolder ph) + { super(ph.getName()); this.setGroupsFile(ph.getGroupsFile()); @@ -35,20 +37,23 @@ public class OverloadedWorldHolder extends WorldDataHolder { } /** - * + * * @param userName * @return user object or a new user if none exists. */ @Override - public User getUser(String userName) { + public User getUser(String userName) + { //OVERLOADED CODE String userNameLowered = userName.toLowerCase(); - if (overloadedUsers.containsKey(userNameLowered)) { + if (overloadedUsers.containsKey(userNameLowered)) + { return overloadedUsers.get(userNameLowered); } //END CODE - if (getUsers().containsKey(userNameLowered)) { + if (getUsers().containsKey(userNameLowered)) + { return getUsers().get(userNameLowered); } User newUser = createUser(userName); @@ -57,23 +62,28 @@ public class OverloadedWorldHolder extends WorldDataHolder { } /** - * + * * @param theUser */ @Override - public void addUser(User theUser) { + public void addUser(User theUser) + { - if (theUser.getDataSource() != this) { + if (theUser.getDataSource() != this) + { theUser = theUser.clone(this); } - if (theUser == null) { + if (theUser == null) + { return; } - if ((theUser.getGroup() == null) || (!getGroups().containsKey(theUser.getGroupName().toLowerCase()))) { + if ((theUser.getGroup() == null) || (!getGroups().containsKey(theUser.getGroupName().toLowerCase()))) + { theUser.setGroup(getDefaultGroup()); } //OVERLOADED CODE - if (overloadedUsers.containsKey(theUser.getName().toLowerCase())) { + if (overloadedUsers.containsKey(theUser.getName().toLowerCase())) + { overloadedUsers.remove(theUser.getName().toLowerCase()); overloadedUsers.put(theUser.getName().toLowerCase(), theUser); return; @@ -85,20 +95,23 @@ public class OverloadedWorldHolder extends WorldDataHolder { } /** - * + * * @param userName * @return true if removed/false if not found. */ @Override - public boolean removeUser(String userName) { + public boolean removeUser(String userName) + { //OVERLOADED CODE - if (overloadedUsers.containsKey(userName.toLowerCase())) { + if (overloadedUsers.containsKey(userName.toLowerCase())) + { overloadedUsers.remove(userName.toLowerCase()); return true; } //END CODE - if (getUsers().containsKey(userName.toLowerCase())) { + if (getUsers().containsKey(userName.toLowerCase())) + { getUsers().remove(userName.toLowerCase()); setUsersChanged(true); return true; @@ -107,25 +120,33 @@ public class OverloadedWorldHolder extends WorldDataHolder { } @Override - public boolean removeGroup(String groupName) { + public boolean removeGroup(String groupName) + { - if (groupName.equals(getDefaultGroup())) { + if (groupName.equals(getDefaultGroup())) + { return false; } - for (String key : getGroups().keySet()) { - if (groupName.equalsIgnoreCase(key)) { + for (String key : getGroups().keySet()) + { + if (groupName.equalsIgnoreCase(key)) + { getGroups().remove(key); - for (String userKey : getUsers().keySet()) { + for (String userKey : getUsers().keySet()) + { User user = getUsers().get(userKey); - if (user.getGroupName().equalsIgnoreCase(key)) { + if (user.getGroupName().equalsIgnoreCase(key)) + { user.setGroup(getDefaultGroup()); } } //OVERLOADED CODE - for (String userKey : overloadedUsers.keySet()) { + for (String userKey : overloadedUsers.keySet()) + { User user = overloadedUsers.get(userKey); - if (user.getGroupName().equalsIgnoreCase(key)) { + if (user.getGroupName().equalsIgnoreCase(key)) + { user.setGroup(getDefaultGroup()); } @@ -139,18 +160,23 @@ public class OverloadedWorldHolder extends WorldDataHolder { } /** - * + * * @return Collection of all users */ @Override - public Collection getUserList() { + public Collection getUserList() + { Collection overloadedList = new ArrayList(); Collection normalList = getUsers().values(); - for (User u : normalList) { - if (overloadedUsers.containsKey(u.getName().toLowerCase())) { + for (User u : normalList) + { + if (overloadedUsers.containsKey(u.getName().toLowerCase())) + { overloadedList.add(overloadedUsers.get(u.getName().toLowerCase())); - } else { + } + else + { overloadedList.add(u); } } @@ -158,25 +184,29 @@ public class OverloadedWorldHolder extends WorldDataHolder { } /** - * + * * @param userName * @return true if user is overloaded. */ - public boolean isOverloaded(String userName) { + public boolean isOverloaded(String userName) + { return overloadedUsers.containsKey(userName.toLowerCase()); } /** - * + * * @param userName */ - public void overloadUser(String userName) { + public void overloadUser(String userName) + { - if (!isOverloaded(userName)) { + if (!isOverloaded(userName)) + { User theUser = getUser(userName); theUser = theUser.clone(); - if (overloadedUsers.containsKey(theUser.getName().toLowerCase())) { + if (overloadedUsers.containsKey(theUser.getName().toLowerCase())) + { overloadedUsers.remove(theUser.getName().toLowerCase()); } overloadedUsers.put(theUser.getName().toLowerCase(), theUser); @@ -184,28 +214,31 @@ public class OverloadedWorldHolder extends WorldDataHolder { } /** - * + * * @param userName */ - public void removeOverload(String userName) { + public void removeOverload(String userName) + { overloadedUsers.remove(userName.toLowerCase()); } /** - * Gets the user in normal state. Surpassing the overload state. - * It doesn't affect permissions. But it enables plugins change the - * actual user permissions even in overload mode. - * + * Gets the user in normal state. Surpassing the overload state. It doesn't affect permissions. But it enables + * plugins change the actual user permissions even in overload mode. + * * @param userName * @return user object */ - public User surpassOverload(String userName) { + public User surpassOverload(String userName) + { - if (!isOverloaded(userName)) { + if (!isOverloaded(userName)) + { return getUser(userName); } - if (getUsers().containsKey(userName.toLowerCase())) { + if (getUsers().containsKey(userName.toLowerCase())) + { return getUsers().get(userName.toLowerCase()); } User newUser = createUser(userName); -- cgit v1.2.3