From a028abe03630c1990105f5dbfef5ba44bf11602d Mon Sep 17 00:00:00 2001 From: ElgarL Date: Fri, 13 Apr 2012 14:40:26 +0100 Subject: Update all code formatting to use tabs for indentation. --- .../groupmanager/events/GMGroupEvent.java | 105 ++++++++++---------- .../groupmanager/events/GMSystemEvent.java | 65 +++++++------ .../anjocaido/groupmanager/events/GMUserEvent.java | 107 +++++++++++---------- .../groupmanager/events/GMWorldListener.java | 24 ++--- .../events/GroupManagerEventHandler.java | 23 +++-- 5 files changed, 171 insertions(+), 153 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 fc9b8433b..af3fb6135 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMGroupEvent.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMGroupEvent.java @@ -6,79 +6,82 @@ import org.bukkit.Bukkit; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; - /** * @author ElgarL - * + * */ public class GMGroupEvent extends Event { - /** + /** * */ private static final HandlerList handlers = new HandlerList(); @Override public HandlerList getHandlers() { - return handlers; - } - - public static HandlerList getHandlerList() { - return handlers; - } - ////////////////////////////// + return handlers; + } + + public static HandlerList getHandlerList() { + + return handlers; + } + + ////////////////////////////// protected Group group; - + protected String groupName; - - protected Action action; - - public GMGroupEvent(Group group, Action action) { - super(); - - this.group = group; - this.action = action; - this.groupName = group.getName(); - } - - public GMGroupEvent(String groupName, Action action) { - super(); - - this.groupName = groupName; - this.action = action; - } - - public Action getAction(){ - return this.action; - } - - public Group getGroup() { - return group; - } - - 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) { + + protected Action action; + + public GMGroupEvent(Group group, Action action) { + + super(); + + this.group = group; + this.action = action; + this.groupName = group.getName(); + } + + public GMGroupEvent(String groupName, Action action) { + + super(); + + this.groupName = groupName; + this.action = action; + } + + public Action getAction() { + + return this.action; + } + + public Group getGroup() { + + return group; + } + + 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) { if (Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("GroupManager"), new Runnable() { @Override 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 210960876..d11581356 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMSystemEvent.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMSystemEvent.java @@ -5,57 +5,58 @@ import org.bukkit.Bukkit; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; - /** * @author ElgarL - * + * */ public class GMSystemEvent extends Event { - /** + /** * */ private static final HandlerList handlers = new HandlerList(); @Override public HandlerList getHandlers() { - return handlers; - } - - public static HandlerList getHandlerList() { - return handlers; - } - - ////////////////////////////// - + + return handlers; + } + + public static HandlerList getHandlerList() { + + return handlers; + } + + ////////////////////////////// + protected Action action; - - public GMSystemEvent(Action action) { - super(); - - this.action = action; - } - - public Action getAction(){ - return this.action; - } - - public enum Action { - RELOADED, - SAVED, - DEFAULT_GROUP_CHANGED, - VALIDATE_TOGGLE, - } - - public void schedule(final GMSystemEvent event) { + + public GMSystemEvent(Action action) { + + super(); + + this.action = action; + } + + public Action getAction() { + + return this.action; + } + + public enum Action { + RELOADED, SAVED, DEFAULT_GROUP_CHANGED, VALIDATE_TOGGLE, + } + + public void schedule(final GMSystemEvent event) { if (Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("GroupManager"), new Runnable() { @Override 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 206de8c86..361e7d4cc 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMUserEvent.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMUserEvent.java @@ -6,81 +6,82 @@ import org.bukkit.Bukkit; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; - /** * @author ElgarL - * + * */ public class GMUserEvent extends Event { - /** + /** * */ private static final HandlerList handlers = new HandlerList(); @Override public HandlerList getHandlers() { - return handlers; - } - - public static HandlerList getHandlerList() { - return handlers; - } - ////////////////////////////// + return handlers; + } + + public static HandlerList getHandlerList() { + + return handlers; + } + + ////////////////////////////// protected User user; - + protected String userName; - - protected Action action; - - public GMUserEvent(User user, Action action) { - super(); - - this.user = user; - this.action = action; - this.userName = user.getName(); - } - - public GMUserEvent(String userName, Action action) { - super(); - - this.userName = userName; - this.action = action; - } - - public Action getAction(){ - return this.action; - } - - public User getUser() { - return user; - } - - 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) { + + protected Action action; + + public GMUserEvent(User user, Action action) { + + super(); + + this.user = user; + this.action = action; + this.userName = user.getName(); + } + + public GMUserEvent(String userName, Action action) { + + super(); + + this.userName = userName; + this.action = action; + } + + public Action getAction() { + + return this.action; + } + + public User getUser() { + + return user; + } + + 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) { if (Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("GroupManager"), new Runnable() { @Override 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 fd1a9d7ff..f7a7109ab 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java @@ -6,31 +6,33 @@ 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 { - + private final GroupManager plugin; public GMWorldListener(GroupManager instance) { + plugin = instance; registerEvents(); } - + private void registerEvents() { - plugin.getServer().getPluginManager().registerEvents(this, plugin); - } - + + plugin.getServer().getPluginManager().registerEvents(this, plugin); + } + @EventHandler(priority = EventPriority.LOWEST) public void onWorldInit(WorldInitEvent event) { - String worldName = event.getWorld().getName(); - - if (GroupManager.isLoaded() && !plugin.getWorldsHolder().isInList(worldName)) { + + String worldName = event.getWorld().getName(); + + if (GroupManager.isLoaded() && !plugin.getWorldsHolder().isInList(worldName)) { GroupManager.logger.info("New world detected..."); GroupManager.logger.info("Creating data for: " + worldName); plugin.getWorldsHolder().setupWorldFolder(worldName); diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEventHandler.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEventHandler.java index 3a4d8d266..5fc555cc4 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEventHandler.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEventHandler.java @@ -3,40 +3,51 @@ 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) { + event.schedule(event); } + protected static void callEvent(GMUserEvent event) { + event.schedule(event); } + protected static void callEvent(GMSystemEvent event) { + event.schedule(event); } public static void callEvent(Group group, GMGroupEvent.Action action) { + callEvent(new GMGroupEvent(group, action)); } + public static void callEvent(String groupName, GMGroupEvent.Action action) { + callEvent(new GMGroupEvent(groupName, action)); } - + public static void callEvent(User user, GMUserEvent.Action action) { + callEvent(new GMUserEvent(user, action)); } + public static void callEvent(String userName, GMUserEvent.Action action) { + callEvent(new GMUserEvent(userName, action)); } - + public static void callEvent(GMSystemEvent.Action action) { + callEvent(new GMSystemEvent(action)); } } \ No newline at end of file -- cgit v1.2.3