Use upper case for all instance storing variables.

This commit is contained in:
MobiusDevelopment
2019-04-17 02:12:20 +00:00
parent 57adcfc3d8
commit 3b73e5fc2b
1807 changed files with 3614 additions and 3614 deletions

View File

@@ -38,7 +38,7 @@ public class GameTimeController
public static final int TICKS_PER_SECOND = 10;
public static final int MILLIS_IN_TICK = 1000 / TICKS_PER_SECOND;
private static GameTimeController _instance = new GameTimeController();
private static GameTimeController INSTANCE = new GameTimeController();
protected static int _gameTicks;
protected static long _gameStartTime;
@@ -55,7 +55,7 @@ public class GameTimeController
*/
public static GameTimeController getInstance()
{
return _instance;
return INSTANCE;
}
private GameTimeController()

View File

@@ -52,12 +52,12 @@ public class RecipeController
{
protected static final Logger LOGGER = Logger.getLogger(RecipeController.class.getName());
private static RecipeController _instance;
private static RecipeController INSTANCE;
protected static final Map<PlayerInstance, RecipeItemMaker> _activeMakers = Collections.synchronizedMap(new WeakHashMap<PlayerInstance, RecipeItemMaker>());
public static RecipeController getInstance()
{
return _instance == null ? _instance = new RecipeController() : _instance;
return INSTANCE == null ? INSTANCE = new RecipeController() : INSTANCE;
}
public synchronized void requestBookOpen(PlayerInstance player, boolean isDwarvenCraft)

View File

@@ -76,11 +76,11 @@ public class ServerStatus
public static ServerStatus getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final ServerStatus _instance = new ServerStatus();
protected static final ServerStatus INSTANCE = new ServerStatus();
}
}

View File

@@ -44,7 +44,7 @@ public class CommunityBoard
public static CommunityBoard getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
public void handleCommands(GameClient client, String command)
@@ -170,6 +170,6 @@ public class CommunityBoard
private static class SingletonHolder
{
protected static final CommunityBoard _instance = new CommunityBoard();
protected static final CommunityBoard INSTANCE = new CommunityBoard();
}
}

View File

@@ -35,7 +35,7 @@ public class ClanBBSManager extends BaseBBSManager
public static ClanBBSManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
@Override
@@ -354,6 +354,6 @@ public class ClanBBSManager extends BaseBBSManager
private static class SingletonHolder
{
protected static final ClanBBSManager _instance = new ClanBBSManager();
protected static final ClanBBSManager INSTANCE = new ClanBBSManager();
}
}

View File

@@ -44,7 +44,7 @@ public class FavoriteBBSManager extends BaseBBSManager
public static FavoriteBBSManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
@Override
@@ -136,6 +136,6 @@ public class FavoriteBBSManager extends BaseBBSManager
private static class SingletonHolder
{
protected static final FavoriteBBSManager _instance = new FavoriteBBSManager();
protected static final FavoriteBBSManager INSTANCE = new FavoriteBBSManager();
}
}

View File

@@ -32,7 +32,7 @@ public class ForumsBBSManager extends BaseBBSManager
public static ForumsBBSManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
protected ForumsBBSManager()
@@ -122,6 +122,6 @@ public class ForumsBBSManager extends BaseBBSManager
private static class SingletonHolder
{
protected static final ForumsBBSManager _instance = new ForumsBBSManager();
protected static final ForumsBBSManager INSTANCE = new ForumsBBSManager();
}
}

View File

@@ -45,7 +45,7 @@ public class FriendsBBSManager extends BaseBBSManager
public static FriendsBBSManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
@Override
@@ -376,6 +376,6 @@ public class FriendsBBSManager extends BaseBBSManager
private static class SingletonHolder
{
protected static final FriendsBBSManager _instance = new FriendsBBSManager();
protected static final FriendsBBSManager INSTANCE = new FriendsBBSManager();
}
}

View File

@@ -102,7 +102,7 @@ public class MailBBSManager extends BaseBBSManager
public static MailBBSManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
protected MailBBSManager()
@@ -865,6 +865,6 @@ public class MailBBSManager extends BaseBBSManager
private static class SingletonHolder
{
protected static final MailBBSManager _instance = new MailBBSManager();
protected static final MailBBSManager INSTANCE = new MailBBSManager();
}
}

View File

@@ -35,7 +35,7 @@ public class PostBBSManager extends BaseBBSManager
public static PostBBSManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
protected PostBBSManager()
@@ -213,6 +213,6 @@ public class PostBBSManager extends BaseBBSManager
private static class SingletonHolder
{
protected static final PostBBSManager _instance = new PostBBSManager();
protected static final PostBBSManager INSTANCE = new PostBBSManager();
}
}

