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 --- .../groupmanager/dataholder/WorldDataHolder.java | 874 ++++++++++++++------- 1 file changed, 589 insertions(+), 285 deletions(-) (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java') diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java index fefc698f9..df1c3c078 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java @@ -36,15 +36,15 @@ import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.SafeConstructor; import org.yaml.snakeyaml.reader.UnicodeReader; + /** - * One instance of this should exist per world/mirror - * it contains all functions to manage these data sets - * and points to the relevant users and groups objects. - * + * One instance of this should exist per world/mirror it contains all functions to manage these data sets and points to + * the relevant users and groups objects. + * * @author gabrielcouto, ElgarL */ -public class WorldDataHolder { - +public class WorldDataHolder +{ /** * World name */ @@ -58,28 +58,30 @@ public class WorldDataHolder { */ protected UsersDataHolder users = new UsersDataHolder(); /** - * - */ + * + */ protected AnjoPermissionsHandler permissionsHandler; /** * Prevent direct instantiation - * + * * @param worldName */ - public WorldDataHolder(String worldName) { + public WorldDataHolder(String worldName) + { name = worldName; } /** * The main constructor for a new WorldDataHolder - * + * * @param worldName * @param groups * @param users */ - public WorldDataHolder(String worldName, GroupsDataHolder groups, UsersDataHolder users) { + public WorldDataHolder(String worldName, GroupsDataHolder groups, UsersDataHolder users) + { this.name = worldName; this.groups = groups; @@ -90,25 +92,27 @@ public class WorldDataHolder { /** * update the dataSource to point to this object. - * + * * This should be called whenever a set of world data is fetched. */ - public void updateDataSource() { + public void updateDataSource() + { this.groups.setDataSource(this); this.users.setDataSource(this); } /** - * Search for a user. If it doesn't exist, create a new one with - * default group. - * + * Search for a user. If it doesn't exist, create a new one with default group. + * * @param userName the name of the user * @return class that manage that user permission */ - public User getUser(String userName) { + public User getUser(String userName) + { - if (getUsers().containsKey(userName.toLowerCase())) { + if (getUsers().containsKey(userName.toLowerCase())) + { return getUsers().get(userName.toLowerCase()); } User newUser = createUser(userName); @@ -117,154 +121,189 @@ public class WorldDataHolder { /** * Add a user to the list. If it already exists, overwrite the old. - * + * * @param theUser the user you want to add to the permission list */ - 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)) { + if ((theUser.getGroup() == null)) + { theUser.setGroup(groups.getDefaultGroup()); } removeUser(theUser.getName()); getUsers().put(theUser.getName().toLowerCase(), theUser); setUsersChanged(true); if (GroupManager.isLoaded()) + { GroupManagerEventHandler.callEvent(theUser, Action.USER_ADDED); + } } /** * Removes the user from the list. (he might become a default user) - * + * * @param userName the username from the user to remove * @return true if it had something to remove */ - public boolean removeUser(String userName) { + public boolean removeUser(String userName) + { - if (getUsers().containsKey(userName.toLowerCase())) { + if (getUsers().containsKey(userName.toLowerCase())) + { getUsers().remove(userName.toLowerCase()); setUsersChanged(true); if (GroupManager.isLoaded()) + { GroupManagerEventHandler.callEvent(userName, GMUserEvent.Action.USER_REMOVED); + } return true; } return false; } /** - * + * * @param userName * @return true if we have data for this player. */ - public boolean isUserDeclared(String userName) { + public boolean isUserDeclared(String userName) + { return getUsers().containsKey(userName.toLowerCase()); } /** * Change the default group of the file. - * + * * @param group the group you want make default. */ - public void setDefaultGroup(Group group) { + public void setDefaultGroup(Group group) + { - if (!getGroups().containsKey(group.getName().toLowerCase()) || (group.getDataSource() != this)) { + if (!getGroups().containsKey(group.getName().toLowerCase()) || (group.getDataSource() != this)) + { addGroup(group); } groups.setDefaultGroup(getGroup(group.getName())); setGroupsChanged(true); if (GroupManager.isLoaded()) + { GroupManagerEventHandler.callEvent(GMSystemEvent.Action.DEFAULT_GROUP_CHANGED); + } } /** * Returns the default group of the file - * + * * @return the default group */ - public Group getDefaultGroup() { + public Group getDefaultGroup() + { return groups.getDefaultGroup(); } /** * Returns a group of the given name - * + * * @param groupName the name of the group * @return a group if it is found. null if not found. */ - public Group getGroup(String groupName) { + public Group getGroup(String groupName) + { if (groupName.toLowerCase().startsWith("g:")) + { return GroupManager.getGlobalGroups().getGroup(groupName); + } else + { return getGroups().get(groupName.toLowerCase()); + } } /** - * Check if a group exists. - * Its the same of getGroup, but check if it is null. - * + * Check if a group exists. Its the same of getGroup, but check if it is null. + * * @param groupName the name of the group * @return true if exists. false if not. */ - public boolean groupExists(String groupName) { + public boolean groupExists(String groupName) + { if (groupName.toLowerCase().startsWith("g:")) + { return GroupManager.getGlobalGroups().hasGroup(groupName); + } else + { return getGroups().containsKey(groupName.toLowerCase()); + } } /** * Add a group to the list - * + * * @param groupToAdd */ - public void addGroup(Group groupToAdd) { + public void addGroup(Group groupToAdd) + { - if (groupToAdd.getName().toLowerCase().startsWith("g:")) { + if (groupToAdd.getName().toLowerCase().startsWith("g:")) + { GroupManager.getGlobalGroups().addGroup(groupToAdd); GroupManagerEventHandler.callEvent(groupToAdd, GMGroupEvent.Action.GROUP_ADDED); return; } - if (groupToAdd.getDataSource() != this) { + if (groupToAdd.getDataSource() != this) + { groupToAdd = groupToAdd.clone(this); } removeGroup(groupToAdd.getName()); getGroups().put(groupToAdd.getName().toLowerCase(), groupToAdd); setGroupsChanged(true); if (GroupManager.isLoaded()) + { GroupManagerEventHandler.callEvent(groupToAdd, GMGroupEvent.Action.GROUP_ADDED); + } } /** * Remove the group from the list - * + * * @param groupName - * @return true if had something to remove. false the group was default or - * non-existant + * @return true if had something to remove. false the group was default or non-existant */ - public boolean removeGroup(String groupName) { + public boolean removeGroup(String groupName) + { - if (groupName.toLowerCase().startsWith("g:")) { + if (groupName.toLowerCase().startsWith("g:")) + { return GroupManager.getGlobalGroups().removeGroup(groupName); } - if (getDefaultGroup() != null && groupName.equalsIgnoreCase(getDefaultGroup().getName())) { + if (getDefaultGroup() != null && groupName.equalsIgnoreCase(getDefaultGroup().getName())) + { return false; } - if (getGroups().containsKey(groupName.toLowerCase())) { + if (getGroups().containsKey(groupName.toLowerCase())) + { getGroups().remove(groupName.toLowerCase()); setGroupsChanged(true); if (GroupManager.isLoaded()) + { GroupManagerEventHandler.callEvent(groupName.toLowerCase(), GMGroupEvent.Action.GROUP_REMOVED); + } return true; } return false; @@ -272,15 +311,16 @@ public class WorldDataHolder { } /** - * Creates a new User with the given name - * and adds it to this holder. - * + * Creates a new User with the given name and adds it to this holder. + * * @param userName the username you want * @return null if user already exists. or new User */ - public User createUser(String userName) { + public User createUser(String userName) + { - if (getUsers().containsKey(userName.toLowerCase())) { + if (getUsers().containsKey(userName.toLowerCase())) + { return null; } User newUser = new User(this, userName); @@ -291,20 +331,22 @@ public class WorldDataHolder { } /** - * Creates a new Group with the given name - * and adds it to this holder - * + * Creates a new Group with the given name and adds it to this holder + * * @param groupName the groupname you want * @return null if group already exists. or new Group */ - public Group createGroup(String groupName) { + public Group createGroup(String groupName) + { - if (groupName.toLowerCase().startsWith("g:")) { + if (groupName.toLowerCase().startsWith("g:")) + { Group newGroup = new Group(groupName); return GroupManager.getGlobalGroups().newGroup(newGroup); } - if (getGroups().containsKey(groupName.toLowerCase())) { + if (getGroups().containsKey(groupName.toLowerCase())) + { return null; } @@ -315,19 +357,21 @@ public class WorldDataHolder { } /** - * + * * @return a collection of the groups */ - public Collection getGroupList() { + public Collection getGroupList() + { return getGroups().values(); } /** - * + * * @return a collection of the users */ - public Collection getUserList() { + public Collection getUserList() + { return getUsers().values(); } @@ -335,12 +379,16 @@ public class WorldDataHolder { /** * reads the file again */ - public void reload() { + public void reload() + { - try { + try + { reloadGroups(); reloadUsers(); - } catch (Exception ex) { + } + catch (Exception ex) + { Logger.getLogger(WorldDataHolder.class.getName()).log(Level.SEVERE, null, ex); } } @@ -348,17 +396,20 @@ public class WorldDataHolder { /** * Refresh Group data from file */ - public void reloadGroups() { + public void reloadGroups() + { GroupManager.setLoaded(false); - try { + try + { // temporary holder in case the load fails. WorldDataHolder ph = new WorldDataHolder(this.getName()); loadGroups(ph, getGroupsFile()); // transfer new data resetGroups(); - for (Group tempGroup : ph.getGroupList()) { + for (Group tempGroup : ph.getGroupList()) + { tempGroup.clone(this); } this.setDefaultGroup(getGroup(ph.getDefaultGroup().getName())); @@ -366,7 +417,9 @@ public class WorldDataHolder { this.setTimeStampGroups(getGroupsFile().lastModified()); ph = null; - } catch (Exception ex) { + } + catch (Exception ex) + { Logger.getLogger(WorldDataHolder.class.getName()).log(Level.WARNING, null, ex); } GroupManager.setLoaded(true); @@ -376,14 +429,17 @@ public class WorldDataHolder { /** * Refresh Users data from file */ - public void reloadUsers() { + public void reloadUsers() + { GroupManager.setLoaded(false); - try { + try + { // temporary holder in case the load fails. WorldDataHolder ph = new WorldDataHolder(this.getName()); // copy groups for reference - for (Group tempGroup : this.getGroupList()) { + for (Group tempGroup : this.getGroupList()) + { tempGroup.clone(ph); } // setup the default group before loading user data. @@ -391,30 +447,39 @@ public class WorldDataHolder { loadUsers(ph, getUsersFile()); // transfer new data resetUsers(); - for (User tempUser : ph.getUserList()) { + for (User tempUser : ph.getUserList()) + { tempUser.clone(this); } this.removeUsersChangedFlag(); this.setTimeStampUsers(getUsersFile().lastModified()); ph = null; - } catch (Exception ex) { + } + catch (Exception ex) + { Logger.getLogger(WorldDataHolder.class.getName()).log(Level.WARNING, null, ex); } GroupManager.setLoaded(true); GroupManagerEventHandler.callEvent(GMSystemEvent.Action.RELOADED); } - public void loadGroups(File groupsFile) { + public void loadGroups(File groupsFile) + { GroupManager.setLoaded(false); - try { + try + { setGroupsFile(groupsFile); loadGroups(this, groupsFile); - } catch (FileNotFoundException e) { + } + catch (FileNotFoundException e) + { e.printStackTrace(); throw new IllegalArgumentException("The file which should contain groups does not exist!\n" + groupsFile.getPath()); - } catch (IOException e) { + } + catch (IOException e) + { e.printStackTrace(); throw new IllegalArgumentException("Error access the groups file!\n" + groupsFile.getPath()); } @@ -422,16 +487,22 @@ public class WorldDataHolder { GroupManager.setLoaded(true); } - public void loadUsers(File usersFile) { + public void loadUsers(File usersFile) + { GroupManager.setLoaded(false); - try { + try + { setUsersFile(usersFile); loadUsers(this, usersFile); - } catch (FileNotFoundException e) { + } + catch (FileNotFoundException e) + { e.printStackTrace(); throw new IllegalArgumentException("The file which should contain users does not exist!\n" + usersFile.getPath()); - } catch (IOException e) { + } + catch (IOException e) + { e.printStackTrace(); throw new IllegalArgumentException("Error access the users file!\n" + usersFile.getPath()); } @@ -441,23 +512,28 @@ public class WorldDataHolder { /** * Returns a NEW data holder containing data read from the files - * + * * @param worldName * @param groupsFile * @param usersFile - * + * * @throws FileNotFoundException * @throws IOException */ - public static WorldDataHolder load(String worldName, File groupsFile, File usersFile) throws FileNotFoundException, IOException { + public static WorldDataHolder load(String worldName, File groupsFile, File usersFile) throws FileNotFoundException, IOException + { WorldDataHolder ph = new WorldDataHolder(worldName); GroupManager.setLoaded(false); if (groupsFile != null) + { loadGroups(ph, groupsFile); + } if (usersFile != null) + { loadUsers(ph, usersFile); + } GroupManager.setLoaded(true); return ph; @@ -465,33 +541,44 @@ public class WorldDataHolder { /** * Updates the WorldDataHolder from the Groups file - * + * * @param ph * @param groupsFile - * + * * @throws FileNotFoundException * @throws IOException */ - @SuppressWarnings({ "rawtypes", "unchecked" }) - protected static void loadGroups(WorldDataHolder ph, File groupsFile) throws FileNotFoundException, IOException { + @SuppressWarnings( + { + "rawtypes", "unchecked" + }) + protected static void loadGroups(WorldDataHolder ph, File groupsFile) throws FileNotFoundException, IOException + { // READ GROUPS FILE Yaml yamlGroups = new Yaml(new SafeConstructor()); Map groupsRootDataNode; - if (!groupsFile.exists()) { + if (!groupsFile.exists()) + { throw new IllegalArgumentException("The file which should contain groups does not exist!\n" + groupsFile.getPath()); } FileInputStream groupsInputStream = new FileInputStream(groupsFile); - try { - groupsRootDataNode = (Map) yamlGroups.load(new UnicodeReader(groupsInputStream)); - if (groupsRootDataNode == null) { + try + { + groupsRootDataNode = (Map)yamlGroups.load(new UnicodeReader(groupsInputStream)); + if (groupsRootDataNode == null) + { throw new NullPointerException(); } - } catch (Exception ex) { + } + catch (Exception ex) + { throw new IllegalArgumentException("The following file couldn't pass on Parser.\n" + groupsFile.getPath(), ex); - } finally { + } + finally + { groupsInputStream.close(); } @@ -503,9 +590,12 @@ public class WorldDataHolder { /* * Fetch all groups under the 'groups' entry. */ - try { - allGroupsNode = (Map) groupsRootDataNode.get("groups"); - } catch (Exception ex) { + try + { + allGroupsNode = (Map)groupsRootDataNode.get("groups"); + } + catch (Exception ex) + { throw new IllegalArgumentException("Your " + groupsFile.getPath() + " file is invalid. See console for details.", ex); } @@ -517,13 +607,17 @@ public class WorldDataHolder { * loop each group entry * and process it's data. */ - while (groupItr.hasNext()) { + while (groupItr.hasNext()) + { - try { + try + { groupCount++; // Attempt to fetch the next group name. groupKey = groupItr.next(); - } catch (Exception ex) { + } + catch (Exception ex) + { throw new IllegalArgumentException("Invalid group name for group entry (" + groupCount + ") in file: " + groupsFile.getPath(), ex); } @@ -532,9 +626,12 @@ public class WorldDataHolder { */ Map thisGroupNode = null; - try { - thisGroupNode = (Map) allGroupsNode.get(groupKey); - } catch (Exception ex) { + try + { + thisGroupNode = (Map)allGroupsNode.get(groupKey); + } + catch (Exception ex) + { throw new IllegalArgumentException("Invalid child nodes for group '" + groupKey + "' in file: " + groupsFile.getPath(), ex); } @@ -544,29 +641,37 @@ public class WorldDataHolder { */ Group thisGrp = ph.createGroup(groupKey); - if (thisGrp == null) { + if (thisGrp == null) + { throw new IllegalArgumentException("I think this Group was declared more than once: " + groupKey + " in file: " + groupsFile.getPath()); } // DEFAULT NODE Object nodeData = null; - try { + try + { nodeData = thisGroupNode.get("default"); - } catch (Exception ex) { + } + catch (Exception ex) + { throw new IllegalArgumentException("Bad format found in 'permissions' for group: " + groupKey + " in file: " + groupsFile.getPath()); } - if (nodeData == null) { + if (nodeData == null) + { /* * If no 'default' node is found do nothing. */ - } else if ((Boolean.parseBoolean(nodeData.toString()))) { + } + else if ((Boolean.parseBoolean(nodeData.toString()))) + { /* * Set this as the default group. * Warn if some other group has already claimed that position. */ - if (ph.getDefaultGroup() != null) { + if (ph.getDefaultGroup() != null) + { GroupManager.logger.warning("The group '" + thisGrp.getName() + "' is claiming to be default where '" + ph.getDefaultGroup().getName() + "' already was."); GroupManager.logger.warning("Overriding first default request in file: " + groupsFile.getPath()); } @@ -576,51 +681,73 @@ public class WorldDataHolder { // PERMISSIONS NODE nodeData = null; - try { + try + { nodeData = thisGroupNode.get("permissions"); - } catch (Exception ex) { + } + catch (Exception ex) + { throw new IllegalArgumentException("Bad format found in 'permissions' for '" + groupKey + "' in file: " + groupsFile.getPath()); } - if (nodeData == null) { + if (nodeData == null) + { /* * If no permissions node is found, or it's empty * do nothing. */ - } else { + } + else + { /* * There is a permission list Which seems to hold some data */ - if (nodeData instanceof List) { + if (nodeData instanceof List) + { /* * Check each entry and add it as a new permission. */ - try { - for (Object o : ((List) nodeData)) { - try { + try + { + for (Object o : ((List)nodeData)) + { + try + { /* * Only add this permission if it's not empty. */ if (!o.toString().isEmpty()) + { thisGrp.addPermission(o.toString()); + } - } catch (NullPointerException ex) { + } + catch (NullPointerException ex) + { // Ignore this entry as it's null. It can be // safely dropped } } - } catch (Exception ex) { + } + catch (Exception ex) + { throw new IllegalArgumentException("Invalid formatting found in 'permissions' section for group: " + thisGrp.getName() + " in file: " + groupsFile.getPath(), ex); } - } else if (nodeData instanceof String) { + } + else if (nodeData instanceof String) + { /* * Only add this permission if it's not empty. */ if (!nodeData.toString().isEmpty()) - thisGrp.addPermission((String) nodeData); + { + thisGrp.addPermission((String)nodeData); + } - } else { + } + else + { throw new IllegalArgumentException("Unknown type of 'permissions' node(Should be String or List) for group: " + thisGrp.getName() + " in file: " + groupsFile.getPath()); } /* @@ -633,13 +760,17 @@ public class WorldDataHolder { // INFO NODE nodeData = null; - try { + try + { nodeData = thisGroupNode.get("info"); - } catch (Exception ex) { + } + catch (Exception ex) + { throw new IllegalArgumentException("Bad format found in 'info' section for group: " + groupKey + " in file: " + groupsFile.getPath()); } - if (nodeData == null) { + if (nodeData == null) + { /* * No info section was found, so leave all variables as * defaults. @@ -647,75 +778,109 @@ public class WorldDataHolder { GroupManager.logger.warning("The group '" + thisGrp.getName() + "' has no 'info' section!"); GroupManager.logger.warning("Using default values: " + groupsFile.getPath()); - } else if (nodeData instanceof Map) { - try { - if (nodeData != null) { - thisGrp.setVariables((Map) nodeData); + } + else if (nodeData instanceof Map) + { + try + { + if (nodeData != null) + { + thisGrp.setVariables((Map)nodeData); } - } catch (Exception ex) { + } + catch (Exception ex) + { throw new IllegalArgumentException("Invalid formatting found in 'info' section for group: " + thisGrp.getName() + " in file: " + groupsFile.getPath(), ex); } - } else + } + else + { throw new IllegalArgumentException("Unknown entry found in 'info' section for group: " + thisGrp.getName() + " in file: " + groupsFile.getPath()); + } // INHERITANCE NODE nodeData = null; - try { + try + { nodeData = thisGroupNode.get("inheritance"); - } catch (Exception ex) { + } + catch (Exception ex) + { throw new IllegalArgumentException("Bad format found in 'inheritance' section for group: " + groupKey + " in file: " + groupsFile.getPath()); } - if (nodeData == null || nodeData instanceof List) { - if (nodeData == null) { + if (nodeData == null || nodeData instanceof List) + { + if (nodeData == null) + { /* * If no inheritance node is found, or it's empty * do nothing. */ - } else if (nodeData instanceof List) { - - try { - for (String grp : (List) nodeData) { - if (inheritance.get(groupKey) == null) { + } + else if (nodeData instanceof List) + { + + try + { + for (String grp : (List)nodeData) + { + if (inheritance.get(groupKey) == null) + { inheritance.put(groupKey, new ArrayList()); } inheritance.get(groupKey).add(grp); } - } catch (Exception ex) { + } + catch (Exception ex) + { throw new IllegalArgumentException("Invalid formatting found in 'inheritance' section for group: " + thisGrp.getName() + " in file: " + groupsFile.getPath(), ex); } } - } else + } + else + { throw new IllegalArgumentException("Unknown entry found in 'inheritance' section for group: " + thisGrp.getName() + " in file: " + groupsFile.getPath()); + } // END GROUP } - if (ph.getDefaultGroup() == null) { + if (ph.getDefaultGroup() == null) + { throw new IllegalArgumentException("There was no Default Group declared in file: " + groupsFile.getPath()); } /* * Build the inheritance map and recored any errors */ - for (String group : inheritance.keySet()) { + for (String group : inheritance.keySet()) + { List inheritedList = inheritance.get(group); Group thisGroup = ph.getGroup(group); if (thisGroup != null) - for (String inheritedKey : inheritedList) { - if (inheritedKey != null) { + { + for (String inheritedKey : inheritedList) + { + if (inheritedKey != null) + { Group inheritedGroup = ph.getGroup(inheritedKey); - if (inheritedGroup != null) { + if (inheritedGroup != null) + { thisGroup.addInherits(inheritedGroup); - } else + } + else + { GroupManager.logger.warning("Inherited group '" + inheritedKey + "' not found for group " + thisGroup.getName() + ". Ignoring entry in file: " + groupsFile.getPath()); + } } } + } } ph.removeGroupsChangedFlag(); @@ -728,31 +893,42 @@ public class WorldDataHolder { /** * Updates the WorldDataHolder from the Users file - * + * * @param ph * @param usersFile - * + * * @throws FileNotFoundException * @throws IOException */ - @SuppressWarnings({ "rawtypes", "unchecked" }) - protected static void loadUsers(WorldDataHolder ph, File usersFile) throws FileNotFoundException, IOException { + @SuppressWarnings( + { + "rawtypes", "unchecked" + }) + protected static void loadUsers(WorldDataHolder ph, File usersFile) throws FileNotFoundException, IOException + { // READ USERS FILE Yaml yamlUsers = new Yaml(new SafeConstructor()); Map usersRootDataNode; - if (!usersFile.exists()) { + if (!usersFile.exists()) + { throw new IllegalArgumentException("The file which should contain users does not exist!\n" + usersFile.getPath()); } FileInputStream usersInputStream = new FileInputStream(usersFile); - try { - usersRootDataNode = (Map) yamlUsers.load(new UnicodeReader(usersInputStream)); - if (usersRootDataNode == null) { + try + { + usersRootDataNode = (Map)yamlUsers.load(new UnicodeReader(usersInputStream)); + if (usersRootDataNode == null) + { throw new NullPointerException(); } - } catch (Exception ex) { + } + catch (Exception ex) + { throw new IllegalArgumentException("The following file couldn't pass on Parser.\n" + usersFile.getPath(), ex); - } finally { + } + finally + { usersInputStream.close(); } @@ -763,72 +939,101 @@ public class WorldDataHolder { /* * Fetch all child nodes under the 'users' entry. */ - try { - allUsersNode = (Map) usersRootDataNode.get("users"); - } catch (Exception ex) { + try + { + allUsersNode = (Map)usersRootDataNode.get("users"); + } + catch (Exception ex) + { throw new IllegalArgumentException("Your " + usersFile.getPath() + " file is invalid. See console for details.", ex); } // Load users if the file is NOT empty - if (allUsersNode != null) { + if (allUsersNode != null) + { Iterator usersItr = allUsersNode.keySet().iterator(); String usersKey; Integer userCount = 0; - while (usersItr.hasNext()) { - try { + while (usersItr.hasNext()) + { + try + { userCount++; // Attempt to fetch the next user name. usersKey = usersItr.next(); - } catch (Exception ex) { + } + catch (Exception ex) + { throw new IllegalArgumentException("Invalid node type for user entry (" + userCount + ") in file: " + usersFile.getPath(), ex); } Map thisUserNode = null; - try { - thisUserNode = (Map) allUsersNode.get(usersKey); - } catch (Exception ex) { + try + { + thisUserNode = (Map)allUsersNode.get(usersKey); + } + catch (Exception ex) + { throw new IllegalArgumentException("Bad format found for user: " + usersKey + " in file: " + usersFile.getPath()); } User thisUser = ph.createUser(usersKey); - if (thisUser == null) { + if (thisUser == null) + { throw new IllegalArgumentException("I think this user was declared more than once: " + usersKey + " in file: " + usersFile.getPath()); } // USER PERMISSIONS NODES Object nodeData = null; - try { + try + { nodeData = thisUserNode.get("permissions"); - } catch (Exception ex) { + } + catch (Exception ex) + { throw new IllegalArgumentException("Bad format found in 'permissions' for user: " + usersKey + " in file: " + usersFile.getPath()); } - if (nodeData == null) { + if (nodeData == null) + { /* * If no permissions node is found, or it's empty * do nothing. */ - } else { - if (nodeData instanceof List) { - for (Object o : ((List) nodeData)) { + } + else + { + if (nodeData instanceof List) + { + for (Object o : ((List)nodeData)) + { /* * Only add this permission if it's not empty */ if (!o.toString().isEmpty()) + { thisUser.addPermission(o.toString()); + } } - } else if (nodeData instanceof String) { - try { + } + else if (nodeData instanceof String) + { + try + { /* * Only add this permission if it's not empty */ if (!nodeData.toString().isEmpty()) + { thisUser.addPermission(nodeData.toString()); - } catch (NullPointerException e) { + } + } + catch (NullPointerException e) + { // Ignore this entry as it's null. } } @@ -838,31 +1043,46 @@ public class WorldDataHolder { // SUBGROUPS NODES nodeData = null; - try { + try + { nodeData = thisUserNode.get("subgroups"); - } catch (Exception ex) { + } + catch (Exception ex) + { throw new IllegalArgumentException("Bad format found in 'subgroups' for user: " + usersKey + " in file: " + usersFile.getPath()); } - if (nodeData == null) { + if (nodeData == null) + { /* * If no subgroups node is found, or it's empty * do nothing. */ - } else if (nodeData instanceof List) { - for (Object o : ((List) nodeData)) { + } + else if (nodeData instanceof List) + { + for (Object o : ((List)nodeData)) + { Group subGrp = ph.getGroup(o.toString()); - if (subGrp != null) { + if (subGrp != null) + { thisUser.addSubGroup(subGrp); - } else { + } + else + { GroupManager.logger.warning("Subgroup '" + o.toString() + "' not found for user: " + thisUser.getName() + ". Ignoring entry in file: " + usersFile.getPath()); } } - } else if (nodeData instanceof String) { + } + else if (nodeData instanceof String) + { Group subGrp = ph.getGroup(nodeData.toString()); - if (subGrp != null) { + if (subGrp != null) + { thisUser.addSubGroup(subGrp); - } else { + } + else + { GroupManager.logger.warning("Subgroup '" + nodeData.toString() + "' not found for user: " + thisUser.getName() + ". Ignoring entry in file: " + usersFile.getPath()); } } @@ -870,42 +1090,58 @@ public class WorldDataHolder { // USER INFO NODE nodeData = null; - try { + try + { nodeData = thisUserNode.get("info"); - } catch (Exception ex) { + } + catch (Exception ex) + { throw new IllegalArgumentException("Bad format found in 'info' section for user: " + usersKey + " in file: " + usersFile.getPath()); } - if (nodeData == null) { + if (nodeData == null) + { /* * If no info node is found, or it's empty * do nothing. */ - } else if (nodeData instanceof Map) { - thisUser.setVariables((Map) nodeData); + } + else if (nodeData instanceof Map) + { + thisUser.setVariables((Map)nodeData); - } else + } + else + { throw new IllegalArgumentException("Unknown entry found in 'info' section for user: " + thisUser.getName() + " in file: " + usersFile.getPath()); + } // END INFO NODE // PRIMARY GROUP nodeData = null; - try { + try + { nodeData = thisUserNode.get("group"); - } catch (Exception ex) { + } + catch (Exception ex) + { throw new IllegalArgumentException("Bad format found in 'group' section for user: " + usersKey + " in file: " + usersFile.getPath()); } - if (nodeData != null) { + if (nodeData != null) + { Group hisGroup = ph.getGroup(nodeData.toString()); - if (hisGroup == null) { + if (hisGroup == null) + { GroupManager.logger.warning("There is no group " + thisUserNode.get("group").toString() + ", as stated for player " + thisUser.getName() + ": Set to '" + ph.getDefaultGroup().getName() + "' for file: " + usersFile.getPath()); hisGroup = ph.getDefaultGroup(); } thisUser.setGroup(hisGroup); - } else { + } + else + { thisUser.setGroup(ph.getDefaultGroup()); } } @@ -919,24 +1155,27 @@ public class WorldDataHolder { /** * Write a dataHolder in a specified file - * + * * @param ph * @param groupsFile */ - public static void writeGroups(WorldDataHolder ph, File groupsFile) { + public static void writeGroups(WorldDataHolder ph, File groupsFile) + { Map root = new HashMap(); Map groupsMap = new HashMap(); root.put("groups", groupsMap); - for (String groupKey : ph.getGroups().keySet()) { + for (String groupKey : ph.getGroups().keySet()) + { Group group = ph.getGroups().get(groupKey); Map aGroupMap = new HashMap(); groupsMap.put(group.getName(), aGroupMap); - if (ph.getDefaultGroup() == null) { + if (ph.getDefaultGroup() == null) + { GroupManager.logger.severe("There is no default group for world: " + ph.getName()); } aGroupMap.put("default", group.equals(ph.getDefaultGroup())); @@ -944,7 +1183,8 @@ public class WorldDataHolder { Map infoMap = new HashMap(); aGroupMap.put("info", infoMap); - for (String infoKey : group.getVariables().getVarKeyList()) { + for (String infoKey : group.getVariables().getVarKeyList()) + { infoMap.put(infoKey, group.getVariables().getVarObject(infoKey)); } @@ -953,11 +1193,13 @@ public class WorldDataHolder { aGroupMap.put("permissions", group.getPermissionList()); } - if (!root.isEmpty()) { + if (!root.isEmpty()) + { DumperOptions opt = new DumperOptions(); opt.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); final Yaml yaml = new Yaml(opt); - try { + try + { OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(groupsFile), "UTF-8"); String newLine = System.getProperty("line.separator"); @@ -975,9 +1217,15 @@ public class WorldDataHolder { yaml.dump(root, out); out.close(); - } catch (UnsupportedEncodingException ex) { - } catch (FileNotFoundException ex) { - } catch (IOException e) { + } + catch (UnsupportedEncodingException ex) + { + } + catch (FileNotFoundException ex) + { + } + catch (IOException e) + { } } @@ -987,7 +1235,9 @@ public class WorldDataHolder { ph.removeGroupsChangedFlag(); if (GroupManager.isLoaded()) + { GroupManagerEventHandler.callEvent(GMSystemEvent.Action.SAVED); + } /* * FileWriter tx = null; @@ -1007,35 +1257,43 @@ public class WorldDataHolder { /** * Write a dataHolder in a specified file - * + * * @param ph * @param usersFile */ - public static void writeUsers(WorldDataHolder ph, File usersFile) { + public static void writeUsers(WorldDataHolder ph, File usersFile) + { Map root = new HashMap(); Map usersMap = new HashMap(); root.put("users", usersMap); - for (String userKey : ph.getUsers().keySet()) { + for (String userKey : ph.getUsers().keySet()) + { User user = ph.getUsers().get(userKey); - if ((user.getGroup() == null || user.getGroup().equals(ph.getDefaultGroup())) && user.getPermissionList().isEmpty() && user.getVariables().isEmpty() && user.isSubGroupsEmpty()) { + if ((user.getGroup() == null || user.getGroup().equals(ph.getDefaultGroup())) && user.getPermissionList().isEmpty() && user.getVariables().isEmpty() && user.isSubGroupsEmpty()) + { continue; } Map aUserMap = new HashMap(); usersMap.put(user.getName(), aUserMap); - if (user.getGroup() == null) { + if (user.getGroup() == null) + { aUserMap.put("group", ph.getDefaultGroup().getName()); - } else { + } + else + { aUserMap.put("group", user.getGroup().getName()); } // USER INFO NODE - BETA - if (user.getVariables().getSize() > 0) { + if (user.getVariables().getSize() > 0) + { Map infoMap = new HashMap(); aUserMap.put("info", infoMap); - for (String infoKey : user.getVariables().getVarKeyList()) { + for (String infoKey : user.getVariables().getVarKeyList()) + { infoMap.put(infoKey, user.getVariables().getVarObject(infoKey)); } } @@ -1047,17 +1305,25 @@ public class WorldDataHolder { // END SUBGROUPS NODE - BETA } - if (!root.isEmpty()) { + if (!root.isEmpty()) + { DumperOptions opt = new DumperOptions(); opt.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); final Yaml yaml = new Yaml(opt); - try { + try + { OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(usersFile), "UTF-8"); yaml.dump(root, out); out.close(); - } catch (UnsupportedEncodingException ex) { - } catch (FileNotFoundException ex) { - } catch (IOException e) { + } + catch (UnsupportedEncodingException ex) + { + } + catch (FileNotFoundException ex) + { + } + catch (IOException e) + { } } @@ -1067,7 +1333,9 @@ public class WorldDataHolder { ph.removeUsersChangedFlag(); if (GroupManager.isLoaded()) + { GroupManagerEventHandler.callEvent(GMSystemEvent.Action.SAVED); + } /* * FileWriter tx = null; @@ -1086,32 +1354,31 @@ public class WorldDataHolder { } /** - * Don't use this. Unless you want to make this plugin to interact with - * original Nijikokun Permissions - * This method is supposed to make the original one reload the file, and - * propagate the changes made here. - * - * Prefer to use the AnjoCaido's fake version of Nijikokun's Permission - * plugin. - * The AnjoCaido's Permission can propagate the changes made on this plugin - * instantly, - * without need to save the file. - * + * Don't use this. Unless you want to make this plugin to interact with original Nijikokun Permissions This method + * is supposed to make the original one reload the file, and propagate the changes made here. + * + * Prefer to use the AnjoCaido's fake version of Nijikokun's Permission plugin. The AnjoCaido's Permission can + * propagate the changes made on this plugin instantly, without need to save the file. + * * @param server the server that holds the plugin - * @deprecated it is not used anymore... unless if you use original - * Permissions + * @deprecated it is not used anymore... unless if you use original Permissions */ @Deprecated - public static void reloadOldPlugins(Server server) { + public static void reloadOldPlugins(Server server) + { // Only reload permissions PluginManager pm = server.getPluginManager(); Plugin[] plugins = pm.getPlugins(); - for (int i = 0; i < plugins.length; i++) { + for (int i = 0; i < plugins.length; i++) + { // plugins[i].getConfiguration().load(); - try { + try + { plugins[i].getClass().getMethod("setupPermissions").invoke(plugins[i]); - } catch (Exception ex) { + } + catch (Exception ex) + { continue; } } @@ -1120,9 +1387,11 @@ public class WorldDataHolder { /** * @return the permissionsHandler */ - public AnjoPermissionsHandler getPermissionsHandler() { + public AnjoPermissionsHandler getPermissionsHandler() + { - if (permissionsHandler == null) { + if (permissionsHandler == null) + { permissionsHandler = new AnjoPermissionsHandler(this); } return permissionsHandler; @@ -1131,22 +1400,27 @@ public class WorldDataHolder { /** * @param haveUsersChanged the haveUsersChanged to set */ - public void setUsersChanged(boolean haveUsersChanged) { + public void setUsersChanged(boolean haveUsersChanged) + { users.setUsersChanged(haveUsersChanged); } /** - * + * * @return true if any user data has changed */ - public boolean haveUsersChanged() { + public boolean haveUsersChanged() + { - if (users.HaveUsersChanged()) { + if (users.HaveUsersChanged()) + { return true; } - for (User u : users.getUsers().values()) { - if (u.isChanged()) { + for (User u : users.getUsers().values()) + { + if (u.isChanged()) + { return true; } } @@ -1156,22 +1430,27 @@ public class WorldDataHolder { /** * @param setGroupsChanged the haveGroupsChanged to set */ - public void setGroupsChanged(boolean setGroupsChanged) { + public void setGroupsChanged(boolean setGroupsChanged) + { groups.setGroupsChanged(setGroupsChanged); } /** - * + * * @return true if any group data has changed. */ - public boolean haveGroupsChanged() { + public boolean haveGroupsChanged() + { - if (groups.HaveGroupsChanged()) { + if (groups.HaveGroupsChanged()) + { return true; } - for (Group g : groups.getGroups().values()) { - if (g.isChanged()) { + for (Group g : groups.getGroups().values()) + { + if (g.isChanged()) + { return true; } } @@ -1179,23 +1458,27 @@ public class WorldDataHolder { } /** - * - */ - public void removeUsersChangedFlag() { + * + */ + public void removeUsersChangedFlag() + { setUsersChanged(false); - for (User u : getUsers().values()) { + for (User u : getUsers().values()) + { u.flagAsSaved(); } } /** - * - */ - public void removeGroupsChangedFlag() { + * + */ + public void removeGroupsChangedFlag() + { setGroupsChanged(false); - for (Group g : getGroups().values()) { + for (Group g : getGroups().values()) + { g.flagAsSaved(); } } @@ -1203,7 +1486,8 @@ public class WorldDataHolder { /** * @return the usersFile */ - public File getUsersFile() { + public File getUsersFile() + { return users.getUsersFile(); } @@ -1211,7 +1495,8 @@ public class WorldDataHolder { /** * @param file the usersFile to set */ - public void setUsersFile(File file) { + public void setUsersFile(File file) + { users.setUsersFile(file); } @@ -1219,7 +1504,8 @@ public class WorldDataHolder { /** * @return the groupsFile */ - public File getGroupsFile() { + public File getGroupsFile() + { return groups.getGroupsFile(); } @@ -1227,7 +1513,8 @@ public class WorldDataHolder { /** * @param file the groupsFile to set */ - public void setGroupsFile(File file) { + public void setGroupsFile(File file) + { groups.setGroupsFile(file); } @@ -1235,7 +1522,8 @@ public class WorldDataHolder { /** * @return the name */ - public String getName() { + public String getName() + { return name; } @@ -1243,7 +1531,8 @@ public class WorldDataHolder { /** * Resets Groups. */ - public void resetGroups() { + public void resetGroups() + { // setDefaultGroup(null); groups.setGroups(new HashMap()); @@ -1252,7 +1541,8 @@ public class WorldDataHolder { /** * Resets Users */ - public void resetUsers() { + public void resetUsers() + { users.setUsers(new HashMap()); } @@ -1260,7 +1550,8 @@ public class WorldDataHolder { /** * @return the groups */ - public Map getGroups() { + public Map getGroups() + { return groups.getGroups(); } @@ -1268,7 +1559,8 @@ public class WorldDataHolder { /** * @return the users */ - public Map getUsers() { + public Map getUsers() + { return users.getUsers(); } @@ -1276,7 +1568,8 @@ public class WorldDataHolder { /** * @return the groups */ - public GroupsDataHolder getGroupsObject() { + public GroupsDataHolder getGroupsObject() + { return groups; } @@ -1284,7 +1577,8 @@ public class WorldDataHolder { /** * @param groupsDataHolder the GroupsDataHolder to set */ - public void setGroupsObject(GroupsDataHolder groupsDataHolder) { + public void setGroupsObject(GroupsDataHolder groupsDataHolder) + { groups = groupsDataHolder; } @@ -1292,7 +1586,8 @@ public class WorldDataHolder { /** * @return the users */ - public UsersDataHolder getUsersObject() { + public UsersDataHolder getUsersObject() + { return users; } @@ -1300,7 +1595,8 @@ public class WorldDataHolder { /** * @param usersDataHolder the UsersDataHolder to set */ - public void setUsersObject(UsersDataHolder usersDataHolder) { + public void setUsersObject(UsersDataHolder usersDataHolder) + { users = usersDataHolder; } @@ -1308,7 +1604,8 @@ public class WorldDataHolder { /** * @return the timeStampGroups */ - public long getTimeStampGroups() { + public long getTimeStampGroups() + { return groups.getTimeStampGroups(); } @@ -1316,7 +1613,8 @@ public class WorldDataHolder { /** * @return the timeStampUsers */ - public long getTimeStampUsers() { + public long getTimeStampUsers() + { return users.getTimeStampUsers(); } @@ -1324,7 +1622,8 @@ public class WorldDataHolder { /** * @param timeStampGroups the timeStampGroups to set */ - protected void setTimeStampGroups(long timeStampGroups) { + protected void setTimeStampGroups(long timeStampGroups) + { groups.setTimeStampGroups(timeStampGroups); } @@ -1332,17 +1631,22 @@ public class WorldDataHolder { /** * @param timeStampUsers the timeStampUsers to set */ - protected void setTimeStampUsers(long timeStampUsers) { + protected void setTimeStampUsers(long timeStampUsers) + { users.setTimeStampUsers(timeStampUsers); } - public void setTimeStamps() { + public void setTimeStamps() + { if (getGroupsFile() != null) + { setTimeStampGroups(getGroupsFile().lastModified()); + } if (getUsersFile() != null) + { setTimeStampUsers(getUsersFile().lastModified()); + } } - } -- cgit v1.2.3