From 5c44877c4cc757fc57da63ac4cb7d3bcc481f7a7 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sat, 28 Jan 2012 13:44:06 +0000 Subject: Organize Imports --- Essentials/src/com/earth2me/essentials/Kits.java | 2 -- Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java | 2 +- Essentials/src/com/earth2me/essentials/commands/Commandhome.java | 1 - Essentials/src/com/earth2me/essentials/commands/Commandmail.java | 2 +- Essentials/src/com/earth2me/essentials/commands/Commandme.java | 2 +- Essentials/src/com/earth2me/essentials/commands/Commandmsg.java | 2 +- Essentials/src/com/earth2me/essentials/commands/Commandnick.java | 2 +- Essentials/src/com/earth2me/essentials/commands/Commandr.java | 2 +- .../com/earth2me/essentials/register/payment/methods/VaultEco.java | 4 +--- Essentials/src/com/earth2me/essentials/settings/GroupsHolder.java | 5 ++++- Essentials/test/com/earth2me/essentials/FakeServer.java | 5 +---- Essentials/test/com/earth2me/essentials/UserTest.java | 7 +++---- 12 files changed, 15 insertions(+), 21 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/Kits.java b/Essentials/src/com/earth2me/essentials/Kits.java index 612ea5196..3c3e61a5d 100644 --- a/Essentials/src/com/earth2me/essentials/Kits.java +++ b/Essentials/src/com/earth2me/essentials/Kits.java @@ -9,8 +9,6 @@ import com.earth2me.essentials.storage.AsyncStorageObjectHolder; import java.io.File; import java.io.IOException; import java.util.*; -import java.util.logging.Logger; -import org.bukkit.Bukkit; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java b/Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java index 1622570a4..3226c3553 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; import com.earth2me.essentials.Util; +import com.earth2me.essentials.api.IUser; import java.util.logging.Level; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java index 17ac098e5..a30c1cc06 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java @@ -8,7 +8,6 @@ import java.util.List; import java.util.Locale; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.Server; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java index abd46b545..c570bb9a4 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; import com.earth2me.essentials.Util; +import com.earth2me.essentials.api.IUser; import java.util.List; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandme.java b/Essentials/src/com/earth2me/essentials/commands/Commandme.java index e657b833d..a71656e92 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandme.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandme.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.commands; import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; import com.earth2me.essentials.Util; +import com.earth2me.essentials.api.IUser; public class Commandme extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java b/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java index 4c0b0a76c..cd72c34f0 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java @@ -2,9 +2,9 @@ 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.api.IReplyTo; import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.Util; import java.util.List; import lombok.Cleanup; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java index add0a2129..76aecc2a1 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.commands; import static com.earth2me.essentials.I18n._; +import com.earth2me.essentials.Util; import com.earth2me.essentials.api.ISettings; import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.Util; import java.util.Locale; import lombok.Cleanup; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandr.java b/Essentials/src/com/earth2me/essentials/commands/Commandr.java index 3b20eb5de..06b8f59f6 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandr.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandr.java @@ -2,9 +2,9 @@ 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.api.IReplyTo; import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.Util; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java b/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java index 84ce816cf..eac0f6866 100644 --- a/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java +++ b/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java @@ -1,13 +1,11 @@ package com.earth2me.essentials.register.payment.methods; +import com.earth2me.essentials.register.payment.Method; import net.milkbowl.vault.Vault; import net.milkbowl.vault.economy.Economy; - import org.bukkit.plugin.Plugin; import org.bukkit.plugin.RegisteredServiceProvider; -import com.earth2me.essentials.register.payment.Method; - public class VaultEco implements Method { diff --git a/Essentials/src/com/earth2me/essentials/settings/GroupsHolder.java b/Essentials/src/com/earth2me/essentials/settings/GroupsHolder.java index 6928b2376..b04ea1433 100644 --- a/Essentials/src/com/earth2me/essentials/settings/GroupsHolder.java +++ b/Essentials/src/com/earth2me/essentials/settings/GroupsHolder.java @@ -8,7 +8,10 @@ import com.earth2me.essentials.api.IUser; import com.earth2me.essentials.storage.AsyncStorageObjectHolder; import java.io.File; import java.text.MessageFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; import java.util.Map.Entry; import lombok.Cleanup; diff --git a/Essentials/test/com/earth2me/essentials/FakeServer.java b/Essentials/test/com/earth2me/essentials/FakeServer.java index d54ca031a..e6a7d93ba 100644 --- a/Essentials/test/com/earth2me/essentials/FakeServer.java +++ b/Essentials/test/com/earth2me/essentials/FakeServer.java @@ -1,10 +1,7 @@ package com.earth2me.essentials; -import com.earth2me.essentials.craftbukkit.FakeWorld; import com.avaje.ebean.config.ServerConfig; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.craftbukkit.DummyOfflinePlayer; -import com.earth2me.essentials.user.User; +import com.earth2me.essentials.craftbukkit.FakeWorld; import java.io.File; import java.util.*; import java.util.concurrent.Callable; diff --git a/Essentials/test/com/earth2me/essentials/UserTest.java b/Essentials/test/com/earth2me/essentials/UserTest.java index d9cd5789d..c3daea21b 100644 --- a/Essentials/test/com/earth2me/essentials/UserTest.java +++ b/Essentials/test/com/earth2me/essentials/UserTest.java @@ -1,13 +1,12 @@ package com.earth2me.essentials; +import com.earth2me.essentials.api.IUser; +import com.earth2me.essentials.craftbukkit.DummyOfflinePlayer; +import com.earth2me.essentials.user.User; import java.io.IOException; import junit.framework.TestCase; -import org.bukkit.Location; import org.bukkit.World.Environment; import org.bukkit.plugin.InvalidDescriptionException; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.craftbukkit.DummyOfflinePlayer; -import com.earth2me.essentials.user.User; public class UserTest extends TestCase -- cgit v1.2.3