View File

@@ -39,7 +39,7 @@ public class RegionBBSManager extends BaseBBSManager
public static RegionBBSManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
@Override
@@ -118,6 +118,6 @@ public class RegionBBSManager extends BaseBBSManager
private static class SingletonHolder
{
protected static final RegionBBSManager _instance = new RegionBBSManager();
protected static final RegionBBSManager INSTANCE = new RegionBBSManager();
}
}

View File

@@ -28,7 +28,7 @@ public class TopBBSManager extends BaseBBSManager
public static TopBBSManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
@Override
@@ -59,6 +59,6 @@ public class TopBBSManager extends BaseBBSManager
private static class SingletonHolder
{
protected static final TopBBSManager _instance = new TopBBSManager();
protected static final TopBBSManager INSTANCE = new TopBBSManager();
}
}

View File

@@ -40,7 +40,7 @@ public class TopicBBSManager extends BaseBBSManager
public static TopicBBSManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
protected TopicBBSManager()
@@ -336,6 +336,6 @@ public class TopicBBSManager extends BaseBBSManager
private static class SingletonHolder
{
protected static final TopicBBSManager _instance = new TopicBBSManager();
protected static final TopicBBSManager INSTANCE = new TopicBBSManager();
}
}

View File

@@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.model.FishData;
public class FishTable
{
private static Logger LOGGER = Logger.getLogger(SkillTreeTable.class.getName());
private static final FishTable _instance = new FishTable();
private static final FishTable INSTANCE = new FishTable();
private static List<FishData> _fishsNormal;
private static List<FishData> _fishsEasy;
@@ -46,7 +46,7 @@ public class FishTable
public static FishTable getInstance()
{
return _instance;
return INSTANCE;
}
private FishTable()

View File

@@ -34,13 +34,13 @@ import org.l2jmobius.gameserver.templates.item.Henna;
public class HennaTreeTable
{
private static Logger LOGGER = Logger.getLogger(HennaTreeTable.class.getName());
private static final HennaTreeTable _instance = new HennaTreeTable();
private static final HennaTreeTable INSTANCE = new HennaTreeTable();
private final Map<ClassId, List<HennaInstance>> _hennaTrees;
private final boolean _initialized = true;
public static HennaTreeTable getInstance()
{
return _instance;
return INSTANCE;
}
private HennaTreeTable()

View File

@@ -39,7 +39,7 @@ public class SpawnTable
{
private static final Logger LOGGER = Logger.getLogger(SpawnTable.class.getName());
private static final SpawnTable _instance = new SpawnTable();
private static final SpawnTable INSTANCE = new SpawnTable();
private final Map<Integer, Spawn> spawntable = new ConcurrentHashMap<>();
private int npcSpawnCount;
@@ -49,7 +49,7 @@ public class SpawnTable
public static SpawnTable getInstance()
{
return _instance;
return INSTANCE;
}
private SpawnTable()

View File

@@ -34,7 +34,7 @@ public class TerritoryTable
public static TerritoryTable getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
public TerritoryTable()
@@ -86,6 +86,6 @@ public class TerritoryTable
private static class SingletonHolder
{
protected static final TerritoryTable _instance = new TerritoryTable();
protected static final TerritoryTable INSTANCE = new TerritoryTable();
}
}

View File

@@ -114,12 +114,12 @@ public class ExperienceData
public static ExperienceData getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
@SuppressWarnings("synthetic-access")
private static class SingletonHolder
{
protected static final ExperienceData _instance = new ExperienceData();
protected static final ExperienceData INSTANCE = new ExperienceData();
}
}

View File

@@ -76,7 +76,7 @@ public class ItemTable
*/
public static ItemTable getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
/**
@@ -368,6 +368,6 @@ public class ItemTable
@SuppressWarnings("synthetic-access")
private static class SingletonHolder
{
protected static final ItemTable _instance = new ItemTable();
protected static final ItemTable INSTANCE = new ItemTable();
}
}

View File

@@ -39,7 +39,7 @@ public class DocumentEngine
public static DocumentEngine getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
private DocumentEngine()
@@ -124,6 +124,6 @@ public class DocumentEngine
@SuppressWarnings("synthetic-access")
private static class SingletonHolder
{
protected static final DocumentEngine _instance = new DocumentEngine();
protected static final DocumentEngine INSTANCE = new DocumentEngine();
}
}

View File

@@ -929,11 +929,11 @@ public class GeoEngine
*/
public static GeoEngine getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final GeoEngine _instance = Config.PATHFINDING ? new GeoEnginePathfinding() : new GeoEngine();
protected static final GeoEngine INSTANCE = Config.PATHFINDING ? new GeoEnginePathfinding() : new GeoEngine();
}
}

