From fa3f4f92f4a2c9b043430a482b7df6729b803d3b Mon Sep 17 00:00:00 2001 From: Iaccidentally Date: Mon, 14 Jan 2013 20:38:11 -0500 Subject: Remove all instances of transient. (properly formatted this time!) --- Essentials/src/net/ess3/Essentials.java | 38 +++++++++++----------- Essentials/src/net/ess3/EssentialsTimer.java | 8 ++--- Essentials/src/net/ess3/I18n.java | 16 ++++----- Essentials/src/net/ess3/ItemDb.java | 6 ++-- Essentials/src/net/ess3/Jails.java | 2 +- Essentials/src/net/ess3/SpawnMob.java | 4 +-- Essentials/src/net/ess3/backup/Backup.java | 12 +++---- .../src/net/ess3/commands/Commandbalancetop.java | 8 ++--- .../src/net/ess3/commands/Commanddelhome.java | 2 +- .../src/net/ess3/commands/Commandessentials.java | 2 +- Essentials/src/net/ess3/commands/Commandgive.java | 2 +- Essentials/src/net/ess3/commands/Commandhome.java | 2 +- Essentials/src/net/ess3/commands/Commanditem.java | 2 +- .../src/net/ess3/commands/Commandsethome.java | 2 +- .../src/net/ess3/commands/EssentialsCommand.java | 12 +++---- .../ess3/commands/EssentialsCommandHandler.java | 18 +++++----- Essentials/src/net/ess3/economy/Trade.java | 12 +++---- .../net/ess3/listener/EssentialsBlockListener.java | 2 +- .../ess3/listener/EssentialsEntityListener.java | 2 +- .../ess3/listener/EssentialsPlayerListener.java | 6 ++-- .../ess3/listener/EssentialsPluginListener.java | 2 +- .../src/net/ess3/metrics/MetricsListener.java | 4 +-- .../src/net/ess3/metrics/MetricsStarter.java | 2 +- .../src/net/ess3/permissions/Permissions.java | 2 +- Essentials/src/net/ess3/ranks/GMGroups.java | 4 +-- Essentials/src/net/ess3/settings/Economy.java | 2 +- .../src/net/ess3/settings/SettingsHolder.java | 2 +- Essentials/src/net/ess3/settings/SpawnsHolder.java | 6 ++-- .../storage/AbstractDelayedYamlFileReader.java | 4 +-- .../storage/AbstractDelayedYamlFileWriter.java | 4 +-- .../net/ess3/storage/AsyncStorageObjectHolder.java | 14 ++++---- .../src/net/ess3/storage/BukkitConstructor.java | 6 ++-- Essentials/src/net/ess3/storage/ManagedFile.java | 2 +- .../src/net/ess3/storage/StorageObjectMap.java | 10 +++--- Essentials/src/net/ess3/storage/StorageQueue.java | 2 +- .../src/net/ess3/storage/YamlStorageReader.java | 8 ++--- .../src/net/ess3/storage/YamlStorageWriter.java | 6 ++-- Essentials/src/net/ess3/user/User.java | 18 +++++----- Essentials/src/net/ess3/utils/ExecuteTimer.java | 4 +-- Essentials/src/net/ess3/utils/FormatUtil.java | 18 +++++----- .../net/ess3/utils/textreader/ArrayListInput.java | 2 +- .../src/net/ess3/utils/textreader/HelpInput.java | 6 ++-- .../net/ess3/utils/textreader/KeywordReplacer.java | 6 ++-- .../net/ess3/utils/textreader/SimpleTextInput.java | 2 +- .../net/ess3/utils/textreader/SimpleTextPager.java | 2 +- .../src/net/ess3/utils/textreader/TextInput.java | 8 ++--- .../src/net/ess3/utils/textreader/TextPager.java | 4 +-- Essentials/test/net/ess3/EssentialsTest.java | 12 +++---- .../com/earth2me/essentials/EssentialsConf.java | 6 ++-- .../src/com/earth2me/essentials/Settings.java | 4 +-- .../src/com/earth2me/essentials/UserData.java | 2 +- .../net/ess3/antibuild/EssentialsAntiBuild.java | 4 +-- .../antibuild/EssentialsAntiBuildListener.java | 4 +-- .../src/net/ess3/antibuild/EssentialsConnect.java | 4 +-- .../src/net/ess3/antibuild/Permissions.java | 2 +- EssentialsChat/src/net/ess3/chat/ChatStore.java | 6 ++-- .../src/net/ess3/chat/EssentialsChatPlayer.java | 6 ++-- .../chat/EssentialsLocalChatEventListener.java | 4 +-- .../src/net/ess3/geoip/ConfigHolder.java | 2 +- .../ess3/geoip/EssentialsGeoIPPlayerListener.java | 10 +++--- .../src/net/ess3/protect/EssentialsConnect.java | 4 +-- .../src/net/ess3/protect/EssentialsProtect.java | 4 +-- .../protect/EssentialsProtectBlockListener.java | 2 +- .../protect/EssentialsProtectEntityListener.java | 2 +- .../protect/EssentialsProtectWeatherListener.java | 2 +- .../src/net/ess3/protect/Permissions.java | 2 +- .../src/net/ess3/signs/EssentialsSign.java | 10 +++--- .../src/net/ess3/signs/EssentialsSignsPlugin.java | 4 +-- .../src/net/ess3/signs/SignsConfigHolder.java | 2 +- .../ess3/signs/listeners/SignBlockListener.java | 4 +-- .../ess3/signs/listeners/SignEntityListener.java | 4 +-- .../ess3/signs/listeners/SignPlayerListener.java | 4 +-- .../src/net/ess3/update/AbstractWorkListener.java | 4 +-- .../src/net/ess3/update/EssentialsHelp.java | 10 +++--- .../src/net/ess3/update/EssentialsUpdate.java | 4 +-- EssentialsUpdate/src/net/ess3/update/GetFile.java | 4 +-- .../src/net/ess3/update/ModuleInfo.java | 6 ++-- .../src/net/ess3/update/PastieUpload.java | 2 +- .../src/net/ess3/update/PostToUrl.java | 6 ++-- .../src/net/ess3/update/UpdateCheck.java | 14 ++++---- .../src/net/ess3/update/UpdateFile.java | 6 ++-- .../src/net/ess3/update/UpdateProcess.java | 8 ++--- EssentialsUpdate/src/net/ess3/update/Version.java | 8 ++--- .../src/net/ess3/update/VersionInfo.java | 8 ++--- .../net/ess3/update/chat/AbstractFileCommand.java | 2 +- .../src/net/ess3/update/chat/ErrorsCommand.java | 2 +- .../src/net/ess3/update/chat/IrcBot.java | 6 ++-- .../src/net/ess3/update/chat/StartupCommand.java | 4 +-- .../src/net/ess3/update/states/AbstractState.java | 4 +-- .../net/ess3/update/states/AbstractYesNoState.java | 4 +-- .../src/net/ess3/update/states/Changelog.java | 8 ++--- .../src/net/ess3/update/states/StateMachine.java | 10 +++--- .../ess3/update/states/UpdateOrInstallation.java | 4 +-- .../src/net/ess3/update/tasks/InstallModule.java | 6 ++-- .../src/net/ess3/update/tasks/SelfUpdate.java | 2 +- .../src/net/ess3/xmpp/EssentialsXMPP.java | 8 ++--- .../ess3/xmpp/EssentialsXMPPPlayerListener.java | 2 +- EssentialsXMPP/src/net/ess3/xmpp/UserManager.java | 6 ++-- EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java | 22 ++++++------- 99 files changed, 294 insertions(+), 294 deletions(-) diff --git a/Essentials/src/net/ess3/Essentials.java b/Essentials/src/net/ess3/Essentials.java index 3bbe79411..c1c506a9b 100644 --- a/Essentials/src/net/ess3/Essentials.java +++ b/Essentials/src/net/ess3/Essentials.java @@ -49,34 +49,34 @@ import org.bukkit.plugin.InvalidDescriptionException; public class Essentials implements IEssentials { @Getter - private transient ISettings settings; + private ISettings settings; @Getter - private transient IJails jails; + private IJails jails; @Getter - private transient IKits kits; + private IKits kits; @Getter - private transient IWarps warps; + private IWarps warps; @Getter - private transient IWorth worth; + private IWorth worth; @Getter - private transient IBackup backup; + private IBackup backup; @Getter - private transient IItemDb itemDb; + private IItemDb itemDb; @Getter @Setter - private transient IRanks ranks; + private IRanks ranks; @Getter - private transient SpawnsHolder spawns; + private SpawnsHolder spawns; @Getter - private transient final Methods paymentMethod = new Methods(); + private final Methods paymentMethod = new Methods(); @Getter - private transient IUserMap userMap; + private IUserMap userMap; @Getter private final I18n i18n; @Getter - private transient ICommandHandler commandHandler; + private ICommandHandler commandHandler; @Getter - private transient Economy economy; + private Economy economy; @Getter private final Server server; @Getter @@ -85,16 +85,16 @@ public class Essentials implements IEssentials private final IPlugin plugin; @Getter @Setter - private transient Metrics metrics; + private Metrics metrics; @Getter - private transient EssentialsTimer timer; + private EssentialsTimer timer; @Getter - private transient List vanishedPlayers = new ArrayList(); + private List vanishedPlayers = new ArrayList(); @Getter - private final transient StorageQueue storageQueue; - private transient ExecuteTimer execTimer; + private final StorageQueue storageQueue; + private ExecuteTimer execTimer; public static boolean testing; - private transient List reloadList; + private List reloadList; public Essentials(final Server server, final Logger logger, final IPlugin plugin) { diff --git a/Essentials/src/net/ess3/EssentialsTimer.java b/Essentials/src/net/ess3/EssentialsTimer.java index 0bd902b17..58599f840 100644 --- a/Essentials/src/net/ess3/EssentialsTimer.java +++ b/Essentials/src/net/ess3/EssentialsTimer.java @@ -12,10 +12,10 @@ import org.bukkit.entity.Player; public class EssentialsTimer implements Runnable { - private final transient IEssentials ess; - private final transient Set onlineUsers = new HashSet(); - private transient long lastPoll = System.currentTimeMillis(); - private final transient LinkedList history = new LinkedList(); + private final IEssentials ess; + private final Set onlineUsers = new HashSet(); + private long lastPoll = System.currentTimeMillis(); + private final LinkedList history = new LinkedList(); EssentialsTimer(final IEssentials ess) { diff --git a/Essentials/src/net/ess3/I18n.java b/Essentials/src/net/ess3/I18n.java index 8f31963eb..0f644bfb9 100644 --- a/Essentials/src/net/ess3/I18n.java +++ b/Essentials/src/net/ess3/I18n.java @@ -19,13 +19,13 @@ public class I18n implements II18n { private static I18n instance; private static final String MESSAGES = "messages"; - private final transient Locale defaultLocale = Locale.getDefault(); - private transient Locale currentLocale = defaultLocale; - private transient ResourceBundle customBundle; - private transient ResourceBundle localeBundle; - private final transient ResourceBundle defaultBundle; - private final transient Map messageFormatCache = new HashMap(); - private final transient IEssentials ess; + private final Locale defaultLocale = Locale.getDefault(); + private Locale currentLocale = defaultLocale; + private ResourceBundle customBundle; + private ResourceBundle localeBundle; + private final ResourceBundle defaultBundle; + private final Map messageFormatCache = new HashMap(); + private final IEssentials ess; public I18n(final IEssentials ess) { @@ -136,7 +136,7 @@ public class I18n implements II18n private static class FileResClassLoader extends ClassLoader { - private final transient File dataFolder; + private final File dataFolder; public FileResClassLoader(final ClassLoader classLoader, final IEssentials ess) { diff --git a/Essentials/src/net/ess3/ItemDb.java b/Essentials/src/net/ess3/ItemDb.java index 7e7ca0ede..679cf26bf 100644 --- a/Essentials/src/net/ess3/ItemDb.java +++ b/Essentials/src/net/ess3/ItemDb.java @@ -19,7 +19,7 @@ import org.bukkit.inventory.ItemStack; public class ItemDb implements IItemDb { - private final transient IEssentials ess; + private final IEssentials ess; public ItemDb(final IEssentials ess) { @@ -27,8 +27,8 @@ public class ItemDb implements IItemDb file = new ManagedFile("items.csv", ess); } - private final transient Map items = new HashMap(); - private final transient ManagedFile file; + private final Map items = new HashMap(); + private final ManagedFile file; private static final Pattern SPLIT = Pattern.compile("[^a-zA-Z0-9]"); @Override diff --git a/Essentials/src/net/ess3/Jails.java b/Essentials/src/net/ess3/Jails.java index 0affe3fca..ebc23f901 100644 --- a/Essentials/src/net/ess3/Jails.java +++ b/Essentials/src/net/ess3/Jails.java @@ -30,7 +30,7 @@ import org.bukkit.plugin.PluginManager; public class Jails extends AsyncStorageObjectHolder implements IJails { - private static final transient Logger LOGGER = Bukkit.getLogger(); + private static final Logger LOGGER = Bukkit.getLogger(); public Jails(final IEssentials ess) { diff --git a/Essentials/src/net/ess3/SpawnMob.java b/Essentials/src/net/ess3/SpawnMob.java index 47cd07049..0b22569ca 100644 --- a/Essentials/src/net/ess3/SpawnMob.java +++ b/Essentials/src/net/ess3/SpawnMob.java @@ -25,8 +25,8 @@ import org.bukkit.material.Colorable; public class SpawnMob { - private static transient Pattern colon = Pattern.compile(":"); - private static transient Pattern comma = Pattern.compile(","); + private static Pattern colon = Pattern.compile(":"); + private static Pattern comma = Pattern.compile(","); public static String mobList(final IUser user) throws NotEnoughArgumentsException { diff --git a/Essentials/src/net/ess3/backup/Backup.java b/Essentials/src/net/ess3/backup/Backup.java index bbff922cc..ea0287356 100644 --- a/Essentials/src/net/ess3/backup/Backup.java +++ b/Essentials/src/net/ess3/backup/Backup.java @@ -15,11 +15,11 @@ import org.bukkit.command.CommandSender; public class Backup implements Runnable, IBackup { - private transient final Server server; - private transient final IEssentials ess; - private transient final AtomicBoolean running = new AtomicBoolean(false); - private transient int taskId = -1; - private transient final AtomicBoolean active = new AtomicBoolean(false); + private final Server server; + private final IEssentials ess; + private final AtomicBoolean running = new AtomicBoolean(false); + private int taskId = -1; + private final AtomicBoolean active = new AtomicBoolean(false); public Backup(final IEssentials ess) { @@ -82,7 +82,7 @@ public class Backup implements Runnable, IBackup private class BackupRunner implements Runnable { - private final transient String command; + private final String command; public BackupRunner(final String command) { diff --git a/Essentials/src/net/ess3/commands/Commandbalancetop.java b/Essentials/src/net/ess3/commands/Commandbalancetop.java index 1d4201224..874945cfb 100644 --- a/Essentials/src/net/ess3/commands/Commandbalancetop.java +++ b/Essentials/src/net/ess3/commands/Commandbalancetop.java @@ -109,7 +109,7 @@ public class Commandbalancetop extends EssentialsCommand private class Calculator implements Runnable { - private final transient Viewer viewer; + private final Viewer viewer; private final boolean force; public Calculator(final Viewer viewer, final boolean force) @@ -176,9 +176,9 @@ public class Commandbalancetop extends EssentialsCommand private class Viewer implements Runnable { - private final transient CommandSender sender; - private final transient int page; - private final transient boolean force; + private final CommandSender sender; + private final int page; + private final boolean force; public Viewer(final CommandSender sender, final int page, final boolean force) { diff --git a/Essentials/src/net/ess3/commands/Commanddelhome.java b/Essentials/src/net/ess3/commands/Commanddelhome.java index 133db6769..c32c390d4 100644 --- a/Essentials/src/net/ess3/commands/Commanddelhome.java +++ b/Essentials/src/net/ess3/commands/Commanddelhome.java @@ -10,7 +10,7 @@ import org.bukkit.command.CommandSender; public class Commanddelhome extends EssentialsCommand { - private final transient Pattern colon = Pattern.compile(":"); + private final Pattern colon = Pattern.compile(":"); @Override protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception diff --git a/Essentials/src/net/ess3/commands/Commandessentials.java b/Essentials/src/net/ess3/commands/Commandessentials.java index 405a3c3d1..0ed491850 100644 --- a/Essentials/src/net/ess3/commands/Commandessentials.java +++ b/Essentials/src/net/ess3/commands/Commandessentials.java @@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender; public class Commandessentials extends EssentialsCommand { - private transient int taskid; // TODO: Needed? + private int taskid; // TODO: Needed? @Override protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception diff --git a/Essentials/src/net/ess3/commands/Commandgive.java b/Essentials/src/net/ess3/commands/Commandgive.java index d102becfa..ce03e0930 100644 --- a/Essentials/src/net/ess3/commands/Commandgive.java +++ b/Essentials/src/net/ess3/commands/Commandgive.java @@ -13,7 +13,7 @@ import org.bukkit.inventory.ItemStack; public class Commandgive extends EssentialsCommand { - private final transient Pattern data = Pattern.compile("[:+',;.]"); + private final Pattern data = Pattern.compile("[:+',;.]"); @Override protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception diff --git a/Essentials/src/net/ess3/commands/Commandhome.java b/Essentials/src/net/ess3/commands/Commandhome.java index 5781b5124..7f74e1287 100644 --- a/Essentials/src/net/ess3/commands/Commandhome.java +++ b/Essentials/src/net/ess3/commands/Commandhome.java @@ -15,7 +15,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Commandhome extends EssentialsCommand { - private final transient Pattern colon = Pattern.compile(":"); + private final Pattern colon = Pattern.compile(":"); @Override public void run(final IUser user, final String commandLabel, final String[] args) throws Exception diff --git a/Essentials/src/net/ess3/commands/Commanditem.java b/Essentials/src/net/ess3/commands/Commanditem.java index 416bed766..df34d7eca 100644 --- a/Essentials/src/net/ess3/commands/Commanditem.java +++ b/Essentials/src/net/ess3/commands/Commanditem.java @@ -11,7 +11,7 @@ import org.bukkit.inventory.ItemStack; public class Commanditem extends EssentialsCommand { - private final transient Pattern data = Pattern.compile("[:+',;.]"); + private final Pattern data = Pattern.compile("[:+',;.]"); @Override public void run(final IUser user, final String commandLabel, final String[] args) throws Exception diff --git a/Essentials/src/net/ess3/commands/Commandsethome.java b/Essentials/src/net/ess3/commands/Commandsethome.java index d4eb74df3..845df8e9b 100644 --- a/Essentials/src/net/ess3/commands/Commandsethome.java +++ b/Essentials/src/net/ess3/commands/Commandsethome.java @@ -9,7 +9,7 @@ import net.ess3.permissions.Permissions; public class Commandsethome extends EssentialsCommand { - private final transient Pattern colon = Pattern.compile(":"); + private final Pattern colon = Pattern.compile(":"); @Override public void run(final IUser user, final String commandLabel, String[] args) throws Exception diff --git a/Essentials/src/net/ess3/commands/EssentialsCommand.java b/Essentials/src/net/ess3/commands/EssentialsCommand.java index 42fbd0f3d..02e6aff41 100644 --- a/Essentials/src/net/ess3/commands/EssentialsCommand.java +++ b/Essentials/src/net/ess3/commands/EssentialsCommand.java @@ -16,12 +16,12 @@ import org.bukkit.entity.Player; public abstract class EssentialsCommand extends AbstractSuperpermsPermission implements IEssentialsCommand { - protected transient String commandName; - protected transient IEssentials ess; - protected transient IEssentialsModule module; - protected transient Server server; - protected transient Logger logger; - private transient String permission; + protected String commandName; + protected IEssentials ess; + protected IEssentialsModule module; + protected Server server; + protected Logger logger; + private String permission; @Override public void init(final IEssentials ess, final String commandName) diff --git a/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java b/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java index aa9327fda..5ba3bb989 100644 --- a/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java +++ b/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java @@ -14,15 +14,15 @@ import org.bukkit.plugin.Plugin; public class EssentialsCommandHandler implements ICommandHandler, TabExecutor { - private final transient ClassLoader classLoader; - private final transient String commandPath; - private final transient String permissionPrefix;// TODO: Needed? - private final transient IEssentialsModule module; - private static final transient Logger LOGGER = Bukkit.getLogger(); - private final transient Map> altcommands = new HashMap>(); - private final transient Map disabledList = new HashMap(); - private final transient Map commands = new HashMap(); - private final transient IEssentials ess; + private final ClassLoader classLoader; + private final String commandPath; + private final String permissionPrefix;// TODO: Needed? + private final IEssentialsModule module; + private static final Logger LOGGER = Bukkit.getLogger(); + private final Map> altcommands = new HashMap>(); + private final Map disabledList = new HashMap(); + private final Map commands = new HashMap(); + private final IEssentials ess; public EssentialsCommandHandler(ClassLoader classLoader, String commandPath, String permissionPrefix, IEssentials ess) { diff --git a/Essentials/src/net/ess3/economy/Trade.java b/Essentials/src/net/ess3/economy/Trade.java index 15c2a2adc..21998b302 100644 --- a/Essentials/src/net/ess3/economy/Trade.java +++ b/Essentials/src/net/ess3/economy/Trade.java @@ -22,12 +22,12 @@ import org.bukkit.inventory.ItemStack; public class Trade { - private final transient String command; - private final transient String fallbackCommand; - private final transient Double money; - private final transient ItemStack itemStack; - private final transient Integer exp; - private final transient IEssentials ess; + private final String command; + private final String fallbackCommand; + private final Double money; + private final ItemStack itemStack; + private final Integer exp; + private final IEssentials ess; public Trade(final String command, final IEssentials ess) { diff --git a/Essentials/src/net/ess3/listener/EssentialsBlockListener.java b/Essentials/src/net/ess3/listener/EssentialsBlockListener.java index 8d3f380a7..f72b95e64 100644 --- a/Essentials/src/net/ess3/listener/EssentialsBlockListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsBlockListener.java @@ -15,7 +15,7 @@ import org.bukkit.inventory.ItemStack; public class EssentialsBlockListener implements Listener { - private final transient IEssentials ess; + private final IEssentials ess; public EssentialsBlockListener(final IEssentials ess) { diff --git a/Essentials/src/net/ess3/listener/EssentialsEntityListener.java b/Essentials/src/net/ess3/listener/EssentialsEntityListener.java index 41ed4503a..768fd1100 100644 --- a/Essentials/src/net/ess3/listener/EssentialsEntityListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsEntityListener.java @@ -19,7 +19,7 @@ import org.bukkit.inventory.ItemStack; public class EssentialsEntityListener implements Listener { - private final transient IEssentials ess; + private final IEssentials ess; public EssentialsEntityListener(final IEssentials ess) { diff --git a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java index 81ec8a397..4623211c6 100644 --- a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java @@ -40,9 +40,9 @@ import org.bukkit.inventory.ItemStack; public class EssentialsPlayerListener implements Listener { private static final Logger LOGGER = Logger.getLogger("Minecraft"); - private final transient Server server; - private final transient IEssentials ess; - private final transient IUserMap userMap; + private final Server server; + private final IEssentials ess; + private final IUserMap userMap; public EssentialsPlayerListener(final IEssentials parent) { diff --git a/Essentials/src/net/ess3/listener/EssentialsPluginListener.java b/Essentials/src/net/ess3/listener/EssentialsPluginListener.java index 56e3add3d..1953632b6 100644 --- a/Essentials/src/net/ess3/listener/EssentialsPluginListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsPluginListener.java @@ -19,7 +19,7 @@ import org.bukkit.plugin.Plugin; public class EssentialsPluginListener implements Listener, IReload { - private final transient IEssentials ess; + private final IEssentials ess; public EssentialsPluginListener(final IEssentials ess) { diff --git a/Essentials/src/net/ess3/metrics/MetricsListener.java b/Essentials/src/net/ess3/metrics/MetricsListener.java index 17664ab61..0d18187ef 100644 --- a/Essentials/src/net/ess3/metrics/MetricsListener.java +++ b/Essentials/src/net/ess3/metrics/MetricsListener.java @@ -14,8 +14,8 @@ import org.bukkit.event.player.PlayerJoinEvent; public class MetricsListener implements Listener { - private final transient IEssentials ess; - private final transient MetricsStarter starter; + private final IEssentials ess; + private final MetricsStarter starter; public MetricsListener(final IEssentials parent, final MetricsStarter starter) { diff --git a/Essentials/src/net/ess3/metrics/MetricsStarter.java b/Essentials/src/net/ess3/metrics/MetricsStarter.java index 2c5314142..dda758f3b 100644 --- a/Essentials/src/net/ess3/metrics/MetricsStarter.java +++ b/Essentials/src/net/ess3/metrics/MetricsStarter.java @@ -14,7 +14,7 @@ import net.ess3.metrics.Metrics.Plotter; public class MetricsStarter implements Runnable { private final IEssentials ess; - private transient Boolean start; + private Boolean start; private enum Modules diff --git a/Essentials/src/net/ess3/permissions/Permissions.java b/Essentials/src/net/ess3/permissions/Permissions.java index c4c1e19c7..6783da8b1 100644 --- a/Essentials/src/net/ess3/permissions/Permissions.java +++ b/Essentials/src/net/ess3/permissions/Permissions.java @@ -121,7 +121,7 @@ public enum Permissions implements IPermission private static final String base = "essentials."; private final String permission; private final PermissionDefault defaultPerm; - private transient String parent = null; + private String parent = null; private Permissions() { diff --git a/Essentials/src/net/ess3/ranks/GMGroups.java b/Essentials/src/net/ess3/ranks/GMGroups.java index 55a6295d3..9e2bd745f 100644 --- a/Essentials/src/net/ess3/ranks/GMGroups.java +++ b/Essentials/src/net/ess3/ranks/GMGroups.java @@ -12,8 +12,8 @@ import org.bukkit.plugin.Plugin; public class GMGroups extends AbstractRanks implements IRanks { - private final transient IEssentials ess; - private final transient GroupManager groupManager; + private final IEssentials ess; + private final GroupManager groupManager; public GMGroups(final IEssentials ess, final Plugin groupManager) { diff --git a/Essentials/src/net/ess3/settings/Economy.java b/Essentials/src/net/ess3/settings/Economy.java index bd37372bd..634c2a83e 100644 --- a/Essentials/src/net/ess3/settings/Economy.java +++ b/Essentials/src/net/ess3/settings/Economy.java @@ -27,7 +27,7 @@ public class Economy implements StorageObject return currencySymbol == null || currencySymbol.isEmpty() ? "$" : currencySymbol.substring(0, 1); } - private final transient static double MAXMONEY = 10000000000000.0; + private final static double MAXMONEY = 10000000000000.0; @Comment( { "Set the maximum amount of money a player can have", diff --git a/Essentials/src/net/ess3/settings/SettingsHolder.java b/Essentials/src/net/ess3/settings/SettingsHolder.java index e9b7f8af3..5d5ab3934 100644 --- a/Essentials/src/net/ess3/settings/SettingsHolder.java +++ b/Essentials/src/net/ess3/settings/SettingsHolder.java @@ -8,7 +8,7 @@ import net.ess3.storage.AsyncStorageObjectHolder; public class SettingsHolder extends AsyncStorageObjectHolder implements ISettings { - private transient volatile boolean debug = false; + private volatile boolean debug = false; public SettingsHolder(final IEssentials ess) { diff --git a/Essentials/src/net/ess3/settings/SpawnsHolder.java b/Essentials/src/net/ess3/settings/SpawnsHolder.java index 1c310c7c3..4bff3a2b8 100644 --- a/Essentials/src/net/ess3/settings/SpawnsHolder.java +++ b/Essentials/src/net/ess3/settings/SpawnsHolder.java @@ -174,8 +174,8 @@ public class SpawnsHolder extends AsyncStorageObjectHolder implements IE private class SpawnPlayerListener implements Listener // TODO: What is this for? { - private final transient IEssentials ess; - private final transient SpawnsHolder spawns; + private final IEssentials ess; + private final SpawnsHolder spawns; public SpawnPlayerListener(final IEssentials ess, final SpawnsHolder spawns) { @@ -240,7 +240,7 @@ public class SpawnsHolder extends AsyncStorageObjectHolder implements IE private class NewPlayerTeleport implements Runnable { - private final transient IUser user; + private final IUser user; public NewPlayerTeleport(final IUser user) { diff --git a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java index b38f5750b..714138349 100644 --- a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java +++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java @@ -11,8 +11,8 @@ import org.bukkit.Bukkit; public abstract class AbstractDelayedYamlFileReader implements Runnable { - private final transient Class clazz; - private final transient IEssentials ess; + private final Class clazz; + private final IEssentials ess; public AbstractDelayedYamlFileReader(final IEssentials ess, final Class clazz) { diff --git a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java index 2a74c4cd5..ade8eeb93 100644 --- a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java +++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java @@ -11,8 +11,8 @@ import org.bukkit.Bukkit; public abstract class AbstractDelayedYamlFileWriter implements Runnable { - private final transient IEssentials ess; - private final transient ReentrantLock lock = new ReentrantLock(); // TODO: Needed? + private final IEssentials ess; + private final ReentrantLock lock = new ReentrantLock(); // TODO: Needed? public AbstractDelayedYamlFileWriter(final IEssentials ess) { diff --git a/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java b/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java index d4239db8e..b4a82b2bc 100644 --- a/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java +++ b/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java @@ -10,14 +10,14 @@ import org.bukkit.Bukkit; public abstract class AsyncStorageObjectHolder implements IStorageObjectHolder { - private transient T data; - private final transient Class clazz; - protected final transient IEssentials ess; - private final transient StorageObjectDataWriter writer; - private final transient StorageObjectDataReader reader; - private final transient AtomicBoolean loaded = new AtomicBoolean(false); + private T data; + private final Class clazz; + protected final IEssentials ess; + private final StorageObjectDataWriter writer; + private final StorageObjectDataReader reader; + private final AtomicBoolean loaded = new AtomicBoolean(false); private volatile long savetime = 0; - private final transient File file; + private final File file; public AsyncStorageObjectHolder(final IEssentials ess, final Class clazz, final File file) { diff --git a/Essentials/src/net/ess3/storage/BukkitConstructor.java b/Essentials/src/net/ess3/storage/BukkitConstructor.java index 89f20cdf8..666c07931 100644 --- a/Essentials/src/net/ess3/storage/BukkitConstructor.java +++ b/Essentials/src/net/ess3/storage/BukkitConstructor.java @@ -21,9 +21,9 @@ import org.yaml.snakeyaml.nodes.*; public class BukkitConstructor extends Constructor { - private final transient Pattern DATAPATTERN = Pattern.compile("[:+',;.]"); - private final transient Pattern WORD = Pattern.compile("\\W"); - private final transient IPlugin plugin; + private final Pattern DATAPATTERN = Pattern.compile("[:+',;.]"); + private final Pattern WORD = Pattern.compile("\\W"); + private final IPlugin plugin; public BukkitConstructor(final Class clazz, final IPlugin plugin) { diff --git a/Essentials/src/net/ess3/storage/ManagedFile.java b/Essentials/src/net/ess3/storage/ManagedFile.java index 0c3def687..90429968a 100644 --- a/Essentials/src/net/ess3/storage/ManagedFile.java +++ b/Essentials/src/net/ess3/storage/ManagedFile.java @@ -18,7 +18,7 @@ import org.bukkit.Bukkit; public class ManagedFile { private final static int BUFFERSIZE = 1024 * 8; - private final transient File file; + private final File file; public ManagedFile(final String filename, final IEssentials ess) { diff --git a/Essentials/src/net/ess3/storage/StorageObjectMap.java b/Essentials/src/net/ess3/storage/StorageObjectMap.java index bb7894b51..aeaf14892 100644 --- a/Essentials/src/net/ess3/storage/StorageObjectMap.java +++ b/Essentials/src/net/ess3/storage/StorageObjectMap.java @@ -26,11 +26,11 @@ import org.apache.commons.io.IOUtils; public abstract class StorageObjectMap extends CacheLoader implements IStorageObjectMap { - protected final transient IEssentials ess; - private final transient File folder; - protected final transient Cache cache = CacheBuilder.newBuilder().softValues().build(this); - protected final transient ConcurrentSkipListSet keys = new ConcurrentSkipListSet(); - protected final transient ConcurrentSkipListMap zippedfiles = new ConcurrentSkipListMap(); + protected final IEssentials ess; + private final File folder; + protected final Cache cache = CacheBuilder.newBuilder().softValues().build(this); + protected final ConcurrentSkipListSet keys = new ConcurrentSkipListSet(); + protected final ConcurrentSkipListMap zippedfiles = new ConcurrentSkipListMap(); private final Pattern zipCheck = Pattern.compile("^[a-zA-Z0-9]*-?[a-zA-Z0-9]+\\.yml$"); public StorageObjectMap(final IEssentials ess, final String folderName) diff --git a/Essentials/src/net/ess3/storage/StorageQueue.java b/Essentials/src/net/ess3/storage/StorageQueue.java index 5084ba82f..d602ad84e 100644 --- a/Essentials/src/net/ess3/storage/StorageQueue.java +++ b/Essentials/src/net/ess3/storage/StorageQueue.java @@ -15,7 +15,7 @@ public class StorageQueue implements Runnable private DelayQueue queue = new DelayQueue(); public final static long DELAY = TimeUnit.NANOSECONDS.convert(1, TimeUnit.SECONDS); private final AtomicBoolean enabled = new AtomicBoolean(false); - private final transient Object lock = new Object(); + private final Object lock = new Object(); private final IPlugin plugin; public StorageQueue(IPlugin plugin) diff --git a/Essentials/src/net/ess3/storage/YamlStorageReader.java b/Essentials/src/net/ess3/storage/YamlStorageReader.java index f49a0b5a2..0cb0197b0 100644 --- a/Essentials/src/net/ess3/storage/YamlStorageReader.java +++ b/Essentials/src/net/ess3/storage/YamlStorageReader.java @@ -13,10 +13,10 @@ import org.yaml.snakeyaml.introspector.BeanAccess; public class YamlStorageReader implements IStorageReader { - private transient static final Map, Yaml> PREPARED_YAMLS = Collections.synchronizedMap(new HashMap, Yaml>()); - private transient static final Map, ReentrantLock> LOCKS = new HashMap, ReentrantLock>(); - private transient final Reader reader; - private transient final IPlugin plugin; + private static final Map, Yaml> PREPARED_YAMLS = Collections.synchronizedMap(new HashMap, Yaml>()); + private static final Map, ReentrantLock> LOCKS = new HashMap, ReentrantLock>(); + private final Reader reader; + private final IPlugin plugin; public YamlStorageReader(final Reader reader, final IPlugin plugin) { diff --git a/Essentials/src/net/ess3/storage/YamlStorageWriter.java b/Essentials/src/net/ess3/storage/YamlStorageWriter.java index e5de1460b..1ac01e30c 100644 --- a/Essentials/src/net/ess3/storage/YamlStorageWriter.java +++ b/Essentials/src/net/ess3/storage/YamlStorageWriter.java @@ -20,9 +20,9 @@ import org.yaml.snakeyaml.Yaml; public class YamlStorageWriter implements IStorageWriter { - private transient static final Pattern NON_WORD_PATTERN = Pattern.compile("\\W"); - private transient final PrintWriter writer; - private transient static final Yaml YAML = new Yaml(); + private static final Pattern NON_WORD_PATTERN = Pattern.compile("\\W"); + private final PrintWriter writer; + private static final Yaml YAML = new Yaml(); public YamlStorageWriter(final PrintWriter writer) { diff --git a/Essentials/src/net/ess3/user/User.java b/Essentials/src/net/ess3/user/User.java index 4fce959bf..787963bef 100644 --- a/Essentials/src/net/ess3/user/User.java +++ b/Essentials/src/net/ess3/user/User.java @@ -31,22 +31,22 @@ public class User extends UserBase implements IUser { private CommandSender replyTo = null; @Getter - private transient IUser teleportRequester; + private IUser teleportRequester; @Getter - private transient boolean tpRequestHere; + private boolean tpRequestHere; @Getter - private transient final ITeleport teleport; + private final ITeleport teleport; @Getter - private transient long teleportRequestTime; + private long teleportRequestTime; @Getter @Setter - private transient long lastOnlineActivity; - private transient long lastActivity = System.currentTimeMillis(); + private long lastOnlineActivity; + private long lastActivity = System.currentTimeMillis(); /*@Getter @Setter private boolean hidden = false;*/ @Getter - private transient boolean vanished; + private boolean vanished; @Getter @Setter private boolean invSee = false; @@ -54,7 +54,7 @@ public class User extends UserBase implements IUser @Setter private boolean enderSee = false; private long lastThrottledAction; - private transient Location afkPosition; + private Location afkPosition; private AtomicBoolean gotMailInfo = new AtomicBoolean(false); private WeakReference playerCache; @Getter @@ -593,7 +593,7 @@ public class User extends UserBase implements IUser return true; } - private transient long teleportInvulnerabilityTimestamp = 0; + private long teleportInvulnerabilityTimestamp = 0; public void enableInvulnerabilityAfterTeleport() { diff --git a/Essentials/src/net/ess3/utils/ExecuteTimer.java b/Essentials/src/net/ess3/utils/ExecuteTimer.java index 012ab9296..55d85a999 100644 --- a/Essentials/src/net/ess3/utils/ExecuteTimer.java +++ b/Essentials/src/net/ess3/utils/ExecuteTimer.java @@ -9,8 +9,8 @@ import java.util.Locale; public class ExecuteTimer { - private final transient List times; - private final transient DecimalFormat decimalFormat = new DecimalFormat("#0.000", DecimalFormatSymbols.getInstance(Locale.US)); + private final List times; + private final DecimalFormat decimalFormat = new DecimalFormat("#0.000", DecimalFormatSymbols.getInstance(Locale.US)); public ExecuteTimer() diff --git a/Essentials/src/net/ess3/utils/FormatUtil.java b/Essentials/src/net/ess3/utils/FormatUtil.java index 4cba2a71b..bbc690e79 100644 --- a/Essentials/src/net/ess3/utils/FormatUtil.java +++ b/Essentials/src/net/ess3/utils/FormatUtil.java @@ -13,15 +13,15 @@ import net.ess3.permissions.DotStarPermission; public class FormatUtil { - static final transient Pattern REPLACE_COLOR_PATTERN = Pattern.compile("&([0-9a-f])"); - static final transient Pattern REPLACE_MAGIC_PATTERN = Pattern.compile("&(k)"); - static final transient Pattern REPLACE_PATTERN = Pattern.compile("&([0-9a-fk-or])"); - static final transient Pattern VANILLA_PATTERN = Pattern.compile("\u00a7+[0-9A-FK-ORa-fk-or]"); - static final transient Pattern VANILLA_COLOR_PATTERN = Pattern.compile("\u00a7+[0-9A-Fa-f]"); - static final transient Pattern REPLACE_FORMAT_PATTERN = Pattern.compile("&([l-or])"); - static final transient Pattern VANILLA_FORMAT_PATTERN = Pattern.compile("\u00a7+[L-ORl-or]"); - static final transient Pattern VANILLA_MAGIC_PATTERN = Pattern.compile("\u00a7+[Kk]"); - static final transient Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-z]{2,3}(?:/\\S+)?)"); + static final Pattern REPLACE_COLOR_PATTERN = Pattern.compile("&([0-9a-f])"); + static final Pattern REPLACE_MAGIC_PATTERN = Pattern.compile("&(k)"); + static final Pattern REPLACE_PATTERN = Pattern.compile("&([0-9a-fk-or])"); + static final Pattern VANILLA_PATTERN = Pattern.compile("\u00a7+[0-9A-FK-ORa-fk-or]"); + static final Pattern VANILLA_COLOR_PATTERN = Pattern.compile("\u00a7+[0-9A-Fa-f]"); + static final Pattern REPLACE_FORMAT_PATTERN = Pattern.compile("&([l-or])"); + static final Pattern VANILLA_FORMAT_PATTERN = Pattern.compile("\u00a7+[L-ORl-or]"); + static final Pattern VANILLA_MAGIC_PATTERN = Pattern.compile("\u00a7+[Kk]"); + static final Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-z]{2,3}(?:/\\S+)?)"); static DecimalFormat dFormat = new DecimalFormat("#0.00", DecimalFormatSymbols.getInstance(Locale.US)); static String stripColor(final String input, final Pattern pattern) diff --git a/Essentials/src/net/ess3/utils/textreader/ArrayListInput.java b/Essentials/src/net/ess3/utils/textreader/ArrayListInput.java index 9fdc87c9b..2bd0d914e 100644 --- a/Essentials/src/net/ess3/utils/textreader/ArrayListInput.java +++ b/Essentials/src/net/ess3/utils/textreader/ArrayListInput.java @@ -8,7 +8,7 @@ import java.util.Map; public class ArrayListInput implements IText { - private final transient List lines = new ArrayList(); + private final List lines = new ArrayList(); @Override public List getLines() diff --git a/Essentials/src/net/ess3/utils/textreader/HelpInput.java b/Essentials/src/net/ess3/utils/textreader/HelpInput.java index e6510a2e3..91bf88e94 100644 --- a/Essentials/src/net/ess3/utils/textreader/HelpInput.java +++ b/Essentials/src/net/ess3/utils/textreader/HelpInput.java @@ -18,9 +18,9 @@ public class HelpInput implements IText private static final String DESCRIPTION = "description"; private static final String PERMISSION = "permission"; private static final String PERMISSIONS = "permissions"; - private final transient List lines = new ArrayList(); - private final transient List chapters = new ArrayList(); - private final transient Map bookmarks = new HashMap(); + private final List lines = new ArrayList(); + private final List chapters = new ArrayList(); + private final Map bookmarks = new HashMap(); private final static Logger logger = Logger.getLogger("Minecraft"); public HelpInput(final IUser user, final String match, final IEssentials ess) throws IOException diff --git a/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java b/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java index 22466e0ac..a89d86857 100644 --- a/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java +++ b/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java @@ -17,9 +17,9 @@ import org.bukkit.plugin.Plugin; public class KeywordReplacer implements IText { - private final transient IText input; - private final transient List replaced; - private final transient IEssentials ess; + private final IText input; + private final List replaced; + private final IEssentials ess; public KeywordReplacer(final IText input, final CommandSender sender, final IEssentials ess) { diff --git a/Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java b/Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java index 03405df29..58493fc86 100644 --- a/Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java +++ b/Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java @@ -8,7 +8,7 @@ import java.util.Map; public class SimpleTextInput implements IText { - private final transient List lines = new ArrayList(); + private final List lines = new ArrayList(); public SimpleTextInput(final String input) { diff --git a/Essentials/src/net/ess3/utils/textreader/SimpleTextPager.java b/Essentials/src/net/ess3/utils/textreader/SimpleTextPager.java index ea70010b6..0b850b509 100644 --- a/Essentials/src/net/ess3/utils/textreader/SimpleTextPager.java +++ b/Essentials/src/net/ess3/utils/textreader/SimpleTextPager.java @@ -5,7 +5,7 @@ import org.bukkit.command.CommandSender; public class SimpleTextPager { - private final transient IText text; + private final IText text; public SimpleTextPager(final IText text) { diff --git a/Essentials/src/net/ess3/utils/textreader/TextInput.java b/Essentials/src/net/ess3/utils/textreader/TextInput.java index ca38cd528..090afd948 100644 --- a/Essentials/src/net/ess3/utils/textreader/TextInput.java +++ b/Essentials/src/net/ess3/utils/textreader/TextInput.java @@ -13,10 +13,10 @@ import org.bukkit.command.CommandSender; public class TextInput implements IText { - private final transient List lines; - private final transient List chapters; - private final transient Map bookmarks; - private final transient long lastChange; + private final List lines; + private final List chapters; + private final Map bookmarks; + private final long lastChange; private final static HashMap> cache = new HashMap>(); public TextInput(final CommandSender sender, final String filename, final boolean createFile, final IEssentials ess) throws IOException diff --git a/Essentials/src/net/ess3/utils/textreader/TextPager.java b/Essentials/src/net/ess3/utils/textreader/TextPager.java index 88f00125c..965bb0d2f 100644 --- a/Essentials/src/net/ess3/utils/textreader/TextPager.java +++ b/Essentials/src/net/ess3/utils/textreader/TextPager.java @@ -10,8 +10,8 @@ import org.bukkit.command.CommandSender; public class TextPager { - private final transient IText text; - private final transient boolean onePage; + private final IText text; + private final boolean onePage; public TextPager(final IText text) { diff --git a/Essentials/test/net/ess3/EssentialsTest.java b/Essentials/test/net/ess3/EssentialsTest.java index 0daa06abf..cedfa3cb6 100644 --- a/Essentials/test/net/ess3/EssentialsTest.java +++ b/Essentials/test/net/ess3/EssentialsTest.java @@ -23,12 +23,12 @@ import org.mockito.stubbing.Answer; public abstract class EssentialsTest extends TestCase { - protected final transient Server server; - protected final transient IPlugin plugin; - protected final transient World world; - protected final transient Logger logger; - protected final transient Essentials ess; - protected final transient List playerList; + protected final Server server; + protected final IPlugin plugin; + protected final World world; + protected final Logger logger; + protected final Essentials ess; + protected final List playerList; public EssentialsTest(final String testName) { diff --git a/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java b/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java index 073f45bf5..a76ebbe6c 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java +++ b/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java @@ -29,9 +29,9 @@ import net.ess3.storage.StoredLocation; public class EssentialsConf extends YamlConfiguration { private static final Logger LOGGER = Logger.getLogger("Minecraft"); - private transient File configFile; - private transient String templateName = null; - private transient Class resourceClass = EssentialsConf.class; + private File configFile; + private String templateName = null; + private Class resourceClass = EssentialsConf.class; private static final Charset UTF8 = Charset.forName("UTF-8"); public EssentialsConf(final File configFile) diff --git a/Essentials2Compat/src/com/earth2me/essentials/Settings.java b/Essentials2Compat/src/com/earth2me/essentials/Settings.java index a5f454916..bec8c3356 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/Settings.java +++ b/Essentials2Compat/src/com/earth2me/essentials/Settings.java @@ -16,9 +16,9 @@ import org.bukkit.inventory.ItemStack; public final class Settings implements ISettings { - private final transient EssentialsConf config; + private final EssentialsConf config; private final static Logger logger = Logger.getLogger("Minecraft"); - private final transient IEssentials ess; + private final IEssentials ess; private boolean metricsEnabled = true; public Settings(IEssentials ess, File file) diff --git a/Essentials2Compat/src/com/earth2me/essentials/UserData.java b/Essentials2Compat/src/com/earth2me/essentials/UserData.java index fdd16c495..9bb23345a 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/UserData.java +++ b/Essentials2Compat/src/com/earth2me/essentials/UserData.java @@ -12,7 +12,7 @@ import org.bukkit.inventory.ItemStack; public class UserData { - protected final transient IEssentials ess; + protected final IEssentials ess; private EssentialsConf config; private final File folder; diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuild.java b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuild.java index 2edb98da0..1e54f114a 100644 --- a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuild.java +++ b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuild.java @@ -7,8 +7,8 @@ import org.bukkit.plugin.java.JavaPlugin; public class EssentialsAntiBuild extends JavaPlugin implements IAntiBuild { - private transient EssentialsConnect ess = null; - private transient AntiBuildHolder settings = null; + private EssentialsConnect ess = null; + private AntiBuildHolder settings = null; @Override public void onEnable() diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java index 52d34c47a..6c5c30b81 100644 --- a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java +++ b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java @@ -26,8 +26,8 @@ import org.bukkit.inventory.ItemStack; public class EssentialsAntiBuildListener implements Listener { - final private transient IAntiBuild antib; - final private transient IEssentials ess; + final private IAntiBuild antib; + final private IEssentials ess; public EssentialsAntiBuildListener(final IAntiBuild parent) { diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java index 40d760b66..a58f18dcc 100644 --- a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java +++ b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java @@ -13,8 +13,8 @@ import org.bukkit.plugin.Plugin; public class EssentialsConnect { private static final Logger LOGGER = Logger.getLogger("Minecraft"); - private final transient IEssentials ess; - private final transient IAntiBuild antib; + private final IEssentials ess; + private final IAntiBuild antib; public EssentialsConnect(Plugin essPlugin, Plugin essProtect) { diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/Permissions.java b/EssentialsAntiBuild/src/net/ess3/antibuild/Permissions.java index 96cdf63ac..f280be873 100644 --- a/EssentialsAntiBuild/src/net/ess3/antibuild/Permissions.java +++ b/EssentialsAntiBuild/src/net/ess3/antibuild/Permissions.java @@ -19,7 +19,7 @@ public enum Permissions implements IPermission private static final String defaultBase = "essentials.build."; private final String permission; private final PermissionDefault defaultPerm; - private transient String parent = null; + private String parent = null; private Permissions() { diff --git a/EssentialsChat/src/net/ess3/chat/ChatStore.java b/EssentialsChat/src/net/ess3/chat/ChatStore.java index 4d696fb36..d099a3e04 100644 --- a/EssentialsChat/src/net/ess3/chat/ChatStore.java +++ b/EssentialsChat/src/net/ess3/chat/ChatStore.java @@ -7,9 +7,9 @@ import net.ess3.economy.Trade; public class ChatStore { - private final transient IUser user; - private final transient String type; - private final transient Trade charge; + private final IUser user; + private final String type; + private final Trade charge; public ChatStore(final IEssentials ess, final IUser user, final String type) { diff --git a/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java b/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java index e358cf9e1..7b33ba1a4 100644 --- a/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java +++ b/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java @@ -17,10 +17,10 @@ import org.bukkit.event.player.AsyncPlayerChatEvent; public abstract class EssentialsChatPlayer implements Listener { - protected transient IEssentials ess; + protected IEssentials ess; protected final static Logger LOGGER = Logger.getLogger("Minecraft"); - protected final transient Server server; - protected final transient Map chatStorage; + protected final Server server; + protected final Map chatStorage; public EssentialsChatPlayer( final Server server, final IEssentials ess, final Map chatStorage) diff --git a/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java b/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java index b6b93c0bf..568657907 100644 --- a/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java +++ b/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java @@ -14,8 +14,8 @@ import org.bukkit.event.Listener; public class EssentialsLocalChatEventListener implements Listener { - protected transient IEssentials ess; - protected final transient Server server; + protected IEssentials ess; + protected final Server server; public EssentialsLocalChatEventListener(final Server server, final IEssentials ess) { diff --git a/EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java b/EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java index c535ed4a0..e96b8094c 100644 --- a/EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java +++ b/EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java @@ -9,7 +9,7 @@ import org.bukkit.plugin.Plugin; public class ConfigHolder extends AsyncStorageObjectHolder { - private final transient Plugin geoip; + private final Plugin geoip; public ConfigHolder(final IEssentials ess, final Plugin geoip) { diff --git a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java index d899ed972..c305c024f 100644 --- a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java +++ b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java @@ -26,12 +26,12 @@ import org.bukkit.plugin.Plugin; public class EssentialsGeoIPPlayerListener implements Listener, IReload { - private transient LookupService ls = null; + private LookupService ls = null; private static final Logger LOGGER = Logger.getLogger("Minecraft"); - private transient File databaseFile; - private final transient ConfigHolder config; - private final transient IEssentials ess; - private final transient Plugin geoip; + private File databaseFile; + private final ConfigHolder config; + private final IEssentials ess; + private final Plugin geoip; public EssentialsGeoIPPlayerListener(final Plugin geoip, final IEssentials ess) { diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java b/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java index b91f6740e..7ccbd1f92 100644 --- a/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java @@ -11,8 +11,8 @@ import org.bukkit.plugin.Plugin; public class EssentialsConnect { private static final Logger LOGGER = Logger.getLogger("Minecraft"); - private final transient IEssentials ess; - private final transient IProtect protect; + private final IEssentials ess; + private final IProtect protect; public EssentialsConnect(final Plugin essPlugin, final Plugin essProtect) { diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsProtect.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtect.java index 98e0596f2..dec2ecd8f 100644 --- a/EssentialsProtect/src/net/ess3/protect/EssentialsProtect.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtect.java @@ -11,8 +11,8 @@ import org.bukkit.plugin.java.JavaPlugin; public class EssentialsProtect extends JavaPlugin implements IProtect { private static final Logger LOGGER = Logger.getLogger("Minecraft"); - private transient EssentialsConnect ess = null; - private transient ProtectHolder settings = null; + private EssentialsConnect ess = null; + private ProtectHolder settings = null; @Override public void onEnable() diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java index 6446adc44..01fc2651b 100644 --- a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java @@ -13,7 +13,7 @@ import org.bukkit.event.block.BlockIgniteEvent; public class EssentialsProtectBlockListener implements Listener { - final private transient IProtect prot; + final private IProtect prot; public EssentialsProtectBlockListener(final IProtect parent) { diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java index 4fa71139b..0c7eb0654 100644 --- a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java @@ -11,7 +11,7 @@ import org.bukkit.event.entity.EntityTargetEvent.TargetReason; //TODO: remove unnecessary return statements public class EssentialsProtectEntityListener implements Listener { - private final transient IProtect prot; + private final IProtect prot; public EssentialsProtectEntityListener(final IProtect prot) { diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java index c12dc4a52..b20f7b17d 100644 --- a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java @@ -10,7 +10,7 @@ import org.bukkit.event.weather.WeatherChangeEvent; public class EssentialsProtectWeatherListener implements Listener { - private final transient IProtect prot; + private final IProtect prot; public EssentialsProtectWeatherListener(final IProtect prot) { diff --git a/EssentialsProtect/src/net/ess3/protect/Permissions.java b/EssentialsProtect/src/net/ess3/protect/Permissions.java index 7cacd741f..f4a5e1ea1 100644 --- a/EssentialsProtect/src/net/ess3/protect/Permissions.java +++ b/EssentialsProtect/src/net/ess3/protect/Permissions.java @@ -29,7 +29,7 @@ public enum Permissions implements IPermission private static final String base = "essentials.protect."; private final String permission; private final PermissionDefault defaultPerm; - private transient String parent = null; + private String parent = null; private Permissions() { diff --git a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java index 10ed1989d..f4f76686e 100644 --- a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java +++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java @@ -22,7 +22,7 @@ import org.bukkit.inventory.ItemStack; public class EssentialsSign { private static final Set EMPTY_SET = new HashSet(); - protected transient final String signName; + protected final String signName; public EssentialsSign(final String signName) { @@ -430,8 +430,8 @@ public class EssentialsSign static class EventSign implements ISign { - private final transient SignChangeEvent event; - private final transient Block block; + private final SignChangeEvent event; + private final Block block; public EventSign(final SignChangeEvent event) { @@ -466,8 +466,8 @@ public class EssentialsSign public static class BlockSign implements ISign { - private final transient Sign sign; - private final transient Block block; + private final Sign sign; + private final Block block; public BlockSign(final Block block) { diff --git a/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java index cdd4494ea..29e2edd59 100644 --- a/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java +++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java @@ -15,8 +15,8 @@ import org.bukkit.plugin.java.JavaPlugin; public class EssentialsSignsPlugin extends JavaPlugin implements ISignsPlugin { - private static final transient Logger LOGGER = Bukkit.getLogger(); - private transient SignsConfigHolder config; + private static final Logger LOGGER = Bukkit.getLogger(); + private SignsConfigHolder config; @Override public void onEnable() diff --git a/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java b/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java index 9c62337c4..613c2edee 100644 --- a/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java +++ b/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java @@ -9,7 +9,7 @@ import org.bukkit.plugin.Plugin; public class SignsConfigHolder extends AsyncStorageObjectHolder { - private final transient Plugin plugin; + private final Plugin plugin; private Set enabledSigns = new HashSet(); private boolean signsEnabled = false; diff --git a/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java b/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java index 4aa8182b5..7af02af5b 100644 --- a/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java +++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java @@ -21,8 +21,8 @@ import org.bukkit.event.block.*; public class SignBlockListener implements Listener { - private final transient IEssentials ess; - private final transient ISignsPlugin plugin; + private final IEssentials ess; + private final ISignsPlugin plugin; private final static Logger LOGGER = Logger.getLogger("Minecraft"); private final static int WALL_SIGN = Material.WALL_SIGN.getId(); private final static int SIGN_POST = Material.SIGN_POST.getId(); diff --git a/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java b/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java index 3c9d63977..272d7ac11 100644 --- a/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java +++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java @@ -14,8 +14,8 @@ import org.bukkit.event.entity.EntityExplodeEvent; public class SignEntityListener implements Listener { - private final transient IEssentials ess; - private final transient ISignsPlugin plugin; + private final IEssentials ess; + private final ISignsPlugin plugin; public SignEntityListener(final IEssentials ess, final ISignsPlugin plugin) { diff --git a/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java b/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java index 6d6f14b93..d6c6e3ece 100644 --- a/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java +++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java @@ -15,8 +15,8 @@ import org.bukkit.event.player.PlayerInteractEvent; public class SignPlayerListener implements Listener { - private final transient IEssentials ess; - private final transient ISignsPlugin plugin; + private final IEssentials ess; + private final ISignsPlugin plugin; public SignPlayerListener(final IEssentials ess, final ISignsPlugin plugin) { diff --git a/EssentialsUpdate/src/net/ess3/update/AbstractWorkListener.java b/EssentialsUpdate/src/net/ess3/update/AbstractWorkListener.java index e63508464..5b6f62353 100644 --- a/EssentialsUpdate/src/net/ess3/update/AbstractWorkListener.java +++ b/EssentialsUpdate/src/net/ess3/update/AbstractWorkListener.java @@ -11,8 +11,8 @@ public abstract class AbstractWorkListener this.newVersionInfo = newVersionInfo; } - private final transient Plugin plugin; - private final transient VersionInfo newVersionInfo; + private final Plugin plugin; + private final VersionInfo newVersionInfo; public final void onWorkAbort() { diff --git a/EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java b/EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java index a4629ce14..03d9bb937 100644 --- a/EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java +++ b/EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java @@ -17,11 +17,11 @@ import org.bukkit.plugin.PluginManager; public class EssentialsHelp implements Listener { - private transient Player chatUser; - private final transient Server server; - private final transient Plugin plugin; - private transient IrcBot ircBot; - private final transient Map commands = new HashMap(); + private Player chatUser; + private final Server server; + private final Plugin plugin; + private IrcBot ircBot; + private final Map commands = new HashMap(); public EssentialsHelp(final Plugin plugin) { diff --git a/EssentialsUpdate/src/net/ess3/update/EssentialsUpdate.java b/EssentialsUpdate/src/net/ess3/update/EssentialsUpdate.java index 33875423a..13aec2c00 100644 --- a/EssentialsUpdate/src/net/ess3/update/EssentialsUpdate.java +++ b/EssentialsUpdate/src/net/ess3/update/EssentialsUpdate.java @@ -9,8 +9,8 @@ import org.bukkit.plugin.java.JavaPlugin; public class EssentialsUpdate extends JavaPlugin { - private transient EssentialsHelp essentialsHelp; - private transient UpdateProcess updateProcess; + private EssentialsHelp essentialsHelp; + private UpdateProcess updateProcess; @Override public void onEnable() diff --git a/EssentialsUpdate/src/net/ess3/update/GetFile.java b/EssentialsUpdate/src/net/ess3/update/GetFile.java index 9636e3bd1..4b8d67562 100644 --- a/EssentialsUpdate/src/net/ess3/update/GetFile.java +++ b/EssentialsUpdate/src/net/ess3/update/GetFile.java @@ -14,8 +14,8 @@ import org.bukkit.Bukkit; public class GetFile { - private transient URLConnection connection; - private transient MessageDigest digest; + private URLConnection connection; + private MessageDigest digest; public GetFile(final String urlString) throws MalformedURLException, IOException { diff --git a/EssentialsUpdate/src/net/ess3/update/ModuleInfo.java b/EssentialsUpdate/src/net/ess3/update/ModuleInfo.java index 993575cbf..e0380cf14 100644 --- a/EssentialsUpdate/src/net/ess3/update/ModuleInfo.java +++ b/EssentialsUpdate/src/net/ess3/update/ModuleInfo.java @@ -7,9 +7,9 @@ import org.bukkit.configuration.Configuration; public class ModuleInfo { - private final transient String url; - private final transient String version; - private final transient String hash; + private final String url; + private final String version; + private final String hash; public ModuleInfo(final Configuration updateConfig, final String path) { diff --git a/EssentialsUpdate/src/net/ess3/update/PastieUpload.java b/EssentialsUpdate/src/net/ess3/update/PastieUpload.java index fba475b70..0880960ea 100644 --- a/EssentialsUpdate/src/net/ess3/update/PastieUpload.java +++ b/EssentialsUpdate/src/net/ess3/update/PastieUpload.java @@ -11,7 +11,7 @@ import java.util.regex.Pattern; public class PastieUpload { - private final transient PostToUrl connection; + private final PostToUrl connection; private final Pattern pattern = Pattern.compile("(?s).*\\?key=([a-z0-9]+).*"); public PastieUpload() throws MalformedURLException diff --git a/EssentialsUpdate/src/net/ess3/update/PostToUrl.java b/EssentialsUpdate/src/net/ess3/update/PostToUrl.java index 28fc13c55..5a1bddff9 100644 --- a/EssentialsUpdate/src/net/ess3/update/PostToUrl.java +++ b/EssentialsUpdate/src/net/ess3/update/PostToUrl.java @@ -14,9 +14,9 @@ import java.util.Random; public class PostToUrl { - private final transient URL url; - private final transient String boundary; - private final transient Random random = new Random(); + private final URL url; + private final String boundary; + private final Random random = new Random(); private final static String CRLF = "\r\n"; private final static Charset UTF8 = Charset.forName("utf-8"); diff --git a/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java b/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java index 8e8b3e7ed..bd3e6300e 100644 --- a/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java +++ b/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java @@ -12,14 +12,14 @@ import org.bukkit.plugin.PluginManager; public class UpdateCheck { - private transient CheckResult result = CheckResult.UNKNOWN; - private transient Version currentVersion; - private transient Version newVersion = null; - private transient int bukkitResult = 0; - private transient UpdateFile updateFile; + private CheckResult result = CheckResult.UNKNOWN; + private Version currentVersion; + private Version newVersion = null; + private int bukkitResult = 0; + private UpdateFile updateFile; private final static int CHECK_INTERVAL = 20 * 60 * 60 * 6; - private final transient Plugin plugin; - private transient boolean essentialsInstalled; + private final Plugin plugin; + private boolean essentialsInstalled; private final Pattern bukkitVersionPattern = Pattern.compile("git-Bukkit-(?:(?:[0-9]+)\\.)+[0-9]+-R[\\.0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*"); public UpdateCheck(final Plugin plugin) diff --git a/EssentialsUpdate/src/net/ess3/update/UpdateFile.java b/EssentialsUpdate/src/net/ess3/update/UpdateFile.java index a369ad44e..117daab8c 100644 --- a/EssentialsUpdate/src/net/ess3/update/UpdateFile.java +++ b/EssentialsUpdate/src/net/ess3/update/UpdateFile.java @@ -24,9 +24,9 @@ public class UpdateFile private final static BigInteger PUBLIC_KEY = new BigInteger( "5ha6a2d4qdy17ttkg8evh74sl5a87djojwenu12k1lvy8ui6003e6l06rntczpoh99mhc3txj8mqlxw111oyy9yl7s7qpyluyzix3j1odxrxx4u52gxvyu6qiteapczkzvi7rxgeqsozz7b19rdx73a7quo9ybwpz1cr82r7x5k0pg2a73pjjsv2j1awr13azo7klrcxp9y5xxwf5qv1s3tw4zqftli18u0ek5qkbzfbgk1v5n2f11pkwwk6p0mibrn26wnjbv11vyiqgu95o7busmt6vf5q7grpcenl637w83mbin56s3asj1131b2mscj9xep3cbj7la9tgsxl5bj87vzy8sk2d34kzwqdqgh9nry43nqqus12l1stmiv184r8r3jcy8w43e8h1u1mzklldb5eytkuhayqik8l3ns04hwt8sgacvw534be8sx26qrn5s1", 36); - private final transient File file; - private final transient Plugin plugin; - private final transient TreeMap versions = new TreeMap(); + private final File file; + private final Plugin plugin; + private final TreeMap versions = new TreeMap(); public UpdateFile(final Plugin plugin) { diff --git a/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java b/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java index 0e9f59283..3deda79af 100644 --- a/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java +++ b/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java @@ -18,10 +18,10 @@ import org.bukkit.plugin.Plugin; // TODO: This whole thing should make use of the conversations api public class UpdateProcess implements Listener { - private transient Player currentPlayer; - private final transient Plugin plugin; - private final transient UpdateCheck updateCheck; - private transient StateMachine stateMachine; + private Player currentPlayer; + private final Plugin plugin; + private final UpdateCheck updateCheck; + private StateMachine stateMachine; public UpdateProcess(final Plugin plugin, final UpdateCheck updateCheck) { diff --git a/EssentialsUpdate/src/net/ess3/update/Version.java b/EssentialsUpdate/src/net/ess3/update/Version.java index ee449186f..3611705ec 100644 --- a/EssentialsUpdate/src/net/ess3/update/Version.java +++ b/EssentialsUpdate/src/net/ess3/update/Version.java @@ -31,10 +31,10 @@ public class Version implements Comparable return type; } - private final transient int major; - private final transient int minor; - private final transient int build; - private final transient Type type; + private final int major; + private final int minor; + private final int build; + private final Type type; public Version(final String versionString) { diff --git a/EssentialsUpdate/src/net/ess3/update/VersionInfo.java b/EssentialsUpdate/src/net/ess3/update/VersionInfo.java index afbe87de8..c9e0eb7ec 100644 --- a/EssentialsUpdate/src/net/ess3/update/VersionInfo.java +++ b/EssentialsUpdate/src/net/ess3/update/VersionInfo.java @@ -9,10 +9,10 @@ import org.bukkit.configuration.Configuration; public class VersionInfo { - private final transient List changelog; - private final transient int minBukkit; - private final transient int maxBukkit; - private final transient Map modules; + private final List changelog; + private final int minBukkit; + private final int maxBukkit; + private final Map modules; public VersionInfo(final Configuration updateConfig, final String path) { diff --git a/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java b/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java index fff363835..b6b83b0bb 100644 --- a/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java +++ b/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java @@ -8,7 +8,7 @@ import org.bukkit.plugin.Plugin; public abstract class AbstractFileCommand implements Command { - private final transient Plugin plugin; + private final Plugin plugin; private final static Charset UTF8 = Charset.forName("utf-8"); public AbstractFileCommand(final Plugin plugin) diff --git a/EssentialsUpdate/src/net/ess3/update/chat/ErrorsCommand.java b/EssentialsUpdate/src/net/ess3/update/chat/ErrorsCommand.java index 6e3c29924..04832dbc0 100644 --- a/EssentialsUpdate/src/net/ess3/update/chat/ErrorsCommand.java +++ b/EssentialsUpdate/src/net/ess3/update/chat/ErrorsCommand.java @@ -11,7 +11,7 @@ import org.bukkit.plugin.Plugin; public class ErrorsCommand extends AbstractFileCommand implements Command { - private final transient Pattern pattern = Pattern.compile("^[0-9 :-]+\\[INFO\\].*"); + private final Pattern pattern = Pattern.compile("^[0-9 :-]+\\[INFO\\].*"); public ErrorsCommand(final Plugin plugin) { diff --git a/EssentialsUpdate/src/net/ess3/update/chat/IrcBot.java b/EssentialsUpdate/src/net/ess3/update/chat/IrcBot.java index 348a9ae44..b33ff9dd7 100644 --- a/EssentialsUpdate/src/net/ess3/update/chat/IrcBot.java +++ b/EssentialsUpdate/src/net/ess3/update/chat/IrcBot.java @@ -15,9 +15,9 @@ public class IrcBot extends PircBot private static final String CHANNEL = "#essentials"; private static final int PORT = 6667; private static final String SERVER = "irc.esper.net"; - private transient boolean reconnect = true; - private final transient Player player; - private transient boolean kicked = false; + private boolean reconnect = true; + private final Player player; + private boolean kicked = false; public IrcBot(final Player player, final String nickName, final String versionString) { diff --git a/EssentialsUpdate/src/net/ess3/update/chat/StartupCommand.java b/EssentialsUpdate/src/net/ess3/update/chat/StartupCommand.java index 978da60c2..1ac171e42 100644 --- a/EssentialsUpdate/src/net/ess3/update/chat/StartupCommand.java +++ b/EssentialsUpdate/src/net/ess3/update/chat/StartupCommand.java @@ -11,8 +11,8 @@ import org.bukkit.plugin.Plugin; public class StartupCommand extends AbstractFileCommand implements Command { - private final transient Pattern patternStart = Pattern.compile("^[0-9 :-]+\\[INFO\\] Starting minecraft server version.*"); - private final transient Pattern patternEnd = Pattern.compile("^[0-9 :-]+\\[INFO\\] Done \\([0-9.,]+s\\)! For help, type \"help\".*"); + private final Pattern patternStart = Pattern.compile("^[0-9 :-]+\\[INFO\\] Starting minecraft server version.*"); + private final Pattern patternEnd = Pattern.compile("^[0-9 :-]+\\[INFO\\] Done \\([0-9.,]+s\\)! For help, type \"help\".*"); public StartupCommand(final Plugin plugin) { diff --git a/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java b/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java index 783ba19a1..ddcba9250 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java +++ b/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java @@ -6,8 +6,8 @@ import org.bukkit.entity.Player; public abstract class AbstractState { - private transient boolean abortion = false; - private final transient StateMap stateMap; + private boolean abortion = false; + private final StateMap stateMap; public AbstractState(final StateMap stateMap) { diff --git a/EssentialsUpdate/src/net/ess3/update/states/AbstractYesNoState.java b/EssentialsUpdate/src/net/ess3/update/states/AbstractYesNoState.java index e84046224..0747c188b 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/AbstractYesNoState.java +++ b/EssentialsUpdate/src/net/ess3/update/states/AbstractYesNoState.java @@ -4,8 +4,8 @@ package net.ess3.update.states; public abstract class AbstractYesNoState extends AbstractState { private boolean answer = false; - private final transient Class yesState; - private final transient Class noState; + private final Class yesState; + private final Class noState; public AbstractYesNoState(final StateMap states, final Class nextState) { diff --git a/EssentialsUpdate/src/net/ess3/update/states/Changelog.java b/EssentialsUpdate/src/net/ess3/update/states/Changelog.java index eccc4548a..9f6fc1a46 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/Changelog.java +++ b/EssentialsUpdate/src/net/ess3/update/states/Changelog.java @@ -9,10 +9,10 @@ import org.bukkit.entity.Player; public class Changelog extends AbstractState { private static final int CHANGES_PER_PAGE = 5; - private transient int page = 0; - private transient boolean confirmed = false; - private transient final List changes; - private transient final int pages; + private int page = 0; + private boolean confirmed = false; + private final List changes; + private final int pages; public Changelog(final StateMap stateMap) { diff --git a/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java b/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java index c9dbb1f6a..c6e3cc3cb 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java +++ b/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java @@ -16,10 +16,10 @@ public class StateMachine extends AbstractWorkListener implements Runnable } - private final transient StateMap states = new StateMap(); - private transient AbstractState current; - private transient Player player; - private transient MachineResult result = MachineResult.NONE; + private final StateMap states = new StateMap(); + private AbstractState current; + private Player player; + private MachineResult result = MachineResult.NONE; public StateMachine(final Plugin plugin, final Player player, final UpdateCheck updateCheck) { @@ -85,7 +85,7 @@ public class StateMachine extends AbstractWorkListener implements Runnable return result; } - private transient Iterator iterator; + private Iterator iterator; public void startWork() { diff --git a/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java b/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java index bc043c6de..e8495fe2c 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java +++ b/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java @@ -6,8 +6,8 @@ import org.bukkit.entity.Player; public class UpdateOrInstallation extends AbstractState { - private final transient UpdateCheck updateCheck; - private transient boolean update = false; + private final UpdateCheck updateCheck; + private boolean update = false; public UpdateOrInstallation(final StateMap stateMap, final UpdateCheck updateCheck) { diff --git a/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java b/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java index 82e906d90..e24a69f2a 100644 --- a/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java +++ b/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java @@ -12,9 +12,9 @@ import org.bukkit.Bukkit; public class InstallModule implements Runnable, Task { - protected final transient AbstractWorkListener listener; - private final transient String moduleName; - private final transient String fileName; + protected final AbstractWorkListener listener; + private final String moduleName; + private final String fileName; public InstallModule(final AbstractWorkListener listener, final String moduleName) { diff --git a/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java b/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java index 31d45e741..d4bc7b066 100644 --- a/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java +++ b/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java @@ -6,7 +6,7 @@ import org.bukkit.Bukkit; public class SelfUpdate extends AbstractWorkListener implements Task, Runnable { - private final transient AbstractWorkListener listener; + private final AbstractWorkListener listener; public SelfUpdate(final AbstractWorkListener listener) { diff --git a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java index fbfbbf56a..baafb27f0 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java @@ -20,10 +20,10 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP { private static final Logger LOGGER = Logger.getLogger("Minecraft"); private static EssentialsXMPP instance = null; - private transient UserManager users; - private transient XMPPManager xmpp; - private transient IEssentials ess; - private transient TabExecutor commandHandler; + private UserManager users; + private XMPPManager xmpp; + private IEssentials ess; + private TabExecutor commandHandler; public static IEssentialsXMPP getInstance() { diff --git a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java index 85676198c..0f27c05c9 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java @@ -11,7 +11,7 @@ import org.bukkit.event.player.PlayerQuitEvent; //TODO: port 2.9 changes and verify thread safety. class EssentialsXMPPPlayerListener implements Listener { - private final transient IEssentials ess; + private final IEssentials ess; EssentialsXMPPPlayerListener(final IEssentials ess) { diff --git a/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java b/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java index c80680445..0e0c48b4e 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java @@ -11,9 +11,9 @@ import org.bukkit.configuration.file.YamlConfiguration; public class UserManager implements IReload { - private transient YamlConfiguration users; - private final transient File folder; - private final transient List spyusers = new ArrayList(); + private YamlConfiguration users; + private final File folder; + private final List spyusers = new ArrayList(); private final static String ADDRESS = "address"; private final static String SPY = "spy"; diff --git a/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java b/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java index a04ab25d9..34d98cb11 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java @@ -19,17 +19,17 @@ public final class XMPPManager extends Handler implements MessageListener, ChatM { private static final Logger LOGGER = Logger.getLogger("Minecraft"); private static final SimpleFormatter formatter = new SimpleFormatter(); - private transient YamlConfiguration config = null; - private transient XMPPConnection connection; - private transient ChatManager chatManager; - private final transient Map chats = Collections.synchronizedMap(new HashMap()); - private final transient Set logrecords = Collections.synchronizedSet(new HashSet()); - private final transient IEssentialsXMPP parent; - private transient List logUsers; - private transient Level logLevel; - private transient boolean ignoreLagMessages = true; - private transient Thread loggerThread; - private transient boolean threadrunning = true; + private YamlConfiguration config = null; + private XMPPConnection connection; + private ChatManager chatManager; + private final Map chats = Collections.synchronizedMap(new HashMap()); + private final Set logrecords = Collections.synchronizedSet(new HashSet()); + private final IEssentialsXMPP parent; + private List logUsers; + private Level logLevel; + private boolean ignoreLagMessages = true; + private Thread loggerThread; + private boolean threadrunning = true; public XMPPManager(final IEssentialsXMPP parent) { -- cgit v1.2.3