Proper modifier order and removal if implied by their context.

This commit is contained in:
MobiusDev
2018-06-19 02:02:54 +00:00
parent 61b336acb9
commit a5b69096dd
163 changed files with 325 additions and 325 deletions

View File

@@ -191,7 +191,7 @@ public final class Rnd
/**
* @author Forsaiken
*/
public static enum RandomType
public enum RandomType
{
/**
* For best random quality.

View File

@@ -151,7 +151,7 @@ public final class BlockComplexDynamic extends BlockComplex implements IBlockDyn
}
@Override
final synchronized public void addGeoObject(IGeoObject object)
public final synchronized void addGeoObject(IGeoObject object)
{
// add geo object, update block geodata when added
if (_objects.add(object))
@@ -161,7 +161,7 @@ public final class BlockComplexDynamic extends BlockComplex implements IBlockDyn
}
@Override
final synchronized public void removeGeoObject(IGeoObject object)
public final synchronized void removeGeoObject(IGeoObject object)
{
// remove geo object, update block geodata when removed
if (_objects.remove(object))

View File

@@ -196,7 +196,7 @@ public final class BlockMultilayerDynamic extends BlockMultilayer implements IBl
}
@Override
final synchronized public void addGeoObject(IGeoObject object)
public final synchronized void addGeoObject(IGeoObject object)
{
// add geo object, update block geodata when added
if (_objects.add(object))
@@ -206,7 +206,7 @@ public final class BlockMultilayerDynamic extends BlockMultilayer implements IBl
}
@Override
final synchronized public void removeGeoObject(IGeoObject object)
public final synchronized void removeGeoObject(IGeoObject object)
{
// remove geo object, update block geodata when removed
if (_objects.remove(object))

View File

@@ -21,9 +21,9 @@ package com.l2jmobius.gameserver.instancemanager;
*/
public class PlayerCountManager
{
private volatile static int connectedCount = 0;
private volatile static int maxConnectedCount = 0;
private volatile static int offlineTradeCount = 0;
private static volatile int connectedCount = 0;
private static volatile int maxConnectedCount = 0;
private static volatile int offlineTradeCount = 0;
protected PlayerCountManager()
{

View File

@@ -50,7 +50,7 @@ public class RaidBossSpawnManager
protected static final Map<Integer, StatsSet> _storedInfo = new ConcurrentHashMap<>();
protected static final Map<Integer, ScheduledFuture<?>> _schedules = new ConcurrentHashMap<>();
public static enum StatusEnum
public enum StatusEnum
{
ALIVE,
DEAD,

View File

@@ -84,7 +84,7 @@ public final class Elementals
// TODO: Higher stones
};
public static enum ElementalItemType
public enum ElementalItemType
{
Stone(3),
Roughore(3),
@@ -100,7 +100,7 @@ public final class Elementals
}
}
public static enum ElementalItems
public enum ElementalItems
{
fireStone(FIRE, 9546, ElementalItemType.Stone),
waterStone(WATER, 9547, ElementalItemType.Stone),

View File

@@ -914,7 +914,7 @@ public final class L2PcInstance extends L2Playable
private boolean _marryaccepted = false;
// Item Mall
private final static String GAME_POINTS_VAR = "PRIME_POINTS"; // Keep compatibility with later clients.
private static final String GAME_POINTS_VAR = "PRIME_POINTS"; // Keep compatibility with later clients.
// Save responder name for log it
private String _lastPetitionGmName = null;

View File

@@ -87,7 +87,7 @@ public final class OlympiadGameTask implements Runnable
private boolean _needAnnounce = false;
private int _countDown = 0;
private static enum GameState
private enum GameState
{
BEGIN,
TELEPORT_TO_ARENA,

View File

@@ -30,7 +30,7 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
{
Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName());
static final int[] PAPERDOLL_ORDER = new int[]
int[] PAPERDOLL_ORDER = new int[]
{
Inventory.PAPERDOLL_UNDER,
Inventory.PAPERDOLL_REAR,

View File

@@ -44,7 +44,7 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket
private List<L2WarehouseItem> _objects = new ArrayList<>();
private int _whType;
public static enum WarehouseListType
public enum WarehouseListType
{
WEAPON,
ARMOR,

View File

@@ -62,22 +62,22 @@ public class Gui
{
JTextArea txtrConsole;
final static String[] shutdownOptions =
static final String[] shutdownOptions =
{
"Shutdown",
"Cancel"
};
final static String[] restartOptions =
static final String[] restartOptions =
{
"Restart",
"Cancel"
};
final static String[] abortOptions =
static final String[] abortOptions =
{
"Abort",
"Cancel"
};
final static String[] confirmOptions =
static final String[] confirmOptions =
{
"Confirm",
"Cancel"

View File

@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.util.Locator;
*/
public class SystemPanel extends JPanel
{
final static long startTime = System.currentTimeMillis();
static final long startTime = System.currentTimeMillis();
public SystemPanel()
{

View File

@@ -39,7 +39,7 @@ import com.l2jmobius.Config;
public class frmAbout
{
private JFrame frmAbout;
final static String URL = "www.l2jmobius.com";
static final String URL = "www.l2jmobius.com";
URI uri;
public frmAbout()

View File

@@ -61,12 +61,12 @@ public class Gui
JCheckBoxMenuItem chckbxmntmDisabled;
JCheckBoxMenuItem chckbxmntmGmOnly;
final static String[] shutdownOptions =
static final String[] shutdownOptions =
{
"Shutdown",
"Cancel"
};
final static String[] restartOptions =
static final String[] restartOptions =
{
"Restart",
"Cancel"

View File

@@ -37,7 +37,7 @@ import javax.swing.WindowConstants;
public class frmAbout
{
private JFrame frmAbout;
final static String URL = "www.l2jmobius.com";
static final String URL = "www.l2jmobius.com";
URI uri;
public frmAbout()