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/events/GMGroupEvent.java | 51 +++++++++++++--------- .../groupmanager/events/GMSystemEvent.java | 40 ++++++++++------- .../anjocaido/groupmanager/events/GMUserEvent.java | 51 +++++++++++++--------- .../groupmanager/events/GMWorldListener.java | 31 ++++++++----- .../events/GroupManagerEventHandler.java | 35 +++++++++------ 5 files changed, 126 insertions(+), 82 deletions(-) (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/events') diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMGroupEvent.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMGroupEvent.java index af3fb6135..cb438335b 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMGroupEvent.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMGroupEvent.java @@ -6,37 +6,37 @@ import org.bukkit.Bukkit; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; + /** * @author ElgarL - * + * */ -public class GMGroupEvent extends Event { - +public class GMGroupEvent extends Event +{ /** - * + * */ private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public HandlerList getHandlers() + { return handlers; } - public static HandlerList getHandlerList() { + public static HandlerList getHandlerList() + { return handlers; } - ////////////////////////////// - protected Group group; - protected String groupName; - protected Action action; - public GMGroupEvent(Group group, Action action) { + public GMGroupEvent(Group group, Action action) + { super(); @@ -45,7 +45,8 @@ public class GMGroupEvent extends Event { this.groupName = group.getName(); } - public GMGroupEvent(String groupName, Action action) { + public GMGroupEvent(String groupName, Action action) + { super(); @@ -53,35 +54,43 @@ public class GMGroupEvent extends Event { this.action = action; } - public Action getAction() { + public Action getAction() + { return this.action; } - public Group getGroup() { + public Group getGroup() + { return group; } - public String getGroupName() { + public String getGroupName() + { return groupName; } - public enum Action { - GROUP_PERMISSIONS_CHANGED, GROUP_INHERITANCE_CHANGED, GROUP_INFO_CHANGED, GROUP_ADDED, GROUP_REMOVED, - } - public void schedule(final GMGroupEvent event) { + public enum Action + { + GROUP_PERMISSIONS_CHANGED, GROUP_INHERITANCE_CHANGED, GROUP_INFO_CHANGED, GROUP_ADDED, GROUP_REMOVED,} - if (Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("GroupManager"), new Runnable() { + public void schedule(final GMGroupEvent event) + { + if (Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("GroupManager"), new Runnable() + { @Override - public void run() { + public void run() + { Bukkit.getServer().getPluginManager().callEvent(event); } }, 1) == -1) + { GroupManager.logger.warning("Could not schedule GM Event."); + } } } \ No newline at end of file diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMSystemEvent.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMSystemEvent.java index d11581356..d7f2e276e 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMSystemEvent.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMSystemEvent.java @@ -5,58 +5,66 @@ import org.bukkit.Bukkit; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; + /** * @author ElgarL - * + * */ -public class GMSystemEvent extends Event { - +public class GMSystemEvent extends Event +{ /** - * + * */ private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public HandlerList getHandlers() + { return handlers; } - public static HandlerList getHandlerList() { + public static HandlerList getHandlerList() + { return handlers; } - ////////////////////////////// - protected Action action; - public GMSystemEvent(Action action) { + public GMSystemEvent(Action action) + { super(); this.action = action; } - public Action getAction() { + public Action getAction() + { return this.action; } - public enum Action { - RELOADED, SAVED, DEFAULT_GROUP_CHANGED, VALIDATE_TOGGLE, - } - public void schedule(final GMSystemEvent event) { + public enum Action + { + RELOADED, SAVED, DEFAULT_GROUP_CHANGED, VALIDATE_TOGGLE,} - if (Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("GroupManager"), new Runnable() { + public void schedule(final GMSystemEvent event) + { + if (Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("GroupManager"), new Runnable() + { @Override - public void run() { + public void run() + { Bukkit.getServer().getPluginManager().callEvent(event); } }, 1) == -1) + { GroupManager.logger.warning("Could not schedule GM Event."); + } } } \ No newline at end of file diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMUserEvent.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMUserEvent.java index 0a503cd9c..ed3f71c53 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMUserEvent.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMUserEvent.java @@ -6,37 +6,37 @@ import org.bukkit.Bukkit; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; + /** * @author ElgarL - * + * */ -public class GMUserEvent extends Event { - +public class GMUserEvent extends Event +{ /** - * + * */ private static final HandlerList handlers = new HandlerList(); @Override - public HandlerList getHandlers() { + public HandlerList getHandlers() + { return handlers; } - public static HandlerList getHandlerList() { + public static HandlerList getHandlerList() + { return handlers; } - ////////////////////////////// - protected User user; - protected String userName; - protected Action action; - public GMUserEvent(User user, Action action) { + public GMUserEvent(User user, Action action) + { super(); @@ -45,7 +45,8 @@ public class GMUserEvent extends Event { this.userName = user.getName(); } - public GMUserEvent(String userName, Action action) { + public GMUserEvent(String userName, Action action) + { super(); @@ -53,35 +54,43 @@ public class GMUserEvent extends Event { this.action = action; } - public Action getAction() { + public Action getAction() + { return this.action; } - public User getUser() { + public User getUser() + { return user; } - public String getUserName() { + public String getUserName() + { return userName; } - public enum Action { - USER_PERMISSIONS_CHANGED, USER_INHERITANCE_CHANGED, USER_INFO_CHANGED, USER_GROUP_CHANGED, USER_SUBGROUP_CHANGED, USER_ADDED, USER_REMOVED, - } - public void schedule(final GMUserEvent event) { + public enum Action + { + USER_PERMISSIONS_CHANGED, USER_INHERITANCE_CHANGED, USER_INFO_CHANGED, USER_GROUP_CHANGED, USER_SUBGROUP_CHANGED, USER_ADDED, USER_REMOVED,} - if (Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("GroupManager"), new Runnable() { + public void schedule(final GMUserEvent event) + { + if (Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("GroupManager"), new Runnable() + { @Override - public void run() { + public void run() + { Bukkit.getServer().getPluginManager().callEvent(event); } }, 1) == -1) + { GroupManager.logger.warning("Could not schedule GM Event."); + } } } \ No newline at end of file diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java index accb65acb..14e6dc43c 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java @@ -6,41 +6,50 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.world.WorldInitEvent; + /** * @author ElgarL - * - * Handle new world creation from other plugins - * + * + * Handle new world creation from other plugins + * */ -public class GMWorldListener implements Listener { - +public class GMWorldListener implements Listener +{ private final GroupManager plugin; - public GMWorldListener(GroupManager instance) { + public GMWorldListener(GroupManager instance) + { plugin = instance; registerEvents(); } - private void registerEvents() { + private void registerEvents() + { plugin.getServer().getPluginManager().registerEvents(this, plugin); } @EventHandler(priority = EventPriority.LOWEST) - public void onWorldInit(WorldInitEvent event) { + public void onWorldInit(WorldInitEvent event) + { String worldName = event.getWorld().getName(); - if (GroupManager.isLoaded() && !plugin.getWorldsHolder().isInList(worldName)) { + if (GroupManager.isLoaded() && !plugin.getWorldsHolder().isInList(worldName)) + { GroupManager.logger.info("New world detected..."); GroupManager.logger.info("Creating data for: " + worldName); plugin.getWorldsHolder().setupWorldFolder(worldName); plugin.getWorldsHolder().loadWorld(worldName); - if (plugin.getWorldsHolder().isInList(worldName)) { + if (plugin.getWorldsHolder().isInList(worldName)) + { GroupManager.logger.info("Don't forget to configure/mirror this world in config.yml."); - } else + } + else + { GroupManager.logger.severe("Failed to configure this world."); + } } } } \ No newline at end of file diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEventHandler.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEventHandler.java index 43d42da53..ee09cbda7 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEventHandler.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEventHandler.java @@ -3,50 +3,59 @@ package org.anjocaido.groupmanager.events; import org.anjocaido.groupmanager.data.Group; import org.anjocaido.groupmanager.data.User; + /** * @author ElgarL - * - * Handles all Event generation. - * + * + * Handles all Event generation. + * */ -public class GroupManagerEventHandler { - - protected static void callEvent(GMGroupEvent event) { +public class GroupManagerEventHandler +{ + protected static void callEvent(GMGroupEvent event) + { event.schedule(event); } - protected static void callEvent(GMUserEvent event) { + protected static void callEvent(GMUserEvent event) + { event.schedule(event); } - protected static void callEvent(GMSystemEvent event) { + protected static void callEvent(GMSystemEvent event) + { event.schedule(event); } - public static void callEvent(Group group, GMGroupEvent.Action action) { + public static void callEvent(Group group, GMGroupEvent.Action action) + { callEvent(new GMGroupEvent(group, action)); } - public static void callEvent(String groupName, GMGroupEvent.Action action) { + public static void callEvent(String groupName, GMGroupEvent.Action action) + { callEvent(new GMGroupEvent(groupName, action)); } - public static void callEvent(User user, GMUserEvent.Action action) { + public static void callEvent(User user, GMUserEvent.Action action) + { callEvent(new GMUserEvent(user, action)); } - public static void callEvent(String userName, GMUserEvent.Action action) { + public static void callEvent(String userName, GMUserEvent.Action action) + { callEvent(new GMUserEvent(userName, action)); } - public static void callEvent(GMSystemEvent.Action action) { + public static void callEvent(GMSystemEvent.Action action) + { callEvent(new GMSystemEvent(action)); } -- cgit v1.2.3