View File

@@ -113,7 +113,7 @@ public class AuctionManager
public static final AuctionManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
@@ -225,6 +225,6 @@ public class AuctionManager
private static class SingletonHolder
{
protected static final AuctionManager _instance = new AuctionManager();
protected static final AuctionManager INSTANCE = new AuctionManager();
}
}

View File

@@ -41,7 +41,7 @@ public class AutoSaveManager
public static final AutoSaveManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
public AutoSaveManager()
@@ -178,6 +178,6 @@ public class AutoSaveManager
private static class SingletonHolder
{
protected static final AutoSaveManager _instance = new AutoSaveManager();
protected static final AutoSaveManager INSTANCE = new AutoSaveManager();
}
}

View File

@@ -38,7 +38,7 @@ public class BoatManager
public static final BoatManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
private Map<Integer, BoatInstance> _staticItems = new HashMap<>();
@@ -229,6 +229,6 @@ public class BoatManager
private static class SingletonHolder
{
protected static final BoatManager _instance = new BoatManager();
protected static final BoatManager INSTANCE = new BoatManager();
}
}

View File

@@ -39,7 +39,7 @@ public class CastleManager
public static final CastleManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
private List<Castle> _castles;
@@ -361,6 +361,6 @@ public class CastleManager
private static class SingletonHolder
{
protected static final CastleManager _instance = new CastleManager();
protected static final CastleManager INSTANCE = new CastleManager();
}
}

View File

@@ -263,7 +263,7 @@ public class ChristmasManager
*/
public static ChristmasManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
/**
@@ -759,6 +759,6 @@ public class ChristmasManager
private static class SingletonHolder
{
protected static final ChristmasManager _instance = new ChristmasManager();
protected static final ChristmasManager INSTANCE = new ChristmasManager();
}
}

View File

@@ -44,7 +44,7 @@ public class ClanHallManager
public static ClanHallManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
public boolean loaded()
@@ -256,6 +256,6 @@ public class ClanHallManager
private static class SingletonHolder
{
protected static final ClanHallManager _instance = new ClanHallManager();
protected static final ClanHallManager INSTANCE = new ClanHallManager();
}
}

View File

@@ -39,7 +39,7 @@ public class CoupleManager
public static final CoupleManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
public CoupleManager()
@@ -157,6 +157,6 @@ public class CoupleManager
private static class SingletonHolder
{
protected static final CoupleManager _instance = new CoupleManager();
protected static final CoupleManager INSTANCE = new CoupleManager();
}
}

View File

@@ -61,7 +61,7 @@ public class CursedWeaponsManager
public static final CursedWeaponsManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
public CursedWeaponsManager()
@@ -453,6 +453,6 @@ public class CursedWeaponsManager
private static class SingletonHolder
{
protected static final CursedWeaponsManager _instance = new CursedWeaponsManager();
protected static final CursedWeaponsManager INSTANCE = new CursedWeaponsManager();
}
}

View File

@@ -541,11 +541,11 @@ public class FishingChampionshipManager
public static final FishingChampionshipManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final FishingChampionshipManager _instance = new FishingChampionshipManager();
protected static final FishingChampionshipManager INSTANCE = new FishingChampionshipManager();
}
}

View File

@@ -190,11 +190,11 @@ public class FortManager
public static final FortManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final FortManager _instance = new FortManager();
protected static final FortManager INSTANCE = new FortManager();
}
}

View File

@@ -50,7 +50,7 @@ public class FortSiegeManager
public static final FortSiegeManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
public FortSiegeManager()
@@ -451,6 +451,6 @@ public class FortSiegeManager
private static class SingletonHolder
{
protected static final FortSiegeManager _instance = new FortSiegeManager();
protected static final FortSiegeManager INSTANCE = new FortSiegeManager();
}
}

View File

@@ -256,7 +256,7 @@ public class FourSepulchersManager extends GrandBossManager
public static final FourSepulchersManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
public FourSepulchersManager()
@@ -1919,6 +1919,6 @@ public class FourSepulchersManager extends GrandBossManager
private static class SingletonHolder
{
protected static final FourSepulchersManager _instance = new FourSepulchersManager();
protected static final FourSepulchersManager INSTANCE = new FourSepulchersManager();
}
}

View File

@@ -116,11 +116,11 @@ public final class GlobalVariablesManager extends AbstractVariables
*/
public static GlobalVariablesManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final GlobalVariablesManager _instance = new GlobalVariablesManager();
protected static final GlobalVariablesManager INSTANCE = new GlobalVariablesManager();
}
}

View File

