diff --git a/src/main/java/forge/game/zone/IZone.java b/src/main/java/forge/game/zone/IZone.java index efc7ea554dd..4f5252416fd 100644 --- a/src/main/java/forge/game/zone/IZone.java +++ b/src/main/java/forge/game/zone/IZone.java @@ -30,24 +30,6 @@ import forge.Card; * @version $Id$ */ interface IZone { - /** - *

- * setUpdate. - *

- * - * @param b - * a boolean. - */ - void setUpdate(boolean b); - - /** - *

- * getUpdate. - *

- * - * @return a boolean. - */ - boolean getUpdate(); /** *

@@ -101,7 +83,7 @@ interface IZone { * @param o * a {@link java.lang.Object} object. */ - void remove(Object o); + void remove(Card o); /** *

diff --git a/src/main/java/forge/game/zone/PlayerZoneBattlefield.java b/src/main/java/forge/game/zone/PlayerZoneBattlefield.java index 7c1a36341ba..b863a8bd342 100644 --- a/src/main/java/forge/game/zone/PlayerZoneBattlefield.java +++ b/src/main/java/forge/game/zone/PlayerZoneBattlefield.java @@ -17,7 +17,6 @@ */ package forge.game.zone; -import java.util.ArrayList; import java.util.List; import com.google.common.base.Predicate; @@ -181,7 +180,7 @@ public class PlayerZoneBattlefield extends PlayerZone { /** {@inheritDoc} */ @Override - public final void remove(final Object o) { + public final void remove(final Card o) { super.remove(o); @@ -276,7 +275,7 @@ public class PlayerZoneBattlefield extends PlayerZone { // getCards(false) to get Phased Out cards if (!filter) { - return new ArrayList(cardList); + return super.getCards(false); } return Lists.newArrayList(Iterables.filter(cardList, isNotPhased)); diff --git a/src/main/java/forge/game/zone/Zone.java b/src/main/java/forge/game/zone/Zone.java index 6b2c30a0418..1e790beeb98 100644 --- a/src/main/java/forge/game/zone/Zone.java +++ b/src/main/java/forge/game/zone/Zone.java @@ -66,6 +66,8 @@ public class Zone extends MyObservable implements IZone, Observer, java.io.Seria public Zone(final ZoneType zone) { this.zoneName = zone; this.roCardList = Collections.unmodifiableList(cardList); + + //System.out.println(zoneName + " (ct) " + Integer.toHexString(System.identityHashCode(roCardList))); } // ************ BEGIN - these methods fire updateObservers() ************* @@ -191,7 +193,7 @@ public class Zone extends MyObservable implements IZone, Observer, java.io.Seria * an Object */ @Override - public void remove(final Object c) { + public void remove(final Card c) { this.cardList.remove(c); this.update(); } @@ -287,6 +289,7 @@ public class Zone extends MyObservable implements IZone, Observer, java.io.Seria */ @Override public final List getCards() { + //System.out.println(zoneName + ": " + Integer.toHexString(System.identityHashCode(roCardList))); return this.getCards(true); } @@ -322,29 +325,6 @@ public class Zone extends MyObservable implements IZone, Observer, java.io.Seria } } - /** - * Sets the update. - * - * @param b - * a boolean. - */ - @Override - public final void setUpdate(final boolean b) { - this.update = b; - } - - /** - *

- * Getter for the field update. - *

- * - * @return a boolean. - */ - @Override - public final boolean getUpdate() { - return this.update; - } - /** *

* toString.