From 200a565a9d1b6d3c4b2d1f82aeb46dfad8c50e30 Mon Sep 17 00:00:00 2001 From: North Date: Sat, 6 Jul 2013 11:08:36 +0300 Subject: [PATCH] Merged DeckValidator interface with DeckValidatorImpl --- .../src/mage/deck/Commander.java | 4 +- .../src/mage/deck/Limited.java | 4 +- Mage/src/mage/cards/decks/Constructed.java | 2 +- Mage/src/mage/cards/decks/DeckValidator.java | 88 ++++++++++++------- .../mage/cards/decks/DeckValidatorImpl.java | 70 --------------- 5 files changed, 62 insertions(+), 106 deletions(-) delete mode 100644 Mage/src/mage/cards/decks/DeckValidatorImpl.java diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java index baa3052a57f..2d6aa834e31 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java @@ -36,7 +36,7 @@ import java.util.Map; import mage.cards.Card; import mage.cards.decks.Deck; -import mage.cards.decks.DeckValidatorImpl; +import mage.cards.decks.DeckValidator; import mage.constants.CardType; import mage.filter.FilterMana; @@ -46,7 +46,7 @@ import mage.filter.FilterMana; */ -public class Commander extends DeckValidatorImpl { +public class Commander extends DeckValidator { protected List banned = new ArrayList(); protected List bannedCommander = new ArrayList(); diff --git a/Mage.Server.Plugins/Mage.Deck.Limited/src/mage/deck/Limited.java b/Mage.Server.Plugins/Mage.Deck.Limited/src/mage/deck/Limited.java index e9e18c7fe3b..37603876240 100644 --- a/Mage.Server.Plugins/Mage.Deck.Limited/src/mage/deck/Limited.java +++ b/Mage.Server.Plugins/Mage.Deck.Limited/src/mage/deck/Limited.java @@ -29,13 +29,13 @@ package mage.deck; import mage.cards.decks.Deck; -import mage.cards.decks.DeckValidatorImpl; +import mage.cards.decks.DeckValidator; /** * * @author BetaSteward_at_googlemail.com */ -public class Limited extends DeckValidatorImpl { +public class Limited extends DeckValidator { public Limited() { super("Limited"); diff --git a/Mage/src/mage/cards/decks/Constructed.java b/Mage/src/mage/cards/decks/Constructed.java index 624d9b582b2..c494b486da6 100644 --- a/Mage/src/mage/cards/decks/Constructed.java +++ b/Mage/src/mage/cards/decks/Constructed.java @@ -42,7 +42,7 @@ import mage.cards.repository.CardRepository; * * @author BetaSteward_at_googlemail.com */ -public class Constructed extends DeckValidatorImpl { +public class Constructed extends DeckValidator { protected List banned = new ArrayList(); protected List restricted = new ArrayList(); diff --git a/Mage/src/mage/cards/decks/DeckValidator.java b/Mage/src/mage/cards/decks/DeckValidator.java index 096f4847d66..4b67a4acc5c 100644 --- a/Mage/src/mage/cards/decks/DeckValidator.java +++ b/Mage/src/mage/cards/decks/DeckValidator.java @@ -1,44 +1,70 @@ /* -* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. -* -* Redistribution and use in source and binary forms, with or without modification, are -* permitted provided that the following conditions are met: -* -* 1. Redistributions of source code must retain the above copyright notice, this list of -* conditions and the following disclaimer. -* -* 2. Redistributions in binary form must reproduce the above copyright notice, this list -* of conditions and the following disclaimer in the documentation and/or other materials -* provided with the distribution. -* -* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED -* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR -* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* The views and conclusions contained in the software and documentation are those of the -* authors and should not be interpreted as representing official policies, either expressed -* or implied, of BetaSteward_at_googlemail.com. -*/ - + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ package mage.cards.decks; import java.io.Serializable; +import java.util.Collection; +import java.util.HashMap; import java.util.Map; +import mage.cards.Card; /** * * @author BetaSteward_at_googlemail.com */ -public interface DeckValidator extends Serializable { +public abstract class DeckValidator implements Serializable { - String getName(); - boolean validate(Deck deck); - Map getInvalid(); + protected String name; + protected Map invalid = new HashMap(); + + public DeckValidator(String name) { + this.name = name; + } + + public abstract boolean validate(Deck deck); + + public String getName() { + return name; + } + + public Map getInvalid() { + return invalid; + } + + protected void countCards(Map counts, Collection cards) { + for (Card card: cards) { + if (counts.containsKey(card.getName())) { + counts.put(card.getName(), counts.get(card.getName()) + 1); + } + else { + counts.put(card.getName(), 1); + } + } + } } diff --git a/Mage/src/mage/cards/decks/DeckValidatorImpl.java b/Mage/src/mage/cards/decks/DeckValidatorImpl.java deleted file mode 100644 index 9593f096032..00000000000 --- a/Mage/src/mage/cards/decks/DeckValidatorImpl.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of BetaSteward_at_googlemail.com. - */ - -package mage.cards.decks; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import mage.cards.Card; - -/** - * - * @author BetaSteward_at_googlemail.com - */ -public abstract class DeckValidatorImpl implements DeckValidator { - - protected String name; - - protected Map invalid = new HashMap(); - - public DeckValidatorImpl(String name) { - this.name = name; - } - - @Override - public String getName() { - return name; - } - - protected void countCards(Map counts, Collection cards) { - for (Card card: cards) { - if (counts.containsKey(card.getName())) { - counts.put(card.getName(), counts.get(card.getName()) + 1); - } - else { - counts.put(card.getName(), 1); - } - } - } - - @Override - public Map getInvalid() { - return invalid; - } -}