summaryrefslogtreecommitdiffstats
path: root/EssentialsUpdate/src/net/ess3/update/states
diff options
context:
space:
mode:
authorIaccidentally <coryhuckaby@gmail.com>2013-01-14 20:06:28 -0500
committerIaccidentally <coryhuckaby@gmail.com>2013-01-14 20:06:28 -0500
commit2a097530e5ea96e1329dca19b049a23ccce5d3ba (patch)
treeda72b93c02edb4182f649114fee5fad7d833601f /EssentialsUpdate/src/net/ess3/update/states
parent8e54bf13b281d1299c3dc33f89940bd3a06d1a30 (diff)
downloadEssentials-2a097530e5ea96e1329dca19b049a23ccce5d3ba.tar
Essentials-2a097530e5ea96e1329dca19b049a23ccce5d3ba.tar.gz
Essentials-2a097530e5ea96e1329dca19b049a23ccce5d3ba.tar.lz
Essentials-2a097530e5ea96e1329dca19b049a23ccce5d3ba.tar.xz
Essentials-2a097530e5ea96e1329dca19b049a23ccce5d3ba.zip
Revert "Remove Transient :: Formatting Cleanup"
Diffstat (limited to 'EssentialsUpdate/src/net/ess3/update/states')
-rw-r--r--EssentialsUpdate/src/net/ess3/update/states/AbstractState.java4
-rw-r--r--EssentialsUpdate/src/net/ess3/update/states/AbstractYesNoState.java4
-rw-r--r--EssentialsUpdate/src/net/ess3/update/states/Changelog.java8
-rw-r--r--EssentialsUpdate/src/net/ess3/update/states/StateMachine.java13
-rw-r--r--EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java4
5 files changed, 18 insertions, 15 deletions
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<? extends AbstractState> yesState;
- private final Class<? extends AbstractState> noState;
+ private final transient Class<? extends AbstractState> yesState;
+ private final transient Class<? extends AbstractState> noState;
public AbstractYesNoState(final StateMap states, final Class<? extends AbstractState> 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<String> changes;
- private final int pages;
+ private transient int page = 0;
+ private transient boolean confirmed = false;
+ private transient final List<String> 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<AbstractState> iterator;
+
+ private transient Iterator<AbstractState> 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)
{