From ba7ebe131992bd0109002741577bdf2cb4526256 Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Thu, 24 Jan 2013 22:53:02 -0500
Subject: [PATCH] Minor Database refactoring.

---
 .../java/com/gmail/nossr50/commands/mc/MctopCommand.java  | 2 +-
 .../com/gmail/nossr50/{util => database}/Database.java    | 3 ++-
 .../mc => database/commands}/McpurgeCommand.java          | 4 ++--
 .../mc => database/commands}/McremoveCommand.java         | 4 ++--
 .../general => database/commands}/MmoupdateCommand.java   | 2 +-
 .../java/com/gmail/nossr50/datatypes/PlayerProfile.java   | 2 +-
 src/main/java/com/gmail/nossr50/mcMMO.java                | 8 ++++----
 .../java/com/gmail/nossr50/runnables/McRankAsync.java     | 2 +-
 .../com/gmail/nossr50/runnables/SQLConversionTask.java    | 2 +-
 .../java/com/gmail/nossr50/runnables/SQLReconnect.java    | 2 +-
 .../java/com/gmail/nossr50/runnables/UserPurgeTask.java   | 2 +-
 .../java/com/gmail/nossr50/{util => skills}/Page.java     | 5 ++---
 src/main/java/com/gmail/nossr50/skills/SkillCommand.java  | 1 -
 13 files changed, 19 insertions(+), 20 deletions(-)
 rename src/main/java/com/gmail/nossr50/{util => database}/Database.java (99%)
 rename src/main/java/com/gmail/nossr50/{commands/mc => database/commands}/McpurgeCommand.java (89%)
 rename src/main/java/com/gmail/nossr50/{commands/mc => database/commands}/McremoveCommand.java (97%)
 rename src/main/java/com/gmail/nossr50/{commands/general => database/commands}/MmoupdateCommand.java (93%)
 rename src/main/java/com/gmail/nossr50/{util => skills}/Page.java (96%)

diff --git a/src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java
index ead008063..22a59bd22 100644
--- a/src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/mc/MctopCommand.java
@@ -10,10 +10,10 @@ import org.bukkit.command.CommandSender;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.database.Database;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.SkillType;
 import com.gmail.nossr50.skills.Skills;
-import com.gmail.nossr50.util.Database;
 import com.gmail.nossr50.util.Leaderboard;
 import com.gmail.nossr50.util.Misc;
 
diff --git a/src/main/java/com/gmail/nossr50/util/Database.java b/src/main/java/com/gmail/nossr50/database/Database.java
similarity index 99%
rename from src/main/java/com/gmail/nossr50/util/Database.java
rename to src/main/java/com/gmail/nossr50/database/Database.java
index 51e9c34aa..44cd9f541 100644
--- a/src/main/java/com/gmail/nossr50/util/Database.java
+++ b/src/main/java/com/gmail/nossr50/database/Database.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.util;
+package com.gmail.nossr50.database;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -21,6 +21,7 @@ import com.gmail.nossr50.runnables.SQLReconnect;
 import com.gmail.nossr50.skills.SkillType;
 import com.gmail.nossr50.spout.SpoutStuff;
 import com.gmail.nossr50.spout.huds.SpoutHud;
