Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Move Economy API, MoneyHolder and WorthHolder to Economy package

  • Loading branch information...
commit 30c7a3af168357e9631a2309ad5487d6c40be5ec 1 parent d0d7128
authored March 14, 2012
4  Essentials/src/com/earth2me/essentials/Essentials.java
@@ -17,6 +17,8 @@
17 17
  */
18 18
 package com.earth2me.essentials;
19 19
 
  20
+import com.earth2me.essentials.economy.WorthHolder;
  21
+import com.earth2me.essentials.economy.Economy;
20 22
 import com.earth2me.essentials.backup.Backup;
21 23
 import static com.earth2me.essentials.I18n._;
22 24
 import com.earth2me.essentials.api.*;
@@ -162,7 +164,7 @@ public void onEnable()
162 164
 			warps = new Warps(this);
163 165
 			reloadList.add(warps);
164 166
 			execTimer.mark("Init(Spawn/Warp)");
165  
-			worth = new Worth(this);
  167
+			worth = new WorthHolder(this);
166 168
 			reloadList.add(worth);
167 169
 			itemDb = new ItemDb(this);
168 170
 			reloadList.add(itemDb);
3  Essentials/src/com/earth2me/essentials/Economy.java → .../src/com/earth2me/essentials/economy/Economy.java
... ...
@@ -1,9 +1,8 @@
1  
-package com.earth2me.essentials;
  1
+package com.earth2me.essentials.economy;
2 2
 
3 3
 import com.earth2me.essentials.utils.Util;
4 4
 import com.earth2me.essentials.api.*;
5 5
 import com.earth2me.essentials.permissions.Permissions;
6  
-import com.earth2me.essentials.settings.MoneyHolder;
7 6
 import java.util.HashMap;
8 7
 import java.util.Locale;
9 8
 import java.util.Map;
2  ...s/src/com/earth2me/essentials/settings/Money.java → ...ls/src/com/earth2me/essentials/economy/Money.java
... ...
@@ -1,4 +1,4 @@
1  
-package com.earth2me.essentials.settings;
  1
+package com.earth2me.essentials.economy;
2 2
 
3 3
 import com.earth2me.essentials.storage.MapValueType;
4 4
 import com.earth2me.essentials.storage.StorageObject;
2  ...com/earth2me/essentials/settings/MoneyHolder.java → .../com/earth2me/essentials/economy/MoneyHolder.java
... ...
@@ -1,4 +1,4 @@
1  
-package com.earth2me.essentials.settings;
  1
+package com.earth2me.essentials.economy;
2 2
 
3 3
 import com.earth2me.essentials.api.IEssentials;
4 4
 import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
2  ...s/src/com/earth2me/essentials/settings/Worth.java → ...ls/src/com/earth2me/essentials/economy/Worth.java
... ...
@@ -1,4 +1,4 @@
1  
-package com.earth2me.essentials.settings;
  1
+package com.earth2me.essentials.economy;
2 2
 
3 3
 import com.earth2me.essentials.storage.EnchantmentLevel;
4 4
 import com.earth2me.essentials.storage.MapKeyType;
8  Essentials/src/com/earth2me/essentials/Worth.java → .../com/earth2me/essentials/economy/WorthHolder.java
... ...
@@ -1,4 +1,4 @@
1  
-package com.earth2me.essentials;
  1
+package com.earth2me.essentials.economy;
2 2
 
3 3
 import com.earth2me.essentials.api.IEssentials;
4 4
 import com.earth2me.essentials.api.IWorth;
@@ -13,11 +13,11 @@
13 13
 import org.bukkit.material.MaterialData;
14 14
 
15 15
 
16  
-public class Worth extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Worth> implements IWorth
  16
+public class WorthHolder extends AsyncStorageObjectHolder<com.earth2me.essentials.economy.Worth> implements IWorth
17 17
 {
18  
-	public Worth(final IEssentials ess)
  18
+	public WorthHolder(final IEssentials ess)
19 19
 	{
20  
-		super(ess, com.earth2me.essentials.settings.Worth.class);
  20
+		super(ess, com.earth2me.essentials.economy.Worth.class);
21 21
 		onReload(false);
22 22
 	}
23 23
 
1  Essentials/src/com/earth2me/essentials/settings/Economy.java
... ...
@@ -1,5 +1,6 @@
1 1
 package com.earth2me.essentials.settings;
2 2
 
  3
+import com.earth2me.essentials.economy.Worth;
3 4
 import com.earth2me.essentials.storage.Comment;
4 5
 import com.earth2me.essentials.storage.MapValueType;
5 6
 import com.earth2me.essentials.storage.StorageObject;
3  Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java
... ...
@@ -1,5 +1,6 @@
1 1
 package com.earth2me.essentials;
2 2
 
  3
+import com.earth2me.essentials.economy.WorthHolder;
3 4
 import com.earth2me.essentials.storage.ManagedFile;
4 5
 import static com.earth2me.essentials.I18n._;
5 6
 import com.earth2me.essentials.api.IEssentials;
@@ -52,7 +53,7 @@ private void moveWorthValuesToWorthYml()
52 53
 			}
53 54
 			final EssentialsConf conf = new EssentialsConf(configFile);
54 55
 			conf.load();
55  
-			final Worth worth = new Worth(ess);
  56
+			final WorthHolder worth = new WorthHolder(ess);
56 57
 			boolean found = false;
57 58
 			for (Material mat : Material.values())
58 59
 			{

0 notes on commit 30c7a3a

Please sign in to comment.
Something went wrong with that request. Please try again.