From 47e4ad630f88909b519809182a2a82f844a93acd Mon Sep 17 00:00:00 2001 From: marcins78 Date: Wed, 9 Jan 2013 10:17:27 +0000 Subject: [PATCH] Removing unused code. --- .../gempukku/lotro/game/state/GameEvent.java | 13 +- ...heringParticipantCommunicationChannel.java | 187 ------------------ 2 files changed, 1 insertion(+), 199 deletions(-) delete mode 100644 gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/GatheringParticipantCommunicationChannel.java diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameEvent.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameEvent.java index 1467f36fa..870dc3883 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameEvent.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameEvent.java @@ -7,7 +7,6 @@ import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.logic.decisions.AwaitingDecision; import com.gempukku.lotro.logic.timing.GameStats; -import java.util.Date; import java.util.List; public class GameEvent { @@ -19,10 +18,9 @@ public class GameEvent { AT, RT, M, W, GS, - CAC, EP, CA, D, CH + CAC, EP, CA, D } - private Date _date; private String _message; private String _side; private Type _type; @@ -45,15 +43,6 @@ public class GameEvent { _type = type; } - public Date getDate() { - return _date; - } - - public GameEvent date(Date date) { - _date = date; - return this; - } - public Integer getIndex() { return _index; } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/GatheringParticipantCommunicationChannel.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/GatheringParticipantCommunicationChannel.java deleted file mode 100644 index e3fdd83ee..000000000 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/GatheringParticipantCommunicationChannel.java +++ /dev/null @@ -1,187 +0,0 @@ -package com.gempukku.lotro.game; - -import com.gempukku.lotro.chat.ChatMessage; -import com.gempukku.lotro.chat.ChatRoomListener; -import com.gempukku.lotro.common.Token; -import com.gempukku.lotro.communication.GameStateListener; -import com.gempukku.lotro.game.state.GameEvent; -import com.gempukku.lotro.logic.decisions.AwaitingDecision; -import com.gempukku.lotro.logic.timing.GameStats; - -import java.util.*; - -import static com.gempukku.lotro.game.state.GameEvent.Type.*; - -public class GatheringParticipantCommunicationChannel implements GameStateListener, ChatRoomListener { - private List _events = new LinkedList(); - private String _self; - private Date _lastConsumed = new Date(); - private int _channelNumber; - - public GatheringParticipantCommunicationChannel(String self, int channelNumber) { - _self = self; - _channelNumber = channelNumber; - } - - public int getChannelNumber() { - return _channelNumber; - } - - @Override - public void setPlayerOrder(List participants) { - List participantIds = new LinkedList(); - for (String participant : participants) - participantIds.add(participant); - _events.add(new GameEvent(P).participantId(_self).allParticipantIds(participantIds)); - } - - private int[] getCardIds(Collection cards) { - int[] result = new int[cards.size()]; - int index = 0; - for (PhysicalCard card : cards) { - result[index] = card.getCardId(); - index++; - } - return result; - } - - @Override - public void messageReceived(ChatMessage message) { - _events.add(new GameEvent(CH).participantId(message.getFrom()).message(message.getMessage()).date(message.getWhen())); - } - - @Override - public void addAssignment(PhysicalCard freePeople, Set minions) { - _events.add(new GameEvent(AA).cardId(freePeople.getCardId()).otherCardIds(getCardIds(minions))); - } - - @Override - public void removeAssignment(PhysicalCard freePeople) { - _events.add(new GameEvent(RA).cardId(freePeople.getCardId())); - } - - @Override - public void startSkirmish(PhysicalCard freePeople, Set minions) { - GameEvent gameEvent = new GameEvent(SS).otherCardIds(getCardIds(minions)); - if (freePeople != null) - gameEvent.cardId(freePeople.getCardId()); - _events.add(gameEvent); - } - - @Override - public void addToSkirmish(PhysicalCard card) { - _events.add(new GameEvent(ATS).card(card)); - } - - @Override - public void removeFromSkirmish(PhysicalCard card) { - _events.add(new GameEvent(RFS).card(card)); - } - - @Override - public void finishSkirmish() { - _events.add(new GameEvent(ES)); - } - - @Override - public void setCurrentPhase(String phase) { - _events.add(new GameEvent(GPC).phase(phase)); - } - - @Override - public void cardCreated(PhysicalCard card) { - if (card.getZone().isPublic() || (card.getZone().isVisibleByOwner() && card.getOwner().equals(_self))) - _events.add(new GameEvent(PCIP).card(card)); - } - - @Override - public void cardMoved(PhysicalCard card) { - _events.add(new GameEvent(MCIP).card(card)); - } - - @Override - public void cardsRemoved(String playerPerforming, Collection cards) { - Set removedCardsVisibleByPlayer = new HashSet(); - for (PhysicalCard card : cards) { - if (card.getZone().isPublic() || (card.getZone().isVisibleByOwner() && card.getOwner().equals(_self))) - removedCardsVisibleByPlayer.add(card); - } - if (removedCardsVisibleByPlayer.size() > 0) - _events.add(new GameEvent(RCFP).otherCardIds(getCardIds(removedCardsVisibleByPlayer)).participantId(playerPerforming)); - } - - @Override - public void setPlayerPosition(String participant, int position) { - _events.add(new GameEvent(PP).participantId(participant).index(position)); - } - - @Override - public void setTwilight(int twilightPool) { - _events.add(new GameEvent(TP).count(twilightPool)); - } - - @Override - public void setCurrentPlayerId(String currentPlayerId) { - _events.add(new GameEvent(TC).participantId(currentPlayerId)); - } - - @Override - public void addTokens(PhysicalCard card, Token token, int count) { - _events.add(new GameEvent(AT).card(card).token(token).count(count)); - } - - @Override - public void removeTokens(PhysicalCard card, Token token, int count) { - _events.add(new GameEvent(RT).card(card).token(token).count(count)); - } - - @Override - public void sendMessage(String message) { - _events.add(new GameEvent(M).message(message)); - } - - @Override - public void setSite(PhysicalCard card) { - _events.add(new GameEvent(PCIP).card(card).index(card.getSiteNumber())); - } - - @Override - public void sendGameStats(GameStats gameStats) { - _events.add(new GameEvent(GS).gameStats(gameStats.makeACopy())); - } - - @Override - public void cardAffectedByCard(String playerPerforming, PhysicalCard card, Collection affectedCards) { - _events.add(new GameEvent(CAC).card(card).participantId(playerPerforming).otherCardIds(getCardIds(affectedCards))); - } - - @Override - public void eventPlayed(PhysicalCard card) { - _events.add(new GameEvent(EP).card(card)); - } - - @Override - public void cardActivated(String playerPerforming, PhysicalCard card) { - _events.add(new GameEvent(CA).card(card).participantId(playerPerforming)); - } - - public void decisionRequired(String playerId, AwaitingDecision decision) { - if (playerId.equals(_self)) - _events.add(new GameEvent(D).awaitingDecision(decision).participantId(playerId)); - } - - public List consumeGameEvents() { - List result = _events; - _events = new LinkedList(); - _lastConsumed = new Date(); - return result; - } - - public boolean hasGameEvents() { - return _events.size()>0; - } - - public Date getLastConsumed() { - return _lastConsumed; - } -}