From 360a2f217c34e848a7a495c158af317e6650fe6d Mon Sep 17 00:00:00 2001 From: jendave Date: Sun, 7 Aug 2011 01:02:00 +0000 Subject: [PATCH] - Simplified the code found in forge.gui.game.cardDetailPanel and forge.AllZoneUtil. --- src/forge/AllZoneUtil.java | 4 ++-- src/forge/gui/game/CardDetailPanel.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/forge/AllZoneUtil.java b/src/forge/AllZoneUtil.java index 101f5f676ff..7e65ee2d5f8 100644 --- a/src/forge/AllZoneUtil.java +++ b/src/forge/AllZoneUtil.java @@ -38,7 +38,7 @@ public class AllZoneUtil { CardList list = getCreaturesInPlay(); list = list.filter(new CardListFilter() { public boolean addCard(Card c) { - return c.getKeyword().contains(keyword); + return c.hasKeyword(keyword); } }); return list; @@ -760,7 +760,7 @@ public class AllZoneUtil { public static CardListFilter getKeywordFilter(final String keyword) { CardListFilter filter = new CardListFilter() { public boolean addCard(Card c) { - return c.getKeyword().contains(keyword); + return c.hasKeyword(keyword); } }; return filter; diff --git a/src/forge/gui/game/CardDetailPanel.java b/src/forge/gui/game/CardDetailPanel.java index 9681f40db90..2be0db07b40 100644 --- a/src/forge/gui/game/CardDetailPanel.java +++ b/src/forge/gui/game/CardDetailPanel.java @@ -225,7 +225,7 @@ public class CardDetailPanel extends JPanel implements CardContainer { } //top revealed - if (card.getKeyword().contains("Play with the top card of your library revealed.") + if (card.hasKeyword("Play with the top card of your library revealed.") && !card.getTopCardName().equals("")) { area.append("\r\nTop card: ");