mirror of
https://github.com/essentials/Essentials.git
synced 2025-08-12 09:35:26 +02:00
Remove all instances of transient. (properly formatted this time!)
This commit is contained in:
@@ -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()
|
||||
{
|
||||
|
@@ -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<String, Command> commands = new HashMap<String, Command>();
|
||||
private Player chatUser;
|
||||
private final Server server;
|
||||
private final Plugin plugin;
|
||||
private IrcBot ircBot;
|
||||
private final Map<String, Command> commands = new HashMap<String, Command>();
|
||||
|
||||
public EssentialsHelp(final Plugin plugin)
|
||||
{
|
||||
|
@@ -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()
|
||||
|
@@ -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
|
||||
{
|
||||
|
@@ -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)
|
||||
{
|
||||
|
@@ -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
|
||||
|
@@ -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");
|
||||
|
||||
|
@@ -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)
|
||||
|
@@ -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<Version, VersionInfo> versions = new TreeMap<Version, VersionInfo>();
|
||||
private final File file;
|
||||
private final Plugin plugin;
|
||||
private final TreeMap<Version, VersionInfo> versions = new TreeMap<Version, VersionInfo>();
|
||||
|
||||
public UpdateFile(final Plugin plugin)
|
||||
{
|
||||
|
@@ -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)
|
||||
{
|
||||
|
@@ -31,10 +31,10 @@ public class Version implements Comparable<Version>
|
||||
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)
|
||||
{
|
||||
|
@@ -9,10 +9,10 @@ import org.bukkit.configuration.Configuration;
|
||||
|
||||
public class VersionInfo
|
||||
{
|
||||
private final transient List<String> changelog;
|
||||
private final transient int minBukkit;
|
||||
private final transient int maxBukkit;
|
||||
private final transient Map<String, ModuleInfo> modules;
|
||||
private final List<String> changelog;
|
||||
private final int minBukkit;
|
||||
private final int maxBukkit;
|
||||
private final Map<String, ModuleInfo> modules;
|
||||
|
||||
public VersionInfo(final Configuration updateConfig, final String path)
|
||||
{
|
||||
|
@@ -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)
|
||||
|
@@ -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)
|
||||
{
|
||||
|
@@ -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)
|
||||
{
|
||||
|
@@ -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)
|
||||
{
|
||||
|
@@ -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)
|
||||
{
|
||||
|
@@ -4,8 +4,8 @@ package net.ess3.update.states;
|
||||
public abstract class AbstractYesNoState extends AbstractState
|
||||
{
|
||||
private boolean answer = false;
|
||||
private final transient Class<? extends AbstractState> yesState;
|
||||
private final transient Class<? extends AbstractState> noState;
|
||||
private final Class<? extends AbstractState> yesState;
|
||||
private final Class<? extends AbstractState> noState;
|
||||
|
||||
public AbstractYesNoState(final StateMap states, final Class<? extends AbstractState> nextState)
|
||||
{
|
||||
|
@@ -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<String> changes;
|
||||
private transient final int pages;
|
||||
private int page = 0;
|
||||
private boolean confirmed = false;
|
||||
private final List<String> changes;
|
||||
private final int pages;
|
||||
|
||||
public Changelog(final StateMap stateMap)
|
||||
{
|
||||
|
@@ -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<AbstractState> iterator;
|
||||
private Iterator<AbstractState> iterator;
|
||||
|
||||
public void startWork()
|
||||
{
|
||||
|
@@ -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)
|
||||
{
|
||||
|
@@ -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)
|
||||
{
|
||||
|
@@ -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)
|
||||
{
|
||||
|
Reference in New Issue
Block a user