diff --git a/src/main/java/me/taylorkelly/mywarp/ConnectionManager.java b/src/main/java/me/taylorkelly/mywarp/ConnectionManager.java index e388e42db8..bbe96e064f 100644 --- a/src/main/java/me/taylorkelly/mywarp/ConnectionManager.java +++ b/src/main/java/me/taylorkelly/mywarp/ConnectionManager.java @@ -7,6 +7,7 @@ public class ConnectionManager { private static Connection conn; + private static final WarpLogger logger = WarpLogger.getLogger(); public static Connection initialize() { try { @@ -22,9 +23,9 @@ public static Connection initialize() { return conn; } } catch (SQLException ex) { - WarpLogger.severe("SQL exception on initialize", ex); + logger.severe("SQL exception on initialize", ex); } catch (ClassNotFoundException ex) { - WarpLogger.severe("You need the SQLite/MySQL library.", ex); + logger.severe("You need the SQLite/MySQL library.", ex); } return conn; } @@ -40,7 +41,7 @@ public static void closeConnection() { conn.close(); conn = null; } catch (SQLException ex) { - WarpLogger.severe("Error on Connection close", ex); + logger.severe("Error on Connection close", ex); } } } diff --git a/src/main/java/me/taylorkelly/mywarp/MWPlayerListener.java b/src/main/java/me/taylorkelly/mywarp/MWPlayerListener.java index f92af60c48..294586d0d5 100644 --- a/src/main/java/me/taylorkelly/mywarp/MWPlayerListener.java +++ b/src/main/java/me/taylorkelly/mywarp/MWPlayerListener.java @@ -1,7 +1,5 @@ package me.taylorkelly.mywarp; -import org.bukkit.Location; -import org.bukkit.Server; import org.bukkit.Chunk; import org.bukkit.World; import org.bukkit.block.Block; diff --git a/src/main/java/me/taylorkelly/mywarp/MyWarp.java b/src/main/java/me/taylorkelly/mywarp/MyWarp.java index 35b1e5e27a..cb2b2d7a33 100644 --- a/src/main/java/me/taylorkelly/mywarp/MyWarp.java +++ b/src/main/java/me/taylorkelly/mywarp/MyWarp.java @@ -7,7 +7,6 @@ import java.sql.Connection; import java.util.ArrayList; import java.util.logging.Level; -import java.util.logging.Logger; import me.taylorkelly.mywarp.griefcraft.Updater; @@ -28,7 +27,7 @@ public class MyWarp extends JavaPlugin { public String name; public String version; private Updater updater; - public static final Logger log = Logger.getLogger("Minecraft"); + public static final WarpLogger logger = WarpLogger.getLogger(); @Override public void onDisable() { @@ -47,7 +46,7 @@ public void onEnable() { Connection conn = ConnectionManager.initialize(); if (conn == null) { - log.log(Level.SEVERE, "[MYWARP] Could not establish SQL connection. Disabling MyWarp"); + logger.log(Level.SEVERE, "[MYWARP] Could not establish SQL connection. Disabling MyWarp"); getServer().getPluginManager().disablePlugin(this); return; } @@ -67,7 +66,7 @@ public void onEnable() { getServer().getPluginManager().registerEvent(Event.Type.PLAYER_TELEPORT, playerListener, Priority.Monitor, this); } - WarpLogger.info(name + " " + version + " enabled"); + logger.info(name + " " + version + " enabled"); } @@ -83,7 +82,7 @@ private void libCheck(){ private boolean sqlCheck() { Connection conn = ConnectionManager.initialize(); if (conn == null) { - WarpLogger.severe("Could not establish SQL connection. Disabling MyWarp"); + logger.severe("Could not establish SQL connection. Disabling MyWarp"); getServer().getPluginManager().disablePlugin(this); return false; } @@ -100,7 +99,7 @@ private void updateFiles(File oldDatabase, File newDatabase) { try { newDatabase.createNewFile(); } catch (IOException ex) { - WarpLogger.severe("Could not create new database file", ex); + logger.severe("Could not create new database file", ex); } copyFile(oldDatabase, newDatabase); } @@ -123,7 +122,7 @@ private static void copyFile(File fromFile, File toFile) { to.write(buffer, 0, bytesRead); } } catch (IOException ex) { - Logger.getLogger(MyWarp.class.getName()).log(Level.SEVERE, null, ex); + logger.log(Level.SEVERE, null, ex); } finally { if (from != null) { try { @@ -140,15 +139,19 @@ private static void copyFile(File fromFile, File toFile) { } } - private boolean warning; public boolean onCommand(CommandSender sender, Command command, String commandLabel, String[] args) { String[] split = args; String commandName = command.getName().toLowerCase(); - + String joinargs = ""; + for (String part : args) + { + joinargs +=";"+part; + } + logger.info("Executed command: " + command.getName() + " with Args: " + joinargs); if (sender instanceof Player) { Player player = (Player) sender; - if (commandName.equals("warp") || commandName.equals("mywarp") || commandName.equals("mw")) { + if (commandName.equals("warp")) { /** * /warp reload */ @@ -451,11 +454,11 @@ public static boolean isInteger(String string) { } public static void severe(String string, Exception ex) { - log.log(Level.SEVERE, "[MYHOME]" + string, ex); + logger.log(Level.SEVERE, "[MYHOME]" + string, ex); } public static void severe(String string) { - log.log(Level.SEVERE, "[MYHOME]" + string); + logger.log(Level.SEVERE, "[MYHOME]" + string); } } diff --git a/src/main/java/me/taylorkelly/mywarp/WarpDataSource.java b/src/main/java/me/taylorkelly/mywarp/WarpDataSource.java index 1dbd8693ea..34e927e2fb 100644 --- a/src/main/java/me/taylorkelly/mywarp/WarpDataSource.java +++ b/src/main/java/me/taylorkelly/mywarp/WarpDataSource.java @@ -9,10 +9,9 @@ import java.sql.Statement; import java.io.File; import java.util.HashMap; -import java.util.logging.Level; -import java.util.logging.Logger; public class WarpDataSource { + private static final WarpLogger logger = WarpLogger.getLogger(); public final static String sqlitedb = "/warps.db"; private final static String WARP_TABLE = "CREATE TABLE `warpTable` (" + "`id` INTEGER PRIMARY KEY," @@ -63,9 +62,9 @@ public static HashMap getMap() { Warp warp = new Warp(index, name, creator, world, x, y, z, yaw, pitch, publicAll, permissions, welcomeMessage); ret.put(name, warp); } - WarpLogger.info("[MYWARP]: " + size + " warps loaded"); + logger.info("[MYWARP]: " + size + " warps loaded"); } catch (SQLException ex) { - WarpLogger.severe("[MYWARP]: Warp Load Exception"); + logger.severe("[MYWARP]: Warp Load Exception"); } finally { try { if (statement != null) @@ -73,7 +72,7 @@ public static HashMap getMap() { if (set != null) set.close(); } catch (SQLException ex) { - WarpLogger.severe("[MYWARP]: Warp Load Exception (on close)"); + logger.severe("[MYWARP]: Warp Load Exception (on close)"); } } return ret; @@ -90,16 +89,14 @@ private static boolean tableExists() { return false; return true; } catch (SQLException ex) { - Logger log = Logger.getLogger("Minecraft"); - WarpLogger.severe("[MYWARP]: Table Check Exception", ex); + logger.severe("[MYWARP]: Table Check Exception", ex); return false; } finally { try { if (rs != null) rs.close(); } catch (SQLException ex) { - Logger log = Logger.getLogger("Minecraft"); - WarpLogger.severe("[MYWARP]: Table Check SQL Exception (on closing)"); + logger.severe("[MYWARP]: Table Check SQL Exception (on closing)"); } } } @@ -107,7 +104,7 @@ private static boolean tableExists() { private static void createTable() { Statement st = null; try { - WarpLogger.info("[MyWarp] Creating Database..."); + logger.info("[MyWarp] Creating Database..."); Connection conn = ConnectionManager.getConnection(); st = conn.createStatement(); st.executeUpdate(WARP_TABLE); @@ -116,7 +113,7 @@ private static void createTable() { if(WarpSettings.usemySQL){ // We need to set auto increment on SQL. String sql = "ALTER TABLE `warpTable` CHANGE `id` `id` INT NOT NULL AUTO_INCREMENT "; - WarpLogger.info("[MyWarp] Modifying database for MySQL support"); + logger.info("[MyWarp] Modifying database for MySQL support"); st = conn.createStatement(); st.executeUpdate(sql); conn.commit(); @@ -124,10 +121,10 @@ private static void createTable() { // Check for old warps.db and import to mysql File sqlitefile = new File(WarpSettings.dataDir.getAbsolutePath() + sqlitedb); if (!sqlitefile.exists()) { - WarpLogger.info("[MyWarp] Could not find old " + sqlitedb); + logger.info("[MyWarp] Could not find old " + sqlitedb); return; } else { - WarpLogger.info("[MyWarp] Trying to import warps from warps.db"); + logger.info("[MyWarp] Trying to import warps from warps.db"); Class.forName("org.sqlite.JDBC"); Connection sqliteconn = DriverManager.getConnection("jdbc:sqlite:" + WarpSettings.dataDir.getAbsolutePath() + sqlitedb); sqliteconn.setAutoCommit(false); @@ -152,10 +149,10 @@ private static void createTable() { Warp warp = new Warp(index, name, creator, world, x, y, z, yaw, pitch, publicAll, permissions, welcomeMessage); addWarp(warp); } - WarpLogger.info("[MyWarp] Imported " + size + " warps from " + sqlitedb); - WarpLogger.info("[MyWarp] Renaming " + sqlitedb + " to " + sqlitedb + ".old"); + logger.info("[MyWarp] Imported " + size + " warps from " + sqlitedb); + logger.info("[MyWarp] Renaming " + sqlitedb + " to " + sqlitedb + ".old"); if (!sqlitefile.renameTo(new File(WarpSettings.dataDir.getAbsolutePath(), sqlitedb + ".old"))) { - WarpLogger.warning("[MyWarp] Failed to rename " + sqlitedb + "! Please rename this manually!"); + logger.warning("[MyWarp] Failed to rename " + sqlitedb + "! Please rename this manually!"); } if (slstatement != null) { slstatement.close(); @@ -170,23 +167,22 @@ private static void createTable() { } } } catch (SQLException e) { - WarpLogger.severe("[MyWarp] Create Table Exception", e); + logger.severe("[MyWarp] Create Table Exception", e); } catch (ClassNotFoundException e) { - WarpLogger.severe("[MyWarp] You need the SQLite library.", e); + logger.severe("[MyWarp] You need the SQLite library.", e); } finally { try { if (st != null) { st.close(); } } catch (SQLException e) { - WarpLogger.severe("[MyWarp] Could not create the table (on close)"); + logger.severe("[MyWarp] Could not create the table (on close)"); } } } public static void addWarp(Warp warp) { PreparedStatement ps = null; - Logger log = Logger.getLogger("Minecraft"); try { Connection conn = ConnectionManager.getConnection(); @@ -207,14 +203,14 @@ public static void addWarp(Warp warp) { ps.executeUpdate(); conn.commit(); } catch (SQLException ex) { - WarpLogger.severe("[MYWARP]: Warp Insert Exception", ex); + logger.severe("[MYWARP]: Warp Insert Exception", ex); } finally { try { if (ps != null) { ps.close(); } } catch (SQLException ex) { - WarpLogger.severe("[MYWARP]: Warp Insert Exception (on close)", ex); + logger.severe("[MYWARP]: Warp Insert Exception (on close)", ex); } } } @@ -222,7 +218,6 @@ public static void addWarp(Warp warp) { public static void deleteWarp(Warp warp) { PreparedStatement ps = null; ResultSet set = null; - Logger log = Logger.getLogger("Minecraft"); try { Connection conn = ConnectionManager.getConnection(); @@ -231,17 +226,14 @@ public static void deleteWarp(Warp warp) { ps.executeUpdate(); conn.commit(); } catch (SQLException ex) { - WarpLogger.severe("[MYWARP]: Warp Delete Exception", ex); + logger.severe("[MYWARP]: Warp Delete Exception", ex); } finally { try { if (ps != null) { ps.close(); } - if (set != null) { - set.close(); - } } catch (SQLException ex) { - WarpLogger.severe("[MYWARP]: Warp Delete Exception (on close)", ex); + logger.severe("[MYWARP]: Warp Delete Exception (on close)", ex); } } } @@ -249,7 +241,6 @@ public static void deleteWarp(Warp warp) { public static void publicizeWarp(Warp warp, boolean publicAll) { PreparedStatement ps = null; ResultSet set = null; - Logger log = Logger.getLogger("Minecraft"); try { Connection conn = ConnectionManager.getConnection(); @@ -259,17 +250,14 @@ public static void publicizeWarp(Warp warp, boolean publicAll) { ps.executeUpdate(); conn.commit(); } catch (SQLException ex) { - WarpLogger.severe("[MYWARP]: Warp Publicize Exception", ex); + logger.severe("[MYWARP]: Warp Publicize Exception", ex); } finally { try { if (ps != null) { ps.close(); } - if (set != null) { - set.close(); - } } catch (SQLException ex) { - WarpLogger.severe("[MYWARP]: Warp Publicize Exception (on close)", ex); + logger.severe("[MYWARP]: Warp Publicize Exception (on close)", ex); } } } @@ -277,7 +265,6 @@ public static void publicizeWarp(Warp warp, boolean publicAll) { public static void updatePermissions(Warp warp) { PreparedStatement ps = null; ResultSet set = null; - Logger log = Logger.getLogger("Minecraft"); try { Connection conn = ConnectionManager.getConnection(); @@ -287,17 +274,14 @@ public static void updatePermissions(Warp warp) { ps.executeUpdate(); conn.commit(); } catch (SQLException ex) { - WarpLogger.severe("[MYWARP]: Warp Permissions Exception", ex); + logger.severe("[MYWARP]: Warp Permissions Exception", ex); } finally { try { if (ps != null) { ps.close(); } - if (set != null) { - set.close(); - } } catch (SQLException ex) { - WarpLogger.severe("[MYWARP]: Warp Permissions Exception (on close)", ex); + logger.severe("[MYWARP]: Warp Permissions Exception (on close)", ex); } } } @@ -305,7 +289,6 @@ public static void updatePermissions(Warp warp) { public static void updateCreator(Warp warp) { PreparedStatement ps = null; ResultSet set = null; - Logger log = Logger.getLogger("Minecraft"); try { Connection conn = ConnectionManager.getConnection(); @@ -316,17 +299,14 @@ public static void updateCreator(Warp warp) { conn.commit(); } catch (SQLException ex) { - WarpLogger.severe("[MYWARP]: Warp Creator Exception", ex); + logger.severe("[MYWARP]: Warp Creator Exception", ex); } finally { try { if (ps != null) { ps.close(); } - if (set != null) { - set.close(); - } } catch (SQLException ex) { - WarpLogger.severe("[MYWARP]: Warp Creator Exception (on close)", ex); + logger.severe("[MYWARP]: Warp Creator Exception (on close)", ex); } } } @@ -334,7 +314,6 @@ public static void updateCreator(Warp warp) { public static void updateWelcomeMessage(Warp warp) { PreparedStatement ps = null; ResultSet set = null; - Logger log = Logger.getLogger("Minecraft"); try { Connection conn = ConnectionManager.getConnection(); @@ -345,17 +324,14 @@ public static void updateWelcomeMessage(Warp warp) { conn.commit(); } catch (SQLException ex) { - WarpLogger.severe("[MYWARP]: Warp Creator Exception", ex); + logger.severe("[MYWARP]: Warp Creator Exception", ex); } finally { try { if (ps != null) { ps.close(); } - if (set != null) { - set.close(); - } } catch (SQLException ex) { - WarpLogger.severe("[MYWARP]: Warp Creator Exception (on close)", ex); + logger.severe("[MYWARP]: Warp Creator Exception (on close)", ex); } } } @@ -378,7 +354,7 @@ public static void updateDB(String test, String sqlite, String mysql) { statement.executeQuery(test); statement.close(); } catch(SQLException ex) { - WarpLogger.info("[MYWARP]: Updating database"); + logger.info("[MYWARP]: Updating database"); // Failed the test so we need to execute the updates try { String[] query; @@ -396,7 +372,7 @@ public static void updateDB(String test, String sqlite, String mysql) { conn.commit(); sqlst.close(); } catch (SQLException exc) { - WarpLogger.severe("[MYWARP]: Failed to update the database to the new version - ", exc); + logger.severe("[MYWARP]: Failed to update the database to the new version - ", exc); ex.printStackTrace(); } } @@ -405,7 +381,7 @@ public static void updateDB(String test, String sqlite, String mysql) { public static void updateFieldType(String field, String type) { try { if (!WarpSettings.usemySQL) return; - WarpLogger.info("[MYWARP]: Updating database"); + logger.info("[MYWARP]: Updating database"); Connection conn = ConnectionManager.getConnection(); DatabaseMetaData meta = conn.getMetaData(); @@ -427,7 +403,7 @@ public static void updateFieldType(String field, String type) { } colRS.close(); } catch(SQLException ex) { - WarpLogger.severe("[MYWARP]: Failed to update the database to the new version - ", ex); + logger.severe("[MYWARP]: Failed to update the database to the new version - ", ex); ex.printStackTrace(); } } diff --git a/src/main/java/me/taylorkelly/mywarp/WarpLogger.java b/src/main/java/me/taylorkelly/mywarp/WarpLogger.java new file mode 100644 index 0000000000..24a43f26a2 --- /dev/null +++ b/src/main/java/me/taylorkelly/mywarp/WarpLogger.java @@ -0,0 +1,56 @@ +package me.taylorkelly.mywarp; + +import java.util.logging.Level; +import java.util.logging.Logger; + +public class WarpLogger { + + private final Logger logger; + private final String pluginName; + private static WarpLogger instance; + + public synchronized static WarpLogger getLogger(){ + if (instance == null) + { + instance = new WarpLogger("MyWarp"); + } + return instance; + } + + private WarpLogger(String loggerName, String pluginName) { + this.logger = Logger.getLogger(loggerName); + this.pluginName = pluginName; + } + + private WarpLogger(String pluginName) { + this("minecraft", pluginName); + } + + private String formatMessage(String message) { + return "[" + pluginName + "]: " + message; + } + + public void info(String msg) { + this.logger.info(this.formatMessage(msg)); + } + + public void warning(String msg) { + this.logger.warning(this.formatMessage(msg)); + } + + public void severe(String msg) { + this.logger.severe(this.formatMessage(msg)); + } + + public void severe(String msg, Throwable exception) { + this.log(Level.SEVERE, msg, exception); + } + + public void log(Level level, String msg, Throwable exception) { + this.logger.log(level, this.formatMessage(msg), exception); + } + public void log(Level level, String msg) { + this.logger.log(level, this.formatMessage(msg)); + } + +} \ No newline at end of file diff --git a/src/main/java/me/taylorkelly/mywarp/WarpPermissions.java b/src/main/java/me/taylorkelly/mywarp/WarpPermissions.java index f4c02d3dda..032e6c9f9d 100644 --- a/src/main/java/me/taylorkelly/mywarp/WarpPermissions.java +++ b/src/main/java/me/taylorkelly/mywarp/WarpPermissions.java @@ -17,6 +17,7 @@ private enum PermissionHandler { } private static PermissionHandler handler; private static Plugin permissionPlugin; + private static final WarpLogger logger = WarpLogger.getLogger(); public static void initialize(Server server) { Plugin permissionsEx = server.getPluginManager().getPlugin("PermissionsEx"); @@ -27,12 +28,12 @@ public static void initialize(Server server) { permissionPlugin = permissionsEx; handler = PermissionHandler.PERMISSIONSEX; String version = permissionsEx.getDescription().getVersion(); - WarpLogger.info("Permissions enabled using: PermissionsEx v" + version); + logger.info("Permissions enabled using: PermissionsEx v" + version); } else if (groupManager != null) { permissionPlugin = groupManager; handler = PermissionHandler.GROUPMANAGER; String version = groupManager.getDescription().getVersion(); - WarpLogger.info("Permissions enabled using: GroupManager v" + version); + logger.info("Permissions enabled using: GroupManager v" + version); } else if (permissions != null) { permissionPlugin = permissions; String version = permissions.getDescription().getVersion(); @@ -41,17 +42,17 @@ public static void initialize(Server server) { } else { handler = PermissionHandler.PERMISSIONS; } - WarpLogger.info("Permissions enabled using: Permissions v" + version); + logger.info("Permissions enabled using: Permissions v" + version); } else { handler = PermissionHandler.NONE; - WarpLogger.warning("A permission plugin isn't loaded."); + logger.warning("A permission plugin isn't loaded."); } } public static boolean permission(Player player, String permission, boolean defaultPerm) { switch (handler) { case PERMISSIONSEX: - return ((PermissionsEx) permissionPlugin).getPermissionManager().has(player, permission); + return PermissionsEx.getPermissionManager().has(player, permission); case PERMISSIONS3: return ((Permissions) permissionPlugin).getHandler().has(player, permission); case PERMISSIONS: