diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/vo/CollectionType.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/vo/CollectionType.java index 680a7126c..e89755aea 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/vo/CollectionType.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/vo/CollectionType.java @@ -1,6 +1,9 @@ package com.gempukku.lotro.db.vo; public final class CollectionType { + public final static CollectionType MY_CARDS = new CollectionType("permanent", "My cards"); + public final static CollectionType ALL_CARDS = new CollectionType("default", "All cards"); + private final String _code; private final String _fullName; diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java index 865330ef1..33c0f707d 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java @@ -29,7 +29,7 @@ public class HallServer extends AbstractServer { private CollectionsManager _collectionsManager; private LotroServer _lotroServer; - private CollectionType _allCardsCollectionType = new CollectionType("default", "All cards"); + private CollectionType _allCardsCollectionType = CollectionType.ALL_CARDS; private final int _playerInactivityPeriod = 1000 * 20; // 10 seconds @@ -62,7 +62,7 @@ public class HallServer extends AbstractServer { _hallChat = _chatServer.createChatRoom("Game Hall", 10); _tournamentQueues.put("fotr_queue", new SingleEliminationRecurringQueue(0, "fotr_block", - new CollectionType("default", "All cards"), "fotrQueue-", "Test Fellowship Block 4-man", 4, + CollectionType.ALL_CARDS, "fotrQueue-", "Test Fellowship Block 4-man", 4, true, tournamentService)); } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/ConstructedLeagueData.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/ConstructedLeagueData.java index 711d27e1c..bfd113af8 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/ConstructedLeagueData.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/ConstructedLeagueData.java @@ -12,7 +12,7 @@ import java.util.List; public class ConstructedLeagueData implements LeagueData { private List _series = new ArrayList(); - private CollectionType _prizeCollectionType = new CollectionType("permanent", "My cards"); + private CollectionType _prizeCollectionType = CollectionType.MY_CARDS; private float _prizeMultiplier; private LeaguePrizes _leaguePrizes = new NewLeaguePrizes(); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueService.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueService.java index ada70657e..64fdbf078 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueService.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueService.java @@ -94,7 +94,7 @@ public class LeagueService { if (isPlayerInLeague(league, player)) return false; int cost = league.getCost(); - if (_collectionsManager.removeCurrencyFromPlayerCollection("Joining "+league.getName()+" league", player, new CollectionType("permanent", "My cards"), cost)) { + if (_collectionsManager.removeCurrencyFromPlayerCollection("Joining "+league.getName()+" league", player, CollectionType.MY_CARDS, cost)) { _leagueParticipationDAO.userJoinsLeague(league.getType(), player, remoteAddr); league.getLeagueData().joinLeague(_collectionsManager, player, DateUtils.getCurrentDate()); @@ -160,7 +160,7 @@ public class LeagueService { else prize = serie.getPrizeForLeagueMatchLoser(count, playerMatchesPlayedOn.size()); if (prize != null) - _collectionsManager.addItemsToPlayerCollection(true, "Prize for winning league game", player, new CollectionType("permanent", "My cards"), prize.getAll().values()); + _collectionsManager.addItemsToPlayerCollection(true, "Prize for winning league game", player, CollectionType.MY_CARDS, prize.getAll().values()); } public synchronized Collection getPlayerMatchesInSerie(League league, LeagueSerieData serie, String player) { diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewConstructedLeagueData.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewConstructedLeagueData.java index f3e9367e5..e097c9daa 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewConstructedLeagueData.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewConstructedLeagueData.java @@ -14,7 +14,7 @@ import java.util.List; public class NewConstructedLeagueData implements LeagueData { private List _series = new ArrayList(); - private CollectionType _prizeCollectionType = new CollectionType("permanent", "My cards"); + private CollectionType _prizeCollectionType = CollectionType.MY_CARDS; private LeaguePrizes _leaguePrizes = new NewLeaguePrizes(); private float _prizeMultiplier; @@ -23,9 +23,9 @@ public class NewConstructedLeagueData implements LeagueData { int start = Integer.parseInt(params[0]); CollectionType collectionType; if (params[1].equals("default")) - collectionType = new CollectionType("default", "All cards"); + collectionType = CollectionType.ALL_CARDS; else if (params[1].equals("permanent")) - collectionType = new CollectionType("permanent", "My cards"); + collectionType = CollectionType.MY_CARDS; else throw new IllegalArgumentException("Unkown collection type"); _prizeMultiplier = Float.parseFloat(params[2]); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewSealedLeagueData.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewSealedLeagueData.java index 2ee7c17b7..9507a0591 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewSealedLeagueData.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewSealedLeagueData.java @@ -18,7 +18,7 @@ public class NewSealedLeagueData implements LeagueData { private SealedLeagueType _leagueType; private List _series; private CollectionType _collectionType; - private CollectionType _prizeCollectionType = new CollectionType("permanent", "My cards"); + private CollectionType _prizeCollectionType = CollectionType.MY_CARDS; private NewLeaguePrizes _leaguePrizes; private SealedLeagueProduct _leagueProduct; diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueData.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueData.java index b0db14ba3..74daefc4e 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueData.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueData.java @@ -18,7 +18,7 @@ public class SealedLeagueData implements LeagueData { private String _format; private List _series; private CollectionType _collectionType; - private CollectionType _prizeCollectionType = new CollectionType("permanent", "My cards"); + private CollectionType _prizeCollectionType = CollectionType.MY_CARDS; private LeaguePrizes _leaguePrizes; private SealedLeagueProduct _leagueProduct; diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/merchant/MerchantService.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/merchant/MerchantService.java index 8736418b0..de83a205c 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/merchant/MerchantService.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/merchant/MerchantService.java @@ -28,7 +28,7 @@ public class MerchantService { private Map _fixedPriceItems = new HashMap(); - private CollectionType _permanentCollection = new CollectionType("permanent", "My cards"); + private CollectionType _permanentCollection = CollectionType.MY_CARDS; private CollectionsManager _collectionsManager; public MerchantService(LotroCardBlueprintLibrary library, CollectionsManager collectionsManager, MerchantDAO merchantDAO) { diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SingleEliminationRecurringQueue.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SingleEliminationRecurringQueue.java index bc426daa2..b94d7b9f7 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SingleEliminationRecurringQueue.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SingleEliminationRecurringQueue.java @@ -13,7 +13,7 @@ public class SingleEliminationRecurringQueue implements TournamentQueue { private String _format; private CollectionType _collectionType; private String _tournamentQueueName; - private CollectionType _currencyCollection = new CollectionType("permanent", "My cards"); + private CollectionType _currencyCollection = CollectionType.MY_CARDS; private Set _players = new HashSet(); private Map _playerDecks = new HashMap(); diff --git a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AbstractResource.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AbstractResource.java index ea13fc11f..2007cd32e 100644 --- a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AbstractResource.java +++ b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AbstractResource.java @@ -36,11 +36,11 @@ public abstract class AbstractResource { Integer lastReward = player.getLastLoginReward(); if (lastReward == null) { _playerDao.setLastReward(player, latestMonday); - _collectionManager.addCurrencyToPlayerCollection(true, "Initial currency balance", player, new CollectionType("permanent", "My cards"), 20000); + _collectionManager.addCurrencyToPlayerCollection(true, "Initial currency balance", player, CollectionType.MY_CARDS, 20000); } else { if (latestMonday != lastReward) { if (_playerDao.updateLastReward(player, lastReward, latestMonday)) - _collectionManager.addCurrencyToPlayerCollection(true, "Weekly activity reward", player, new CollectionType("permanent", "My cards"), 5000); + _collectionManager.addCurrencyToPlayerCollection(true, "Weekly activity reward", player, CollectionType.MY_CARDS, 5000); } } } diff --git a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AdminResource.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AdminResource.java index 552808caf..4411a99f4 100644 --- a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AdminResource.java +++ b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AdminResource.java @@ -348,7 +348,7 @@ public class AdminResource extends AbstractResource { private CollectionType createCollectionType(String collectionType) { if (collectionType.equals("permanent")) - return new CollectionType("permanent", "My cards"); + return CollectionType.MY_CARDS; return _leagueService.getCollectionTypeByCode(collectionType); } diff --git a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/CollectionResource.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/CollectionResource.java index 8a22e48d0..8e65b628b 100644 --- a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/CollectionResource.java +++ b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/CollectionResource.java @@ -248,7 +248,7 @@ public class CollectionResource extends AbstractResource { private CollectionType createCollectionType(String collectionType) { if (collectionType.equals("permanent")) - return new CollectionType("permanent", "My cards"); + return CollectionType.MY_CARDS; return _leagueService.getCollectionTypeByCode(collectionType); }