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

[refactoring] Moved another field to FilterPermanent

Browse source
This commit is contained in:
North 2012-07-13 23:08:10 +03:00
parent 13f744f09f
commit 4edee0b2f9
3 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/mage/filter/FilterAbility.java
View file

@ -41,7 +41,7 @@ import java.util.List;
* *
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
*/ */
public class FilterAbility<T extends Ability> extends FilterImpl<T, FilterAbility<T>> implements Filter<T> { public class FilterAbility<T extends Ability> extends FilterImpl<T, FilterAbility<T>> {
protected static ListComparer<Outcome> compOutcome = new ListComparer<Outcome>(); protected static ListComparer<Outcome> compOutcome = new ListComparer<Outcome>();

15
Mage/src/mage/filter/FilterObject.java
View file

@ -32,16 +32,10 @@ import mage.MageObject;
/** /**
* *
* @author BetaSteward_at_googlemail.com
* @author North * @author North
*/ */
public class FilterObject<E extends MageObject, T extends FilterObject<E, T>> extends FilterImpl<E, T> { public class FilterObject<E extends MageObject, T extends FilterObject<E, T>> extends FilterImpl<E, T> {
/**
* Indicates that filter shouldn't match the source.
*/
protected boolean another;
@Override @Override
public FilterObject<E, T> copy() { public FilterObject<E, T> copy() {
return new FilterObject<E, T>(this); return new FilterObject<E, T>(this);
@ -53,14 +47,5 @@ public class FilterObject<E extends MageObject, T extends FilterObject<E, T>> ex
public FilterObject(FilterObject filter) { public FilterObject(FilterObject filter) {
super(filter); super(filter);
this.another = filter.another;
}
public boolean isAnother() {
return another;
}
public void setAnother(boolean another) {
this.another = another;
} }
} }

10
Mage/src/mage/filter/FilterPermanent.java
View file

@ -55,6 +55,7 @@ public class FilterPermanent<T extends FilterPermanent<T>> extends FilterObject<
protected boolean phasedIn; protected boolean phasedIn;
protected TargetController controller = TargetController.ANY; protected TargetController controller = TargetController.ANY;
protected TargetController owner = TargetController.ANY; protected TargetController owner = TargetController.ANY;
protected boolean another;
public FilterPermanent() { public FilterPermanent() {
super("permanent"); super("permanent");
@ -76,6 +77,7 @@ public class FilterPermanent<T extends FilterPermanent<T>> extends FilterObject<
this.phasedIn = filter.phasedIn; this.phasedIn = filter.phasedIn;
this.controller = filter.controller; this.controller = filter.controller;
this.owner = filter.owner; this.owner = filter.owner;
this.another = filter.another;
} }
public FilterPermanent(String name) { public FilterPermanent(String name) {
@ -204,6 +206,14 @@ public class FilterPermanent<T extends FilterPermanent<T>> extends FilterObject<
this.owner = owner; this.owner = owner;
} }
public boolean isAnother() {
return another;
}
public void setAnother(boolean another) {
this.another = another;
}
public boolean matchOwner(UUID testOwnerId) { public boolean matchOwner(UUID testOwnerId) {
if (ownerId.size() > 0 && ownerId.contains(testOwnerId) == notOwner) if (ownerId.size() > 0 && ownerId.contains(testOwnerId) == notOwner)
return false; return false;