github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 03:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

moved CardTypePredicate to the CardType class

Browse source
This commit is contained in:
Evan Kranzler 2020-01-06 13:17:45 -05:00
parent 943e8dd827
commit f685ee3d69
2 changed files with 28 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Mage/src/main/java/mage/constants/CardType.java
View file

@ -1,10 +1,13 @@
package mage.constants;
import mage.MageObject;
import mage.filter.predicate.Predicate;
import mage.game.Game;
import java.util.Arrays;
import java.util.EnumSet;
/**
*
* @author North
*/
public enum CardType {
@ -20,10 +23,12 @@ public enum CardType {
private final String text;
private final boolean permanentType;
private final CardTypePredicate predicate;
CardType(String text, boolean permanentType) {
this.text = text;
this.permanentType = permanentType;
this.predicate = new CardTypePredicate(this);
}
@Override
@ -60,4 +65,26 @@ public enum CardType {
return cardTypes.toArray(new CardType[0]);
}
public CardTypePredicate getPredicate() {
return this.predicate;
}
public static class CardTypePredicate implements Predicate<MageObject> {
private final CardType cardType;
private CardTypePredicate(CardType cardType) {
this.cardType = cardType;
}
@Override
public boolean apply(MageObject input, Game game) {
return input.getCardType().contains(cardType);
}
@Override
public String toString() {
return "CardType(" + cardType.toString() + ')';
}
}
}

30
Mage/src/main/java/mage/filter/predicate/mageobject/CardTypePredicate.java
View file

@ -1,30 +0,0 @@
package mage.filter.predicate.mageobject;
import mage.constants.CardType;
import mage.MageObject;
import mage.filter.predicate.Predicate;
import mage.game.Game;
/**
*
* @author North
*/
public class CardTypePredicate implements Predicate<MageObject> {
private final CardType cardType;
public CardTypePredicate(CardType cardType) {
this.cardType = cardType;
}
@Override
public boolean apply(MageObject input, Game game) {
return input.getCardType().contains(cardType);
}
@Override
public String toString() {
return "CardType(" + cardType.toString() + ')';
}
}