From ca863b833220455d89533382dc7dee24de9f5a19 Mon Sep 17 00:00:00 2001 From: Chris Ward Date: Sat, 12 Jan 2013 15:05:50 +1100 Subject: Fix GM line endings --- .../anjocaido/groupmanager/events/GMUserEvent.java | 172 ++++++++++----------- .../groupmanager/events/GMWorldListener.java | 90 +++++------ .../events/GroupManagerEventHandler.java | 104 ++++++------- 3 files changed, 183 insertions(+), 183 deletions(-) (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/events') diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMUserEvent.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMUserEvent.java index 361e7d4cc..0a503cd9c 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMUserEvent.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMUserEvent.java @@ -1,87 +1,87 @@ -package org.anjocaido.groupmanager.events; - -import org.anjocaido.groupmanager.GroupManager; -import org.anjocaido.groupmanager.data.User; -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; - } - - ////////////////////////////// - - 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) { - - 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."); - } +package org.anjocaido.groupmanager.events; + +import org.anjocaido.groupmanager.GroupManager; +import org.anjocaido.groupmanager.data.User; +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; + } + + ////////////////////////////// + + 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) { + + 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 f7a7109ab..accb65acb 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java @@ -1,46 +1,46 @@ -package org.anjocaido.groupmanager.events; - -import org.anjocaido.groupmanager.GroupManager; -import org.bukkit.event.EventHandler; -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 - * - */ -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); - } - - @EventHandler(priority = EventPriority.LOWEST) - public void onWorldInit(WorldInitEvent event) { - - 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); - plugin.getWorldsHolder().loadWorld(worldName); - if (plugin.getWorldsHolder().isInList(worldName)) { - GroupManager.logger.info("Don't forget to configure/mirror this world in config.yml."); - } else - GroupManager.logger.severe("Failed to configure this world."); - } - } +package org.anjocaido.groupmanager.events; + +import org.anjocaido.groupmanager.GroupManager; +import org.bukkit.event.EventHandler; +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 + * + */ +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); + } + + @EventHandler(priority = EventPriority.LOWEST) + public void onWorldInit(WorldInitEvent event) { + + 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); + plugin.getWorldsHolder().loadWorld(worldName); + if (plugin.getWorldsHolder().isInList(worldName)) { + GroupManager.logger.info("Don't forget to configure/mirror this world in config.yml."); + } 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 5fc555cc4..43d42da53 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEventHandler.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEventHandler.java @@ -1,53 +1,53 @@ -package org.anjocaido.groupmanager.events; - -import org.anjocaido.groupmanager.data.Group; -import org.anjocaido.groupmanager.data.User; - -/** - * @author ElgarL - * - * 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)); - } +package org.anjocaido.groupmanager.events; + +import org.anjocaido.groupmanager.data.Group; +import org.anjocaido.groupmanager.data.User; + +/** + * @author ElgarL + * + * 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