From 30c7a3af168357e9631a2309ad5487d6c40be5ec Mon Sep 17 00:00:00 2001 From: snowleo Date: Wed, 14 Mar 2012 03:33:41 +0100 Subject: [PATCH] Move Economy API, MoneyHolder and WorthHolder to Economy package --- Essentials/src/com/earth2me/essentials/Essentials.java | 4 +++- .../com/earth2me/essentials/{ => economy}/Economy.java | 3 +-- .../earth2me/essentials/{settings => economy}/Money.java | 2 +- .../essentials/{settings => economy}/MoneyHolder.java | 2 +- .../earth2me/essentials/{settings => economy}/Worth.java | 2 +- .../essentials/{Worth.java => economy/WorthHolder.java} | 8 ++++---- .../src/com/earth2me/essentials/settings/Economy.java | 1 + .../src/com/earth2me/essentials/EssentialsUpgrade.java | 3 ++- 8 files changed, 14 insertions(+), 11 deletions(-) rename Essentials/src/com/earth2me/essentials/{ => economy}/Economy.java (97%) rename Essentials/src/com/earth2me/essentials/{settings => economy}/Money.java (90%) rename Essentials/src/com/earth2me/essentials/{settings => economy}/MoneyHolder.java (91%) rename Essentials/src/com/earth2me/essentials/{settings => economy}/Worth.java (96%) rename Essentials/src/com/earth2me/essentials/{Worth.java => economy/WorthHolder.java} (89%) diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index e4db9b407..002e7e2ab 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -17,6 +17,8 @@ */ package com.earth2me.essentials; +import com.earth2me.essentials.economy.WorthHolder; +import com.earth2me.essentials.economy.Economy; import com.earth2me.essentials.backup.Backup; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.api.*; @@ -162,7 +164,7 @@ public class Essentials extends JavaPlugin implements IEssentials warps = new Warps(this); reloadList.add(warps); execTimer.mark("Init(Spawn/Warp)"); - worth = new Worth(this); + worth = new WorthHolder(this); reloadList.add(worth); itemDb = new ItemDb(this); reloadList.add(itemDb); diff --git a/Essentials/src/com/earth2me/essentials/Economy.java b/Essentials/src/com/earth2me/essentials/economy/Economy.java similarity index 97% rename from Essentials/src/com/earth2me/essentials/Economy.java rename to Essentials/src/com/earth2me/essentials/economy/Economy.java index 33a7d8c40..12bc9414c 100644 --- a/Essentials/src/com/earth2me/essentials/Economy.java +++ b/Essentials/src/com/earth2me/essentials/economy/Economy.java @@ -1,9 +1,8 @@ -package com.earth2me.essentials; +package com.earth2me.essentials.economy; import com.earth2me.essentials.utils.Util; import com.earth2me.essentials.api.*; import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.settings.MoneyHolder; import java.util.HashMap; import java.util.Locale; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/settings/Money.java b/Essentials/src/com/earth2me/essentials/economy/Money.java similarity index 90% rename from Essentials/src/com/earth2me/essentials/settings/Money.java rename to Essentials/src/com/earth2me/essentials/economy/Money.java index 7cc530857..ff081e609 100644 --- a/Essentials/src/com/earth2me/essentials/settings/Money.java +++ b/Essentials/src/com/earth2me/essentials/economy/Money.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.settings; +package com.earth2me.essentials.economy; import com.earth2me.essentials.storage.MapValueType; import com.earth2me.essentials.storage.StorageObject; diff --git a/Essentials/src/com/earth2me/essentials/settings/MoneyHolder.java b/Essentials/src/com/earth2me/essentials/economy/MoneyHolder.java similarity index 91% rename from Essentials/src/com/earth2me/essentials/settings/MoneyHolder.java rename to Essentials/src/com/earth2me/essentials/economy/MoneyHolder.java index 5ab216251..179e09210 100644 --- a/Essentials/src/com/earth2me/essentials/settings/MoneyHolder.java +++ b/Essentials/src/com/earth2me/essentials/economy/MoneyHolder.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.settings; +package com.earth2me.essentials.economy; import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.storage.AsyncStorageObjectHolder; diff --git a/Essentials/src/com/earth2me/essentials/settings/Worth.java b/Essentials/src/com/earth2me/essentials/economy/Worth.java similarity index 96% rename from Essentials/src/com/earth2me/essentials/settings/Worth.java rename to Essentials/src/com/earth2me/essentials/economy/Worth.java index 9487deb8f..c8f6a39ae 100644 --- a/Essentials/src/com/earth2me/essentials/settings/Worth.java +++ b/Essentials/src/com/earth2me/essentials/economy/Worth.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.settings; +package com.earth2me.essentials.economy; import com.earth2me.essentials.storage.EnchantmentLevel; import com.earth2me.essentials.storage.MapKeyType; diff --git a/Essentials/src/com/earth2me/essentials/Worth.java b/Essentials/src/com/earth2me/essentials/economy/WorthHolder.java similarity index 89% rename from Essentials/src/com/earth2me/essentials/Worth.java rename to Essentials/src/com/earth2me/essentials/economy/WorthHolder.java index 6b56850b1..598c22c4c 100644 --- a/Essentials/src/com/earth2me/essentials/Worth.java +++ b/Essentials/src/com/earth2me/essentials/economy/WorthHolder.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package com.earth2me.essentials.economy; import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.IWorth; @@ -13,11 +13,11 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.material.MaterialData; -public class Worth extends AsyncStorageObjectHolder implements IWorth +public class WorthHolder extends AsyncStorageObjectHolder implements IWorth { - public Worth(final IEssentials ess) + public WorthHolder(final IEssentials ess) { - super(ess, com.earth2me.essentials.settings.Worth.class); + super(ess, com.earth2me.essentials.economy.Worth.class); onReload(false); } diff --git a/Essentials/src/com/earth2me/essentials/settings/Economy.java b/Essentials/src/com/earth2me/essentials/settings/Economy.java index a92a5e6c7..ea106f13f 100644 --- a/Essentials/src/com/earth2me/essentials/settings/Economy.java +++ b/Essentials/src/com/earth2me/essentials/settings/Economy.java @@ -1,5 +1,6 @@ package com.earth2me.essentials.settings; +import com.earth2me.essentials.economy.Worth; import com.earth2me.essentials.storage.Comment; import com.earth2me.essentials.storage.MapValueType; import com.earth2me.essentials.storage.StorageObject; diff --git a/Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java b/Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java index 2ad1fbb4b..ccaa6e4a4 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java +++ b/Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java @@ -1,5 +1,6 @@ package com.earth2me.essentials; +import com.earth2me.essentials.economy.WorthHolder; import com.earth2me.essentials.storage.ManagedFile; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.api.IEssentials; @@ -52,7 +53,7 @@ public class EssentialsUpgrade } final EssentialsConf conf = new EssentialsConf(configFile); conf.load(); - final Worth worth = new Worth(ess); + final WorthHolder worth = new WorthHolder(ess); boolean found = false; for (Material mat : Material.values()) {