+import com.gmail.nossr50.util.Users;
 
 public class Database {
 
diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McpurgeCommand.java b/src/main/java/com/gmail/nossr50/database/commands/McpurgeCommand.java
similarity index 89%
rename from src/main/java/com/gmail/nossr50/commands/mc/McpurgeCommand.java
rename to src/main/java/com/gmail/nossr50/database/commands/McpurgeCommand.java
index 25fbc9b59..cf381ba72 100644
--- a/src/main/java/com/gmail/nossr50/commands/mc/McpurgeCommand.java
+++ b/src/main/java/com/gmail/nossr50/database/commands/McpurgeCommand.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.commands.mc;
+package com.gmail.nossr50.database.commands;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -7,8 +7,8 @@ import org.bukkit.command.CommandSender;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.database.Database;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Database;
 
 public class McpurgeCommand implements CommandExecutor{
     private Database database = mcMMO.getPlayerDatabase();
diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McremoveCommand.java b/src/main/java/com/gmail/nossr50/database/commands/McremoveCommand.java
similarity index 97%
rename from src/main/java/com/gmail/nossr50/commands/mc/McremoveCommand.java
rename to src/main/java/com/gmail/nossr50/database/commands/McremoveCommand.java
index e6f49db25..32ebb8511 100644
--- a/src/main/java/com/gmail/nossr50/commands/mc/McremoveCommand.java
+++ b/src/main/java/com/gmail/nossr50/database/commands/McremoveCommand.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.commands.mc;
+package com.gmail.nossr50.database.commands;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
@@ -12,8 +12,8 @@ import org.bukkit.command.CommandSender;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.database.Database;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Database;
 
 public class McremoveCommand implements CommandExecutor {
     private final String location;
diff --git a/src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java b/src/main/java/com/gmail/nossr50/database/commands/MmoupdateCommand.java
similarity index 93%
rename from src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java
rename to src/main/java/com/gmail/nossr50/database/commands/MmoupdateCommand.java
index d68d2429a..c763a633a 100644
--- a/src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java
+++ b/src/main/java/com/gmail/nossr50/database/commands/MmoupdateCommand.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.commands.general;
+package com.gmail.nossr50.database.commands;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
diff --git a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
index 71610a34f..3961480d7 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
@@ -9,6 +9,7 @@ import java.util.HashMap;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.database.Database;
 import com.gmail.nossr50.party.Party;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.skills.AbilityType;
@@ -17,7 +18,6 @@ import com.gmail.nossr50.skills.ToolType;
 import com.gmail.nossr50.spout.SpoutConfig;
 import com.gmail.nossr50.spout.huds.HudType;
 import com.gmail.nossr50.spout.huds.SpoutHud;
-import com.gmail.nossr50.util.Database;
 import com.gmail.nossr50.util.Misc;
 
 public class PlayerProfile {
diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java
index 3c5af6d84..bfec28b6b 100644
--- a/src/main/java/com/gmail/nossr50/mcMMO.java
+++ b/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -21,17 +21,14 @@ import com.gmail.nossr50.commands.general.AddxpCommand;
 import com.gmail.nossr50.commands.general.InspectCommand;
 import com.gmail.nossr50.commands.general.McstatsCommand;
 import com.gmail.nossr50.commands.general.MmoeditCommand;
-import com.gmail.nossr50.commands.general.MmoupdateCommand;
 import com.gmail.nossr50.commands.general.SkillResetCommand;
 import com.gmail.nossr50.commands.general.XprateCommand;
 import com.gmail.nossr50.commands.mc.McabilityCommand;
 import com.gmail.nossr50.commands.mc.MccCommand;
 import com.gmail.nossr50.commands.mc.McgodCommand;
 import com.gmail.nossr50.commands.mc.McmmoCommand;
-import com.gmail.nossr50.commands.mc.McpurgeCommand;
 import com.gmail.nossr50.commands.mc.McrankCommand;
 import com.gmail.nossr50.commands.mc.McrefreshCommand;
-import com.gmail.nossr50.commands.mc.McremoveCommand;
 import com.gmail.nossr50.commands.mc.MctopCommand;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
@@ -40,6 +37,10 @@ import com.gmail.nossr50.config.TreasuresConfig;
 import com.gmail.nossr50.config.mods.CustomArmorConfig;
 import com.gmail.nossr50.config.mods.CustomBlocksConfig;
 import com.gmail.nossr50.config.mods.CustomToolsConfig;
+import com.gmail.nossr50.database.Database;
+import com.gmail.nossr50.database.commands.McpurgeCommand;
+import com.gmail.nossr50.database.commands.McremoveCommand;
+import com.gmail.nossr50.database.commands.MmoupdateCommand;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.listeners.BlockListener;
 import com.gmail.nossr50.listeners.EntityListener;
@@ -81,7 +82,6 @@ import com.gmail.nossr50.spout.SpoutStart;
 import com.gmail.nossr50.spout.commands.MchudCommand;
 import com.gmail.nossr50.spout.commands.XplockCommand;
 import com.gmail.nossr50.util.Anniversary;
-import com.gmail.nossr50.util.Database;
 import com.gmail.nossr50.util.Leaderboard;
 import com.gmail.nossr50.util.Metrics;
 import com.gmail.nossr50.util.Metrics.Graph;
diff --git a/src/main/java/com/gmail/nossr50/runnables/McRankAsync.java b/src/main/java/com/gmail/nossr50/runnables/McRankAsync.java
index 48ad9c87e..1f878f3de 100644
--- a/src/main/java/com/gmail/nossr50/runnables/McRankAsync.java
+++ b/src/main/java/com/gmail/nossr50/runnables/McRankAsync.java
@@ -6,10 +6,10 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.database.Database;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.SkillType;
 import com.gmail.nossr50.skills.Skills;
-import com.gmail.nossr50.util.Database;
 
 public class McRankAsync implements Runnable {
     private Database database = mcMMO.getPlayerDatabase();
diff --git a/src/main/java/com/gmail/nossr50/runnables/SQLConversionTask.java b/src/main/java/com/gmail/nossr50/runnables/SQLConversionTask.java
index bf66f2c03..b32a4bbac 100644
--- a/src/main/java/com/gmail/nossr50/runnables/SQLConversionTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/SQLConversionTask.java
@@ -5,7 +5,7 @@ import java.io.FileReader;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.util.Database;
+import com.gmail.nossr50.database.Database;
 import com.gmail.nossr50.util.Misc;
 
 public class SQLConversionTask implements Runnable {
diff --git a/src/main/java/com/gmail/nossr50/runnables/SQLReconnect.java b/src/main/java/com/gmail/nossr50/runnables/SQLReconnect.java
index 4c52985bf..6a5b9e1bb 100644
--- a/src/main/java/com/gmail/nossr50/runnables/SQLReconnect.java
+++ b/src/main/java/com/gmail/nossr50/runnables/SQLReconnect.java
@@ -3,7 +3,7 @@ package com.gmail.nossr50.runnables;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.Database;
+import com.gmail.nossr50.database.Database;
 import com.gmail.nossr50.util.Users;
 
 public class SQLReconnect implements Runnable {
diff --git a/src/main/java/com/gmail/nossr50/runnables/UserPurgeTask.java b/src/main/java/com/gmail/nossr50/runnables/UserPurgeTask.java
index c829f2a79..4fdb81b01 100644
--- a/src/main/java/com/gmail/nossr50/runnables/UserPurgeTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/UserPurgeTask.java
@@ -2,7 +2,7 @@ package com.gmail.nossr50.runnables;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.util.Database;
+import com.gmail.nossr50.database.Database;
 
 public class UserPurgeTask implements Runnable {
     private Database database = mcMMO.getPlayerDatabase();
diff --git a/src/main/java/com/gmail/nossr50/util/Page.java b/src/main/java/com/gmail/nossr50/skills/Page.java
similarity index 96%
rename from src/main/java/com/gmail/nossr50/util/Page.java
rename to src/main/java/com/gmail/nossr50/skills/Page.java
index f17f33be0..132681971 100644
--- a/src/main/java/com/gmail/nossr50/util/Page.java
+++ b/src/main/java/com/gmail/nossr50/skills/Page.java
@@ -1,12 +1,11 @@
-package com.gmail.nossr50.util;
+package com.gmail.nossr50.skills;
 
 import java.util.ArrayList;
 
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.SkillType;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.util.Misc;
 
 public class Page {
 
diff --git a/src/main/java/com/gmail/nossr50/skills/SkillCommand.java b/src/main/java/com/gmail/nossr50/skills/SkillCommand.java
index d689d1f21..115baa60f 100644
--- a/src/main/java/com/gmail/nossr50/skills/SkillCommand.java
+++ b/src/main/java/com/gmail/nossr50/skills/SkillCommand.java
@@ -11,7 +11,6 @@ import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Page;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;