From e0007dcb037cae7fa52631154ba654d013de1f9b Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Fri, 12 Apr 2013 19:53:08 +0000 Subject: [PATCH] GameLossReason moved to player package, since it's individual per player and to avoid confusion with GameEndReason --- .gitattributes | 2 +- src/main/java/forge/Card.java | 5 ++--- src/main/java/forge/card/ability/effects/GameLossEffect.java | 2 +- src/main/java/forge/game/GameAction.java | 1 + src/main/java/forge/game/phase/EndOfTurn.java | 2 +- src/main/java/forge/game/{ => player}/GameLossReason.java | 2 +- src/main/java/forge/game/player/Player.java | 1 - src/main/java/forge/game/player/PlayerOutcome.java | 1 - src/main/java/forge/gui/match/QuestWinLose.java | 2 +- 9 files changed, 8 insertions(+), 10 deletions(-) rename src/main/java/forge/game/{ => player}/GameLossReason.java (96%) diff --git a/.gitattributes b/.gitattributes index 8c5c798a7dc..9b1dba0fa24 100644 --- a/.gitattributes +++ b/.gitattributes @@ -13961,7 +13961,6 @@ src/main/java/forge/game/GameActionUtil.java svneol=native#text/plain src/main/java/forge/game/GameAge.java -text src/main/java/forge/game/GameEndReason.java -text src/main/java/forge/game/GameFormat.java -text -src/main/java/forge/game/GameLossReason.java -text src/main/java/forge/game/GameNew.java -text src/main/java/forge/game/GameOutcome.java -text src/main/java/forge/game/GameState.java -text @@ -14039,6 +14038,7 @@ src/main/java/forge/game/phase/Untap.java -text src/main/java/forge/game/phase/Upkeep.java svneol=native#text/plain src/main/java/forge/game/phase/package-info.java svneol=native#text/plain src/main/java/forge/game/player/AIPlayer.java svneol=native#text/plain +src/main/java/forge/game/player/GameLossReason.java -text src/main/java/forge/game/player/HumanPlayer.java svneol=native#text/plain src/main/java/forge/game/player/LobbyPlayer.java -text src/main/java/forge/game/player/Player.java svneol=native#text/plain diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 44bae53b649..101604acb13 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -29,7 +29,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; - import org.apache.commons.lang3.StringUtils; import com.esotericsoftware.minlog.Log; @@ -113,7 +112,7 @@ public class Card extends GameEntity implements Comparable { // changes by AF animate and continuous static effects private ArrayList changedCardTypes = new ArrayList(); - private ArrayList changedCardKeywords = new ArrayList(); + private List changedCardKeywords = new ArrayList(); private final ArrayList rememberedObjects = new ArrayList(); private final ArrayList imprintedCards = new ArrayList(); @@ -4294,7 +4293,7 @@ public class Card extends GameEntity implements Comparable { // see if keyword changes are in effect if (!this.changedCardKeywords.isEmpty()) { - final ArrayList newKeywords = this.changedCardKeywords; + final ArrayList newKeywords = new ArrayList(this.changedCardKeywords); Collections.sort(newKeywords); // sorts newKeywords by timeStamp for (final CardKeywords ck : newKeywords) { diff --git a/src/main/java/forge/card/ability/effects/GameLossEffect.java b/src/main/java/forge/card/ability/effects/GameLossEffect.java index 4669758fa64..9298bfe1a00 100644 --- a/src/main/java/forge/card/ability/effects/GameLossEffect.java +++ b/src/main/java/forge/card/ability/effects/GameLossEffect.java @@ -5,7 +5,7 @@ import java.util.List; import forge.Card; import forge.card.ability.SpellAbilityEffect; import forge.card.spellability.SpellAbility; -import forge.game.GameLossReason; +import forge.game.player.GameLossReason; import forge.game.player.Player; public class GameLossEffect extends SpellAbilityEffect { diff --git a/src/main/java/forge/game/GameAction.java b/src/main/java/forge/game/GameAction.java index 037c3eb5d6e..424b299f112 100644 --- a/src/main/java/forge/game/GameAction.java +++ b/src/main/java/forge/game/GameAction.java @@ -59,6 +59,7 @@ import forge.game.event.CardDestroyedEvent; import forge.game.event.CardRegeneratedEvent; import forge.game.event.CardSacrificedEvent; import forge.game.player.AIPlayer; +import forge.game.player.GameLossReason; import forge.game.player.HumanPlayer; import forge.game.player.Player; import forge.game.player.PlayerType; diff --git a/src/main/java/forge/game/phase/EndOfTurn.java b/src/main/java/forge/game/phase/EndOfTurn.java index 0ddb0ee19b4..14d9a247a52 100644 --- a/src/main/java/forge/game/phase/EndOfTurn.java +++ b/src/main/java/forge/game/phase/EndOfTurn.java @@ -22,8 +22,8 @@ import forge.Singletons; import forge.card.mana.ManaCost; import forge.card.spellability.Ability; import forge.card.spellability.SpellAbility; -import forge.game.GameLossReason; import forge.game.GameState; +import forge.game.player.GameLossReason; import forge.game.player.Player; import forge.game.zone.ZoneType; diff --git a/src/main/java/forge/game/GameLossReason.java b/src/main/java/forge/game/player/GameLossReason.java similarity index 96% rename from src/main/java/forge/game/GameLossReason.java rename to src/main/java/forge/game/player/GameLossReason.java index 05700eb0f1f..8db84d3d005 100644 --- a/src/main/java/forge/game/GameLossReason.java +++ b/src/main/java/forge/game/player/GameLossReason.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.game; +package forge.game.player; /** * The Enum GameLossReason. diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java index 59858a98214..a112d88a7bf 100644 --- a/src/main/java/forge/game/player/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -55,7 +55,6 @@ import forge.card.spellability.Target; import forge.card.staticability.StaticAbility; import forge.card.trigger.TriggerType; import forge.game.GameActionUtil; -import forge.game.GameLossReason; import forge.game.GameState; import forge.game.GlobalRuleChange; import forge.game.event.CardDiscardedEvent; diff --git a/src/main/java/forge/game/player/PlayerOutcome.java b/src/main/java/forge/game/player/PlayerOutcome.java index 73a6926c2b1..8ed0c3b6419 100644 --- a/src/main/java/forge/game/player/PlayerOutcome.java +++ b/src/main/java/forge/game/player/PlayerOutcome.java @@ -1,6 +1,5 @@ package forge.game.player; -import forge.game.GameLossReason; /** * TODO: Write javadoc for this type. diff --git a/src/main/java/forge/gui/match/QuestWinLose.java b/src/main/java/forge/gui/match/QuestWinLose.java index 2d6bd30b49f..17276a4510f 100644 --- a/src/main/java/forge/gui/match/QuestWinLose.java +++ b/src/main/java/forge/gui/match/QuestWinLose.java @@ -38,9 +38,9 @@ import forge.card.UnOpenedProduct; import forge.control.FControl; import forge.game.GameEndReason; import forge.game.GameFormat; -import forge.game.GameLossReason; import forge.game.GameOutcome; import forge.game.MatchController; +import forge.game.player.GameLossReason; import forge.game.player.LobbyPlayer; import forge.game.player.Player; import forge.game.player.PlayerOutcome;