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/update/states/AbstractState.java | 4 ++-- .../src/net/ess3/update/states/AbstractYesNoState.java | 4 ++-- EssentialsUpdate/src/net/ess3/update/states/Changelog.java | 8 ++++---- .../src/net/ess3/update/states/StateMachine.java | 13 ++++++++----- .../src/net/ess3/update/states/UpdateOrInstallation.java | 4 ++-- 5 files changed, 18 insertions(+), 15 deletions(-) (limited to 'EssentialsUpdate/src/net/ess3/update/states') diff --git a/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java b/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java index ddcba9250..783ba19a1 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 boolean abortion = false; - private final StateMap stateMap; + private transient boolean abortion = false; + private final transient 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 0747c188b..e84046224 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 Class yesState; - private final Class noState; + private final transient Class yesState; + private final transient 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 9f6fc1a46..eccc4548a 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 int page = 0; - private boolean confirmed = false; - private final List changes; - private final int pages; + private transient int page = 0; + private transient boolean confirmed = false; + private transient final List changes; + private transient 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 ae947e687..c9dbb1f6a 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java +++ b/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java @@ -14,10 +14,12 @@ public class StateMachine extends AbstractWorkListener implements Runnable { ABORT, WAIT, DONE, NONE } - private final StateMap states = new StateMap(); - private AbstractState current; - private Player player; - private MachineResult result = MachineResult.NONE; + + + private final transient StateMap states = new StateMap(); + private transient AbstractState current; + private transient Player player; + private transient MachineResult result = MachineResult.NONE; public StateMachine(final Plugin plugin, final Player player, final UpdateCheck updateCheck) { @@ -82,7 +84,8 @@ public class StateMachine extends AbstractWorkListener implements Runnable } return result; } - private Iterator iterator; + + private transient 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 e8495fe2c..bc043c6de 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 UpdateCheck updateCheck; - private boolean update = false; + private final transient UpdateCheck updateCheck; + private transient boolean update = false; public UpdateOrInstallation(final StateMap stateMap, final UpdateCheck updateCheck) { -- cgit v1.2.3