Move utils to new package

Essentials/src/com/earth2me/essentials/Economy.java

@@ -1,5 +1,6 @@
 package com.earth2me.essentials;
 
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.*;
 import com.earth2me.essentials.permissions.Permissions;
 import com.earth2me.essentials.settings.MoneyHolder;

Essentials/src/com/earth2me/essentials/Teleport.java

@@ -1,5 +1,6 @@
 package com.earth2me.essentials;
 
+import com.earth2me.essentials.utils.Util;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.ITeleport;

Essentials/src/com/earth2me/essentials/commands/Commandantioch.java

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import org.bukkit.Location;
 import org.bukkit.entity.TNTPrimed;

Essentials/src/com/earth2me/essentials/commands/Commandbalance.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.Permissions;
 import org.bukkit.command.CommandSender;

Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.textreader.ArrayListInput;
 import com.earth2me.essentials.textreader.TextPager;

Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import org.bukkit.Location;
 import org.bukkit.TreeType;

Essentials/src/com/earth2me/essentials/commands/Commandenchant.java

@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.Enchantments;
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.EnchantPermissions;
 import java.util.Locale;

Essentials/src/com/earth2me/essentials/commands/Commandhelp.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.textreader.*;
 import org.bukkit.command.CommandSender;

Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.Permissions;
 import java.util.logging.Level;

Essentials/src/com/earth2me/essentials/commands/Commandhome.java

@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.Permissions;
 import java.util.List;

Essentials/src/com/earth2me/essentials/commands/Commandjails.java

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import org.bukkit.command.CommandSender;
 
 

Essentials/src/com/earth2me/essentials/commands/Commandjump.java

@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import org.bukkit.Location;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

Essentials/src/com/earth2me/essentials/commands/Commandkit.java

@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.KitPermissions;
 import com.earth2me.essentials.settings.Kit;

Essentials/src/com/earth2me/essentials/commands/Commandlist.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.Permissions;

Essentials/src/com/earth2me/essentials/commands/Commandmail.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.Permissions;
 import java.util.List;

Essentials/src/com/earth2me/essentials/commands/Commandme.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.Permissions;
 

Essentials/src/com/earth2me/essentials/commands/Commandmsg.java

@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.Console;
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IReplyTo;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.Permissions;

Essentials/src/com/earth2me/essentials/commands/Commandmute.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.Permissions;
 import com.earth2me.essentials.user.UserData.TimestampType;

Essentials/src/com/earth2me/essentials/commands/Commandnick.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.Permissions;

Essentials/src/com/earth2me/essentials/commands/Commandping.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 
 

Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.Permissions;
 import java.util.ArrayList;

Essentials/src/com/earth2me/essentials/commands/Commandptime.java

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.DescParseTickFormat;
+import com.earth2me.essentials.utils.DescParseTickFormat;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.Permissions;

Essentials/src/com/earth2me/essentials/commands/Commandr.java

@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.Console;
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IReplyTo;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.Permissions;

Essentials/src/com/earth2me/essentials/commands/Commandrealname.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
 import java.util.Locale;

Essentials/src/com/earth2me/essentials/commands/Commandrepair.java

@@ -3,7 +3,7 @@ package com.earth2me.essentials.commands;
 import com.earth2me.essentials.api.ChargeException;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.Permissions;
 import java.util.ArrayList;

Essentials/src/com/earth2me/essentials/commands/Commandseen.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.Permissions;
 import com.earth2me.essentials.user.UserData.TimestampType;

Essentials/src/com/earth2me/essentials/commands/Commandsell.java

@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import java.util.Locale;

Essentials/src/com/earth2me/essentials/commands/Commandspawner.java

@@ -3,7 +3,7 @@ package com.earth2me.essentials.commands;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Mob;
 import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.SpawnerPermissions;
 import java.util.Locale;

Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java

@@ -3,7 +3,7 @@ package com.earth2me.essentials.commands;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Mob;
 import com.earth2me.essentials.Mob.MobException;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.SpawnmobPermissions;

Essentials/src/com/earth2me/essentials/commands/Commandsudo.java

@@ -3,7 +3,7 @@ package com.earth2me.essentials.commands;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.Permissions;
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.PluginCommand;
 

Essentials/src/com/earth2me/essentials/commands/Commandtempban.java

@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.Console;
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.Permissions;
 import com.earth2me.essentials.user.Ban;

