Upstream
/
Essentials
mirror of https://github.com/EssentialsX/Essentials.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Modifier order consistency

This commit is contained in:
Iaccidentally 2014-02-04 11:11:43 -05:00
parent 20ff61909f
commit 518650e842
22 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/Essentials.java
View File

@ -579,7 +579,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
} }
} }
static public void wrongVersion() public static void wrongVersion()
{ {
LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *"); LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
LOGGER.log(Level.SEVERE, _("notRecommendedBukkit")); LOGGER.log(Level.SEVERE, _("notRecommendedBukkit"));

2
Essentials/src/com/earth2me/essentials/ExecuteTimer.java
View File

@ -65,7 +65,7 @@ public class ExecuteTimer
} }
static private class ExecuteRecord private static class ExecuteRecord
{ {
private final String mark; private final String mark;
private final long time; private final long time;

2
Essentials/src/com/earth2me/essentials/I18n.java
View File

@ -25,7 +25,7 @@ public class I18n implements net.ess3.api.II18n
private final transient ResourceBundle defaultBundle; private final transient ResourceBundle defaultBundle;
private final transient Map<String, MessageFormat> messageFormatCache = new HashMap<String, MessageFormat>(); private final transient Map<String, MessageFormat> messageFormatCache = new HashMap<String, MessageFormat>();
private final transient IEssentials ess; private final transient IEssentials ess;
private final static Pattern NODOUBLEMARK = Pattern.compile("''"); private static final Pattern NODOUBLEMARK = Pattern.compile("''");
public I18n(final IEssentials ess) public I18n(final IEssentials ess)
{ {

2
Essentials/src/com/earth2me/essentials/ManagedFile.java
View File

@ -17,7 +17,7 @@ import org.bukkit.Bukkit;
public class ManagedFile public class ManagedFile
{ {
private final static int BUFFERSIZE = 1024 * 8; private static final int BUFFERSIZE = 1024 * 8;
private final transient File file; private final transient File file;
public ManagedFile(final String filename, final IEssentials ess) public ManagedFile(final String filename, final IEssentials ess)

4
Essentials/src/com/earth2me/essentials/MetaItemStack.java
View File

@ -24,8 +24,8 @@ import org.bukkit.potion.PotionEffectType;
public class MetaItemStack public class MetaItemStack
{ {
private final static Map<String, DyeColor> colorMap = new HashMap<String, DyeColor>(); private static final Map<String, DyeColor> colorMap = new HashMap<String, DyeColor>();
private final static Map<String, FireworkEffect.Type> fireworkShape = new HashMap<String, FireworkEffect.Type>(); private static final Map<String, FireworkEffect.Type> fireworkShape = new HashMap<String, FireworkEffect.Type>();
static static
{ {
for (DyeColor color : DyeColor.values()) for (DyeColor color : DyeColor.values())

12
Essentials/src/com/earth2me/essentials/PlayerList.java
View File

@ -16,7 +16,7 @@ import org.bukkit.entity.Player;
public class PlayerList public class PlayerList
{ {
// Cosmetic list formatting // Cosmetic list formatting
static public String listUsers(final IEssentials ess, final List<User> users, final String seperator) public static String listUsers(final IEssentials ess, final List<User> users, final String seperator)
{ {
final StringBuilder groupString = new StringBuilder(); final StringBuilder groupString = new StringBuilder();
Collections.sort(users); Collections.sort(users);
@ -44,7 +44,7 @@ public class PlayerList
} }
// Produce a user summary: There are 5 out of maximum 10 players online. // Produce a user summary: There are 5 out of maximum 10 players online.
static public String listSummary(final IEssentials ess, final boolean showHidden) public static String listSummary(final IEssentials ess, final boolean showHidden)
{ {
Server server = ess.getServer(); Server server = ess.getServer();
int playerHidden = 0; int playerHidden = 0;
@ -68,7 +68,7 @@ public class PlayerList
} }
// Build the basic player list, divided by groups. // Build the basic player list, divided by groups.
static public Map<String, List<User>> getPlayerLists(final IEssentials ess, final boolean showHidden) public static Map<String, List<User>> getPlayerLists(final IEssentials ess, final boolean showHidden)
{ {
Server server = ess.getServer(); Server server = ess.getServer();
final Map<String, List<User>> playerList = new HashMap<String, List<User>>(); final Map<String, List<User>> playerList = new HashMap<String, List<User>>();
@ -92,7 +92,7 @@ public class PlayerList
} }
// Handle the merging of groups // Handle the merging of groups
static public List<User> getMergedList(final IEssentials ess, final Map<String, List<User>> playerList, final String groupName) public static List<User> getMergedList(final IEssentials ess, final Map<String, List<User>> playerList, final String groupName)
{ {
final Set<String> configGroups = ess.getSettings().getListGroupConfig().keySet(); final Set<String> configGroups = ess.getSettings().getListGroupConfig().keySet();
final List<User> users = new ArrayList<User>(); final List<User> users = new ArrayList<User>();
@ -122,7 +122,7 @@ public class PlayerList
} }
// Output a playerlist of just a single group, /list <groupname> // Output a playerlist of just a single group, /list <groupname>
static public String listGroupUsers(final IEssentials ess, final Map<String, List<User>> playerList, final String groupName) throws Exception public static String listGroupUsers(final IEssentials ess, final Map<String, List<User>> playerList, final String groupName) throws Exception
{ {
final List<User> users = getMergedList(ess, playerList, groupName); final List<User> users = getMergedList(ess, playerList, groupName);
final List<User> groupUsers = playerList.get(groupName); final List<User> groupUsers = playerList.get(groupName);
@ -141,7 +141,7 @@ public class PlayerList
} }
// Build the output string // Build the output string
static public String outputFormat(final String group, final String message) public static String outputFormat(final String group, final String message)
{ {
final StringBuilder outputString = new StringBuilder(); final StringBuilder outputString = new StringBuilder();
outputString.append(_("listGroupTag", FormatUtil.replaceFormat(group))); outputString.append(_("listGroupTag", FormatUtil.replaceFormat(group)));

6
Essentials/src/com/earth2me/essentials/Settings.java
View File

@ -24,7 +24,7 @@ import org.bukkit.inventory.ItemStack;
public class Settings implements net.ess3.api.ISettings public class Settings implements net.ess3.api.ISettings
{ {
private final transient EssentialsConf config; private final transient EssentialsConf config;
private final static Logger logger = Logger.getLogger("Essentials"); private static final Logger logger = Logger.getLogger("Essentials");
private final transient IEssentials ess; private final transient IEssentials ess;
private boolean metricsEnabled = true; private boolean metricsEnabled = true;
@ -727,7 +727,7 @@ public class Settings implements net.ess3.api.ISettings
{ {
return config.getBoolean(configName, def); return config.getBoolean(configName, def);
} }
private final static BigDecimal MAXMONEY = new BigDecimal("10000000000000"); private static final BigDecimal MAXMONEY = new BigDecimal("10000000000000");
private BigDecimal maxMoney = MAXMONEY; private BigDecimal maxMoney = MAXMONEY;
private BigDecimal _getMaxMoney() private BigDecimal _getMaxMoney()
@ -740,7 +740,7 @@ public class Settings implements net.ess3.api.ISettings
{ {
return maxMoney; return maxMoney;
} }
private final static BigDecimal MINMONEY = new BigDecimal("-10000000000000"); private static final BigDecimal MINMONEY = new BigDecimal("-10000000000000");
private BigDecimal minMoney = MINMONEY; private BigDecimal minMoney = MINMONEY;
private BigDecimal _getMinMoney() private BigDecimal _getMinMoney()

4
Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java
View File

@ -19,8 +19,8 @@ public class Commandclearinventory extends EssentialsCommand
{ {
super("clearinventory"); super("clearinventory");
} }
static int BASE_AMOUNT = 100000; private static final int BASE_AMOUNT = 100000;
static int EXTENDED_CAP = 8; private static final int EXTENDED_CAP = 8;
@Override @Override
public void run(Server server, User user, String commandLabel, String[] args) throws Exception public void run(Server server, User user, String commandLabel, String[] args) throws Exception

2
Essentials/src/com/earth2me/essentials/commands/Commandptime.java
View File

@ -12,7 +12,7 @@ import org.bukkit.entity.Player;
public class Commandptime extends EssentialsCommand public class Commandptime extends EssentialsCommand
{ {
public static final Set<String> getAliases = new HashSet<String>(); private static final Set<String> getAliases = new HashSet<String>();
static static
{ {

2
Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
View File

@ -19,7 +19,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
public class Commandwarp extends EssentialsCommand public class Commandwarp extends EssentialsCommand
{ {
private final static int WARPS_PER_PAGE = 20; private static final int WARPS_PER_PAGE = 20;
public Commandwarp() public Commandwarp()
{ {

2
Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java
View File

@ -17,7 +17,7 @@ public abstract class EssentialsCommand implements IEssentialsCommand
private final transient String name; private final transient String name;
protected transient IEssentials ess; protected transient IEssentials ess;
protected transient IEssentialsModule module; protected transient IEssentialsModule module;
protected final static Logger logger = Logger.getLogger("Essentials"); protected static final Logger logger = Logger.getLogger("Essentials");
protected EssentialsCommand(final String name) protected EssentialsCommand(final String name)
{ {

2
Essentials/src/com/earth2me/essentials/metrics/Metrics.java
View File

@ -45,7 +45,7 @@ public class Metrics
/** /**
* The current revision number * The current revision number
*/ */
private final static int REVISION = 7; private static final int REVISION = 7;
/** /**
* The base url of the metrics domain * The base url of the metrics domain

2
Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java
View File

@ -14,7 +14,7 @@ public class PermissionsHandler implements IPermissionsHandler
private transient IPermissionsHandler handler = new NullPermissionsHandler(); private transient IPermissionsHandler handler = new NullPermissionsHandler();
private transient String defaultGroup = "default"; private transient String defaultGroup = "default";
private final transient Plugin plugin; private final transient Plugin plugin;
private final static Logger LOGGER = Logger.getLogger("Essentials"); private static final Logger LOGGER = Logger.getLogger("Essentials");
private transient boolean useSuperperms = false; private transient boolean useSuperperms = false;
public PermissionsHandler(final Plugin plugin) public PermissionsHandler(final Plugin plugin)

6
Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
View File

@ -18,9 +18,9 @@ import org.bukkit.event.block.*;
public class SignBlockListener implements Listener public class SignBlockListener implements Listener
{ {
private final static Logger LOGGER = Logger.getLogger("Essentials"); private static final Logger LOGGER = Logger.getLogger("Essentials");
private final static Material WALL_SIGN = Material.WALL_SIGN; private static final Material WALL_SIGN = Material.WALL_SIGN;
private final static Material SIGN_POST = Material.SIGN_POST; private static final Material SIGN_POST = Material.SIGN_POST;
private final transient IEssentials ess; private final transient IEssentials ess;
public SignBlockListener(IEssentials ess) public SignBlockListener(IEssentials ess)

2
Essentials/src/com/earth2me/essentials/textreader/HelpInput.java
View File

@ -16,7 +16,7 @@ public class HelpInput implements IText
private static final String DESCRIPTION = "description"; private static final String DESCRIPTION = "description";
private static final String PERMISSION = "permission"; private static final String PERMISSION = "permission";
private static final String PERMISSIONS = "permissions"; private static final String PERMISSIONS = "permissions";
private final static Logger logger = Logger.getLogger("Essentials"); private static final Logger logger = Logger.getLogger("Essentials");
private final transient List<String> lines = new ArrayList<String>(); private final transient List<String> lines = new ArrayList<String>();
private final transient List<String> chapters = new ArrayList<String>(); private final transient List<String> chapters = new ArrayList<String>();
private final transient Map<String, Integer> bookmarks = new HashMap<String, Integer>(); private final transient Map<String, Integer> bookmarks = new HashMap<String, Integer>();

4
Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java
View File

@ -31,8 +31,8 @@ import org.bukkit.plugin.Plugin;
public class KeywordReplacer implements IText public class KeywordReplacer implements IText
{ {
private final static Pattern KEYWORD = Pattern.compile("\\{([^\\{\\}]+)\\}"); private static final Pattern KEYWORD = Pattern.compile("\\{([^\\{\\}]+)\\}");
private final static Pattern KEYWORDSPLIT = Pattern.compile("\\:"); private static final Pattern KEYWORDSPLIT = Pattern.compile("\\:");
private final transient IText input; private final transient IText input;
private final transient List<String> replaced; private final transient List<String> replaced;
private final transient IEssentials ess; private final transient IEssentials ess;

2
Essentials/src/com/earth2me/essentials/textreader/TextInput.java
View File

@ -12,7 +12,7 @@ import net.ess3.api.IEssentials;
public class TextInput implements IText public class TextInput implements IText
{ {
private final static HashMap<String, SoftReference<TextInput>> cache = new HashMap<String, SoftReference<TextInput>>(); private static final HashMap<String, SoftReference<TextInput>> cache = new HashMap<String, SoftReference<TextInput>>();
private final transient List<String> lines; private final transient List<String> lines;
private final transient List<String> chapters; private final transient List<String> chapters;
private final transient Map<String, Integer> bookmarks; private final transient Map<String, Integer> bookmarks;

4
Essentials/src/com/earth2me/essentials/utils/LocationUtil.java
View File

@ -78,8 +78,8 @@ public class LocationUtil
TRANSPARENT_MATERIALS.add((byte)Material.WATER.getId()); TRANSPARENT_MATERIALS.add((byte)Material.WATER.getId());
TRANSPARENT_MATERIALS.add((byte)Material.STATIONARY_WATER.getId()); TRANSPARENT_MATERIALS.add((byte)Material.STATIONARY_WATER.getId());
} }
public final static int RADIUS = 3; public static final int RADIUS = 3;
public final static Vector3D[] VOLUME; public static final Vector3D[] VOLUME;
public static ItemStack convertBlockToItem(final Block block) public static ItemStack convertBlockToItem(final Block block)
{ {

4
Essentials/src/com/earth2me/essentials/utils/StringUtil.java
View File

@ -6,8 +6,8 @@ import java.util.regex.Pattern;
public class StringUtil public class StringUtil
{ {
private final static Pattern INVALIDFILECHARS = Pattern.compile("[^a-z0-9]"); private static final Pattern INVALIDFILECHARS = Pattern.compile("[^a-z0-9]");
private final static Pattern INVALIDCHARS = Pattern.compile("[^\t\n\r\u0020-\u007E\u0085\u00A0-\uD7FF\uE000-\uFFFC]"); private static final Pattern INVALIDCHARS = Pattern.compile("[^\t\n\r\u0020-\u007E\u0085\u00A0-\uD7FF\uE000-\uFFFC]");
//Used to clean file names before saving to disk //Used to clean file names before saving to disk
public static String sanitizeFileName(final String name) public static String sanitizeFileName(final String name)

4
Essentials/test/com/earth2me/essentials/EconomyTest.java
View File

@ -13,8 +13,8 @@ import org.junit.Test;
public class EconomyTest extends TestCase public class EconomyTest extends TestCase
{ {
private final transient Essentials ess; private final transient Essentials ess;
private final static String NPCNAME = "npc1"; private static final String NPCNAME = "npc1";
private final static String PLAYERNAME = "TestPlayer1"; private static final String PLAYERNAME = "TestPlayer1";
public EconomyTest(final String testName) public EconomyTest(final String testName)
{ {

2
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
View File

@ -13,7 +13,7 @@ import org.bukkit.event.player.AsyncPlayerChatEvent;
public abstract class EssentialsChatPlayer implements Listener public abstract class EssentialsChatPlayer implements Listener
{ {
protected final static Logger logger = Logger.getLogger("Minecraft"); protected static final Logger logger = Logger.getLogger("Minecraft");
protected transient IEssentials ess; protected transient IEssentials ess;
protected final transient Server server; protected final transient Server server;
protected final transient Map<AsyncPlayerChatEvent, ChatStore> chatStorage; protected final transient Map<AsyncPlayerChatEvent, ChatStore> chatStorage;

4
EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java
View File

@ -10,8 +10,8 @@ public class UserManager implements IConf
{ {
private final transient EssentialsConf users; private final transient EssentialsConf users;
private final transient List<String> spyusers = Collections.synchronizedList(new ArrayList<String>()); private final transient List<String> spyusers = Collections.synchronizedList(new ArrayList<String>());
private final static String ADDRESS = "address"; private static final String ADDRESS = "address";
private final static String SPY = "spy"; private static final String SPY = "spy";
public UserManager(final File folder) public UserManager(final File folder)
{ {