@@ -75,7 +75,7 @@ public class ItemsOnGroundManager
public static final ItemsOnGroundManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
private void load()
@@ -293,6 +293,6 @@ public class ItemsOnGroundManager
@SuppressWarnings("synthetic-access")
private static class SingletonHolder
{
protected static final ItemsOnGroundManager _instance = new ItemsOnGroundManager();
protected static final ItemsOnGroundManager INSTANCE = new ItemsOnGroundManager();
}
}

View File

@@ -48,7 +48,7 @@ public class MercTicketManager
public static final MercTicketManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
public MercTicketManager()
@@ -951,6 +951,6 @@ public class MercTicketManager
private static class SingletonHolder
{
protected static final MercTicketManager _instance = new MercTicketManager();
protected static final MercTicketManager INSTANCE = new MercTicketManager();
}
}

View File

@@ -595,11 +595,11 @@ public class RaidBossSpawnManager
*/
public static RaidBossSpawnManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final RaidBossSpawnManager _instance = new RaidBossSpawnManager();
protected static final RaidBossSpawnManager INSTANCE = new RaidBossSpawnManager();
}
}

View File

@@ -50,7 +50,7 @@ public class SiegeManager
public static final SiegeManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
private int _attackerMaxClans = 500; // Max number of clans
@@ -458,6 +458,6 @@ public class SiegeManager
@SuppressWarnings("synthetic-access")
private static class SingletonHolder
{
protected static final SiegeManager _instance = new SiegeManager();
protected static final SiegeManager INSTANCE = new SiegeManager();
}
}

View File

@@ -114,12 +114,12 @@ public class PartyMatchRoomList
public static PartyMatchRoomList getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
@SuppressWarnings("synthetic-access")
private static class SingletonHolder
{
protected static final PartyMatchRoomList _instance = new PartyMatchRoomList();
protected static final PartyMatchRoomList INSTANCE = new PartyMatchRoomList();
}
}

View File

@@ -56,12 +56,12 @@ public class PartyMatchWaitingList
public static PartyMatchWaitingList getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
@SuppressWarnings("synthetic-access")
private static class SingletonHolder
{
protected static final PartyMatchWaitingList _instance = new PartyMatchWaitingList();
protected static final PartyMatchWaitingList INSTANCE = new PartyMatchWaitingList();
}
}

View File

@@ -67,7 +67,7 @@ class OlympiadManager implements Runnable
public static OlympiadManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
@Override
@@ -427,6 +427,6 @@ class OlympiadManager implements Runnable
@SuppressWarnings("synthetic-access")
private static class SingletonHolder
{
protected static final OlympiadManager _instance = new OlympiadManager();
protected static final OlympiadManager INSTANCE = new OlympiadManager();
}
}

View File

@@ -36,7 +36,7 @@ public class FaenorInterface implements EngineInterface
public static FaenorInterface getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
public List<?> getAllPlayers()
@@ -147,6 +147,6 @@ public class FaenorInterface implements EngineInterface
private static class SingletonHolder
{
protected static final FaenorInterface _instance = new FaenorInterface();
protected static final FaenorInterface INSTANCE = new FaenorInterface();
}
}

View File

@@ -96,11 +96,11 @@ public class FaenorScriptEngine extends ScriptEngine
public static FaenorScriptEngine getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final FaenorScriptEngine _instance = new FaenorScriptEngine();
protected static final FaenorScriptEngine INSTANCE = new FaenorScriptEngine();
}
}

View File

@@ -56,7 +56,7 @@ public final class L2ScriptEngineManager
public static L2ScriptEngineManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
private final Map<String, ScriptEngine> _nameEngines = new HashMap<>();
@@ -694,6 +694,6 @@ public final class L2ScriptEngineManager
@SuppressWarnings("synthetic-access")
private static class SingletonHolder
{
protected static final L2ScriptEngineManager _instance = new L2ScriptEngineManager();
protected static final L2ScriptEngineManager INSTANCE = new L2ScriptEngineManager();
}
}

View File

@@ -836,11 +836,11 @@ public final class Formulas
}
}
private static final Formulas _instance = new Formulas();
private static final Formulas INSTANCE = new Formulas();
public static Formulas getInstance()
{
return _instance;
return INSTANCE;
}
private Formulas()

View File

@@ -44,7 +44,7 @@ public class AttackStanceTaskManager
public static AttackStanceTaskManager getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
public void addAttackStanceTask(Creature actor)
@@ -131,6 +131,6 @@ public class AttackStanceTaskManager
@SuppressWarnings("synthetic-access")
private static class SingletonHolder
{
protected static final AttackStanceTaskManager _instance = new AttackStanceTaskManager();
protected static final AttackStanceTaskManager INSTANCE = new AttackStanceTaskManager();
}
}