Essentials/src/com/earth2me/essentials/commands/Commandtime.java

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.DescParseTickFormat;
+import com.earth2me.essentials.utils.DescParseTickFormat;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.Permissions;

Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.Permissions;
 import com.earth2me.essentials.user.UserData.TimestampType;

Essentials/src/com/earth2me/essentials/commands/Commandtree.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import org.bukkit.Location;
 import org.bukkit.TreeType;

Essentials/src/com/earth2me/essentials/commands/Commandwarp.java

@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.api.IWarps;
 import com.earth2me.essentials.permissions.Permissions;

Essentials/src/com/earth2me/essentials/commands/Commandwhois.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.Permissions;

Essentials/src/com/earth2me/essentials/commands/Commandworth.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IUser;
 import java.util.Locale;
 import org.bukkit.command.CommandSender;

Essentials/src/com/earth2me/essentials/listener/EssentialsBlockListener.java

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.listener;
 
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IUser;
 import org.bukkit.GameMode;

Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.listener;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;

Essentials/src/com/earth2me/essentials/permissions/AbstractSuperpermsPermission.java

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.permissions;
 
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IPermission;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.Permission;

Essentials/src/com/earth2me/essentials/permissions/Permissions.java

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.permissions;
 
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IPermission;
 import java.util.Locale;
 import org.bukkit.command.CommandSender;

Essentials/src/com/earth2me/essentials/ranks/GMGroups.java

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.ranks;
 
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IRanks;
 import com.earth2me.essentials.api.ISettings;

Essentials/src/com/earth2me/essentials/ranks/RanksStorage.java

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.ranks;
 
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IRanks;
 import com.earth2me.essentials.api.ISettings;

Essentials/src/com/earth2me/essentials/ranks/VaultGroups.java

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.ranks;
 
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IRanks;
 import com.earth2me.essentials.api.ISettings;

Essentials/src/com/earth2me/essentials/storage/StorageObjectMap.java

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.storage;
 
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.InvalidNameException;
 import com.google.common.cache.Cache;

Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.textreader;
 
-import com.earth2me.essentials.DescParseTickFormat;
+import com.earth2me.essentials.utils.DescParseTickFormat;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IUser;
 import java.text.DateFormat;

Essentials/src/com/earth2me/essentials/textreader/TextInput.java

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.textreader;
 
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.api.InvalidNameException;

Essentials/src/com/earth2me/essentials/user/User.java

@@ -4,7 +4,7 @@ import com.earth2me.essentials.api.ChargeException;
 import com.earth2me.essentials.Console;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Teleport;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.*;
 import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import com.earth2me.essentials.permissions.Permissions;

Essentials/src/com/earth2me/essentials/user/UserBase.java

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.user;
 
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.InvalidNameException;

Essentials/src/com/earth2me/essentials/utils/DescParseTickFormat.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials;
+package com.earth2me.essentials.utils;
 
 import static com.earth2me.essentials.I18n._;
 import java.text.SimpleDateFormat;

Essentials/src/com/earth2me/essentials/utils/Util.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials;
+package com.earth2me.essentials.utils;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IEssentials;
@@ -9,7 +9,6 @@ import com.earth2me.essentials.external.gnu.inet.encoding.PunycodeException;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.*;
-import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import lombok.Cleanup;

Essentials/test/com/earth2me/essentials/UtilTest.java

@@ -1,5 +1,6 @@
 package com.earth2me.essentials;
 
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.InvalidNameException;
 import java.io.IOException;
 import java.util.Calendar;

Essentials2Compat/src/com/earth2me/essentials/api/Economy.java

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.api;
 
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 
 
 /**

EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java

@@ -3,7 +3,7 @@ package com.earth2me.essentials.chat;
 import com.earth2me.essentials.api.ChargeException;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IRanks;
 import com.earth2me.essentials.api.ISettings;

EssentialsProtect/src/com/earth2me/essentials/protect/Permissions.java

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.protect;
 
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IPermission;
 import java.util.Locale;
 import org.bukkit.command.CommandSender;

EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java

@@ -3,7 +3,7 @@ package com.earth2me.essentials.signs;
 import com.earth2me.essentials.api.ChargeException;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IUser;
 import java.util.HashSet;

EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java

@@ -3,7 +3,7 @@ package com.earth2me.essentials.signs;
 import com.earth2me.essentials.api.ChargeException;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IUser;
 import java.util.*;

EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java

@@ -3,7 +3,7 @@ package com.earth2me.essentials.signs;
 import com.earth2me.essentials.api.ChargeException;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IUser;
 import org.bukkit.inventory.ItemStack;