From 2a097530e5ea96e1329dca19b049a23ccce5d3ba Mon Sep 17 00:00:00 2001 From: Iaccidentally Date: Mon, 14 Jan 2013 20:06:28 -0500 Subject: Revert "Remove Transient :: Formatting Cleanup" --- .../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 +++++++++++----------- 4 files changed, 19 insertions(+), 19 deletions(-) (limited to 'EssentialsXMPP') diff --git a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java index baafb27f0..fbfbbf56a 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 UserManager users; - private XMPPManager xmpp; - private IEssentials ess; - private TabExecutor commandHandler; + private transient UserManager users; + private transient XMPPManager xmpp; + private transient IEssentials ess; + private transient 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 0f27c05c9..85676198c 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 IEssentials ess; + private final transient 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 0e0c48b4e..c80680445 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 YamlConfiguration users; - private final File folder; - private final List spyusers = new ArrayList(); + private transient YamlConfiguration users; + private final transient File folder; + private final transient 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 34d98cb11..a04ab25d9 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 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; + 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; public XMPPManager(final IEssentialsXMPP parent) { -- cgit v1.2.3