clean some of the most frequent copy constructor / copy method (#11053)

This commit is contained in:
Susucre 2023-08-31 01:48:03 +02:00 committed by GitHub
parent 5ddb69e1ba
commit 96a2c277b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
66 changed files with 132 additions and 134 deletions

View file

@ -33,7 +33,7 @@ public class LoyaltyAbility extends ActivatedAbilityImpl {
this.timing = TimingRule.SORCERY;
}
public LoyaltyAbility(LoyaltyAbility ability) {
protected LoyaltyAbility(final LoyaltyAbility ability) {
super(ability);
}

View file

@ -19,7 +19,7 @@ public class PlayLandAbility extends ActivatedAbilityImpl {
this.name = "Play " + cardName;
}
public PlayLandAbility(PlayLandAbility ability) {
protected PlayLandAbility(final PlayLandAbility ability) {
super(ability);
}

View file

@ -36,7 +36,7 @@ public abstract class StaticAbility extends AbilityImpl {
return super.isInUseableZone(game, source, event);
}
public StaticAbility(StaticAbility ability) {
protected StaticAbility(final StaticAbility ability) {
super(ability);
}
}

View file

@ -31,7 +31,7 @@ public class StriveAbility extends SimpleStaticAbility {
}
@Override
public SimpleStaticAbility copy() {
public StriveAbility copy() {
return new StriveAbility(this);
}

View file

@ -19,7 +19,7 @@ public class ActivateIfConditionActivatedAbility extends ActivatedAbilityImpl {
this.condition = condition;
}
public ActivateIfConditionActivatedAbility(ActivateIfConditionActivatedAbility ability) {
protected ActivateIfConditionActivatedAbility(final ActivateIfConditionActivatedAbility ability) {
super(ability);
}

View file

@ -15,7 +15,7 @@ public class AttacksEachCombatStaticAbility extends StaticAbility {
super(Zone.BATTLEFIELD, new AttacksIfAbleSourceEffect(Duration.WhileOnBattlefield, true));
}
public AttacksEachCombatStaticAbility(AttacksEachCombatStaticAbility ability) {
protected AttacksEachCombatStaticAbility(AttacksEachCombatStaticAbility ability) {
super(ability);
}

View file

@ -28,7 +28,7 @@ public class DiesThisOrAnotherCreatureTriggeredAbility extends TriggeredAbilityI
setTriggerPhrase("Whenever {this} or another " + filter.getMessage() + " dies, ");
}
public DiesThisOrAnotherCreatureTriggeredAbility(DiesThisOrAnotherCreatureTriggeredAbility ability) {
protected DiesThisOrAnotherCreatureTriggeredAbility(final DiesThisOrAnotherCreatureTriggeredAbility ability) {
super(ability);
this.filter = ability.filter;
this.applyFilterOnSource = ability.applyFilterOnSource;

View file

@ -36,7 +36,7 @@ public class PutIntoGraveFromAnywhereSourceAbility extends SimpleStaticAbility {
}
@Override
public SimpleStaticAbility copy() {
public PutIntoGraveFromAnywhereSourceAbility copy() {
return new PutIntoGraveFromAnywhereSourceAbility(this);
}

View file

@ -20,7 +20,7 @@ public class SimpleEvasionAbility extends EvasionAbility {
}
}
public SimpleEvasionAbility(SimpleEvasionAbility ability) {
protected SimpleEvasionAbility(final SimpleEvasionAbility ability) {
super(ability);
}

View file

@ -19,7 +19,7 @@ public class SimpleStaticAbility extends StaticAbility {
super(zone, effect);
}
public SimpleStaticAbility(SimpleStaticAbility ability) {
protected SimpleStaticAbility(final SimpleStaticAbility ability) {
super(ability);
}

View file

@ -26,7 +26,7 @@ public class AlternativeCostImpl<T extends AlternativeCostImpl<T>> extends Costs
this.add(cost);
}
public AlternativeCostImpl(final AlternativeCostImpl<?> cost) {
protected AlternativeCostImpl(final AlternativeCostImpl<?> cost) {
super(cost);
this.name = cost.name;
this.reminderText = cost.reminderText;

View file

@ -21,7 +21,7 @@ public class CostsImpl<T extends Cost> extends ArrayList<T> implements Costs<T>
public CostsImpl() {
}
public CostsImpl(final CostsImpl<T> costs) {
protected CostsImpl(final CostsImpl<T> costs) {
this.ensureCapacity(costs.size());
for (Cost cost : costs) {
this.add((T) cost.copy());
@ -167,7 +167,7 @@ public class CostsImpl<T extends Cost> extends ArrayList<T> implements Costs<T>
}
@Override
public Costs<T> copy() {
public CostsImpl<T> copy() {
return new CostsImpl(this);
}
}

View file

@ -45,6 +45,9 @@ public abstract class ManaCostImpl extends CostImpl implements ManaCost {
this.phyrexian = manaCost.phyrexian;
}
@Override
abstract public ManaCostImpl copy();
@Override
public Mana getPayment() {
return payment;

View file

@ -608,7 +608,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
}
@Override
public ManaCosts<T> copy() {
public ManaCostsImpl<T> copy() {
return new ManaCostsImpl<>(this);
}

View file

@ -39,7 +39,7 @@ public class ConditionalOneShotEffect extends OneShotEffect {
this.staticText = text;
}
public ConditionalOneShotEffect(ConditionalOneShotEffect effect) {
protected ConditionalOneShotEffect(final ConditionalOneShotEffect effect) {
super(effect);
this.effects.addAll(effect.effects.copy());
this.otherwiseEffects.addAll(effect.otherwiseEffects.copy());

View file

@ -1,11 +1,12 @@
package mage.abilities.dynamicvalue;
import mage.abilities.Ability;
import mage.abilities.effects.Effect;
import mage.game.Game;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import mage.abilities.Ability;
import mage.abilities.effects.Effect;
import mage.game.Game;
public class AdditiveDynamicValue implements DynamicValue {
@ -37,7 +38,7 @@ public class AdditiveDynamicValue implements DynamicValue {
}
@Override
public DynamicValue copy() {
public AdditiveDynamicValue copy() {
return new AdditiveDynamicValue(this.dynamicValues);
}

View file

@ -44,7 +44,7 @@ public class HighestManaValueCount implements DynamicValue {
}
@Override
public DynamicValue copy() {
public HighestManaValueCount copy() {
return new HighestManaValueCount(this);
}

View file

@ -19,7 +19,7 @@ public abstract class SearchEffect extends OneShotEffect {
this.target = target;
}
public SearchEffect(SearchEffect effect) {
protected SearchEffect(final SearchEffect effect) {
super(effect);
this.target = effect.target.copy();
}

View file

@ -25,7 +25,7 @@ public class SkipNextPlayerUntapStepEffect extends OneShotEffect {
: text + " skips their next untap step";
}
public SkipNextPlayerUntapStepEffect(SkipNextPlayerUntapStepEffect effect) {
protected SkipNextPlayerUntapStepEffect(final SkipNextPlayerUntapStepEffect effect) {
super(effect);
}

View file

@ -23,7 +23,7 @@ public class AffinityForArtifactsAbility extends SimpleStaticAbility {
}
@Override
public SimpleStaticAbility copy() {
public AffinityForArtifactsAbility copy() {
return new AffinityForArtifactsAbility(this);
}

View file

@ -31,7 +31,7 @@ public class AffinityForLandTypeAbility extends SimpleStaticAbility {
}
@Override
public SimpleStaticAbility copy() {
public AffinityForLandTypeAbility copy() {
return new AffinityForLandTypeAbility(this);
}

View file

@ -1,9 +1,5 @@
package mage.abilities.keyword;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.effects.OneShotEffect;
@ -15,6 +11,10 @@ import mage.players.Player;
import mage.util.CardUtil;
import mage.watchers.common.BloodthirstWatcher;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/**
* @author Loki
*/
@ -33,7 +33,7 @@ public class BloodthirstAbility extends EntersBattlefieldAbility {
}
@Override
public EntersBattlefieldAbility copy() {
public BloodthirstAbility copy() {
return new BloodthirstAbility(this);
}

View file

@ -39,7 +39,7 @@ public class CumulativeUpkeepAbility extends BeginningOfUpkeepTriggeredAbility {
}
@Override
public BeginningOfUpkeepTriggeredAbility copy() {
public CumulativeUpkeepAbility copy() {
return new CumulativeUpkeepAbility(this);
}

View file

@ -42,7 +42,7 @@ class EscalateEffect extends CostModificationEffectImpl {
this.staticText = "Escalate " + cost.getText() + " <i>(Pay this cost for each mode chosen beyond the first.)</i>";
}
EscalateEffect(final EscalateEffect effect) {
private EscalateEffect(final EscalateEffect effect) {
super(effect);
this.cost = effect.cost.copy();
}

View file

@ -1,9 +1,6 @@
package mage.abilities.keyword;
import java.util.HashSet;
import java.util.Set;
import mage.MageObjectReference;
import mage.abilities.Ability;
import mage.abilities.Mode;
@ -23,6 +20,9 @@ import mage.players.Player;
import mage.target.targetpointer.FixedTarget;
import mage.watchers.Watcher;
import java.util.HashSet;
import java.util.Set;
/**
* @author LevelX2
*/
@ -81,7 +81,7 @@ class ExertReplacementEffect extends ReplacementEffectImpl {
this.exertOnlyOncePerTurn = exertOnlyOncePerTurn;
}
public ExertReplacementEffect(ExertReplacementEffect effect) {
private ExertReplacementEffect(ExertReplacementEffect effect) {
super(effect);
this.exertOnlyOncePerTurn = effect.exertOnlyOncePerTurn;
}

View file

@ -55,7 +55,7 @@ public class FadingAbility extends EntersBattlefieldAbility {
}
@Override
public EntersBattlefieldAbility copy() {
public FadingAbility copy() {
return new FadingAbility(this);
}

View file

@ -36,7 +36,7 @@ public class ReinforceAbility extends SimpleActivatedAbility {
}
@Override
public SimpleActivatedAbility copy() {
public ReinforceAbility copy() {
return new ReinforceAbility(this);
}

View file

@ -57,7 +57,7 @@ public class SoulshiftAbility extends DiesSourceTriggeredAbility {
}
@Override
public DiesSourceTriggeredAbility copy() {
public SoulshiftAbility copy() {
return new SoulshiftAbility(this);
}

View file

@ -1,6 +1,5 @@
package mage.abilities.keyword;
import java.util.Iterator;
import mage.abilities.Ability;
import mage.abilities.SpellAbility;
import mage.abilities.common.SimpleStaticAbility;
@ -19,6 +18,8 @@ import mage.game.Game;
import mage.game.stack.Spell;
import mage.players.Player;
import java.util.Iterator;
/**
* 702.45. Splice
*
@ -116,7 +117,7 @@ public class SpliceAbility extends SimpleStaticAbility {
}
@Override
public SimpleStaticAbility copy() {
public SpliceAbility copy() {
return new SpliceAbility(this);
}

View file

@ -30,13 +30,13 @@ public class SplitSecondAbility extends SimpleStaticAbility {
return "Split second <i>(As long as this spell is on the stack, players can't cast spells or activate abilities that aren't mana abilities.)</i>";
}
public SplitSecondAbility(SplitSecondAbility ability) {
protected SplitSecondAbility(final SplitSecondAbility ability) {
super(ability);
}
@Override
public SimpleStaticAbility copy() {
return new SplitSecondAbility(this);
public SplitSecondAbility copy() {
return new SplitSecondAbility(this);
}
}

View file

@ -37,7 +37,7 @@ public class SunburstAbility extends EntersBattlefieldAbility {
}
@Override
public EntersBattlefieldAbility copy() {
public SunburstAbility copy() {
return new SunburstAbility(this);
}

View file

@ -31,7 +31,7 @@ public class TransformAbility extends SimpleStaticAbility {
}
@Override
public SimpleStaticAbility copy() {
public TransformAbility copy() {
return new TransformAbility(this);
}

View file

@ -48,7 +48,7 @@ public class TransmuteAbility extends SimpleActivatedAbility {
}
@Override
public SimpleActivatedAbility copy() {
public TransmuteAbility copy() {
return new TransmuteAbility(this);
}
@ -67,7 +67,7 @@ class TransmuteEffect extends OneShotEffect {
staticText = "Transmute";
}
TransmuteEffect(final TransmuteEffect effect) {
private TransmuteEffect(final TransmuteEffect effect) {
super(effect);
}

View file

@ -1,8 +1,6 @@
package mage.abilities.keyword;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.effects.OneShotEffect;
@ -15,6 +13,8 @@ import mage.target.Target;
import mage.target.common.TargetOpponent;
import mage.util.CardUtil;
import java.util.UUID;
/**
* @author LevelX2
*/
@ -33,7 +33,7 @@ public class TributeAbility extends EntersBattlefieldAbility {
}
@Override
public EntersBattlefieldAbility copy() {
public TributeAbility copy() {
return new TributeAbility(this);
}

View file

@ -20,7 +20,7 @@ public class UndauntedAbility extends SimpleStaticAbility {
}
@Override
public SimpleStaticAbility copy() {
public UndauntedAbility copy() {
return new UndauntedAbility(this);
}

View file

@ -27,7 +27,7 @@ public class UndyingAbility extends DiesSourceTriggeredAbility {
}
@Override
public DiesSourceTriggeredAbility copy() {
public UndyingAbility copy() {
return new UndyingAbility(this);
}

View file

@ -34,7 +34,7 @@ public class VanishingUpkeepAbility extends BeginningOfUpkeepTriggeredAbility {
}
@Override
public BeginningOfUpkeepTriggeredAbility copy() {
public VanishingUpkeepAbility copy() {
return new VanishingUpkeepAbility(this);
}

View file

@ -13,7 +13,7 @@ public abstract class BasicManaAbility extends ActivatedManaAbilityImpl {
super(Zone.BATTLEFIELD, effect, new TapSourceCost());
}
public BasicManaAbility(BasicManaAbility ability) {
protected BasicManaAbility(final BasicManaAbility ability) {
super(ability);
}
}

View file

@ -17,7 +17,7 @@ public class BlackManaAbility extends BasicManaAbility {
this.netMana.add(new Mana(ColoredManaSymbol.B));
}
public BlackManaAbility(BlackManaAbility ability) {
private BlackManaAbility(final BlackManaAbility ability) {
super(ability);
}

View file

@ -17,7 +17,7 @@ public class BlueManaAbility extends BasicManaAbility {
this.netMana.add(new Mana(ColoredManaSymbol.U));
}
public BlueManaAbility(BlueManaAbility ability) {
private BlueManaAbility(final BlueManaAbility ability) {
super(ability);
}

View file

@ -15,7 +15,7 @@ public class ColorlessManaAbility extends BasicManaAbility {
this.netMana.add(Mana.ColorlessMana(1));
}
public ColorlessManaAbility(ColorlessManaAbility ability) {
private ColorlessManaAbility(final ColorlessManaAbility ability) {
super(ability);
}

View file

@ -17,7 +17,7 @@ public class GreenManaAbility extends BasicManaAbility {
this.netMana.add(new Mana(ColoredManaSymbol.G));
}
public GreenManaAbility(GreenManaAbility ability) {
private GreenManaAbility(final GreenManaAbility ability) {
super(ability);
}

View file

@ -17,7 +17,7 @@ public class RedManaAbility extends BasicManaAbility {
this.netMana.add(new Mana(ColoredManaSymbol.R));
}
public RedManaAbility(RedManaAbility ability) {
private RedManaAbility(final RedManaAbility ability) {
super(ability);
}

View file

@ -17,7 +17,7 @@ public class WhiteManaAbility extends BasicManaAbility {
this.netMana.add(new Mana(ColoredManaSymbol.W));
}
public WhiteManaAbility(WhiteManaAbility ability) {
private WhiteManaAbility(final WhiteManaAbility ability) {
super(ability);
}

View file

@ -30,7 +30,7 @@ public abstract class AdventureCard extends CardImpl {
spellCard.finalizeAdventure();
}
public AdventureCard(AdventureCard card) {
protected AdventureCard(final AdventureCard card) {
super(card);
this.spellCard = card.getSpellCard().copy();
this.spellCard.setParentCard(this);

View file

@ -83,7 +83,7 @@ public class AdventureCardSpellImpl extends CardImpl implements AdventureCardSpe
}
@Override
public AdventureCardSpell copy() {
public AdventureCardSpellImpl copy() {
return new AdventureCardSpellImpl(this);
}

View file

@ -19,7 +19,7 @@ public abstract class LevelerCard extends CardImpl {
super(ownerId, setInfo, cardTypes, costs);
}
public LevelerCard(LevelerCard card) {
protected LevelerCard(final LevelerCard card) {
super(card);
this.maxLevelCounters = card.maxLevelCounters;
}

View file

@ -69,7 +69,7 @@ public class SplitCardHalfImpl extends CardImpl implements SplitCardHalf {
}
@Override
public SplitCardHalf copy() {
public SplitCardHalfImpl copy() {
return new SplitCardHalfImpl(this);
}

View file

@ -1,15 +1,15 @@
package mage.cards.basiclands;
import java.util.UUID;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.abilities.mana.ActivatedManaAbilityImpl;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.SuperType;
import java.util.UUID;
/**
* @author BetaSteward_at_googlemail.com
*/
@ -22,7 +22,7 @@ public abstract class BasicLand extends CardImpl {
this.addAbility(mana);
}
public BasicLand(BasicLand land) {
protected BasicLand(final BasicLand land) {
super(land);
}

View file

@ -2,13 +2,11 @@
package mage.cards.basiclands;
import java.util.UUID;
import mage.ObjectColor;
import mage.abilities.mana.GreenManaAbility;
import mage.cards.Card;
import mage.cards.CardSetInfo;
import java.util.UUID;
/**
* @author BetaSteward_at_googlemail.com
*/
@ -18,12 +16,12 @@ public class Forest extends BasicLand {
this.frameColor.setGreen(true);
}
protected Forest(final Forest land) {
private Forest(final Forest land) {
super(land);
}
@Override
public Card copy() {
public Forest copy() {
return new Forest(this);
}
}

View file

@ -2,12 +2,11 @@
package mage.cards.basiclands;
import java.util.UUID;
import mage.ObjectColor;
import mage.abilities.mana.BlueManaAbility;
import mage.cards.Card;
import mage.cards.CardSetInfo;
import java.util.UUID;
/**
*
* @author BetaSteward_at_googlemail.com
@ -18,12 +17,12 @@ public class Island extends BasicLand {
this.frameColor.setBlue(true);
}
public Island(Island land) {
private Island(final Island land) {
super(land);
}
@Override
public Card copy() {
public Island copy() {
return new Island(this);
}
}

View file

@ -2,12 +2,11 @@
package mage.cards.basiclands;
import java.util.UUID;
import mage.ObjectColor;
import mage.abilities.mana.RedManaAbility;
import mage.cards.Card;
import mage.cards.CardSetInfo;
import java.util.UUID;
/**
*
* @author BetaSteward_at_googlemail.com
@ -18,12 +17,12 @@ public class Mountain extends BasicLand {
this.frameColor.setRed(true);
}
public Mountain(Mountain land) {
private Mountain(final Mountain land) {
super(land);
}
@Override
public Card copy() {
public Mountain copy() {
return new Mountain(this);
}
}

View file

@ -2,12 +2,11 @@
package mage.cards.basiclands;
import java.util.UUID;
import mage.ObjectColor;
import mage.abilities.mana.WhiteManaAbility;
import mage.cards.Card;
import mage.cards.CardSetInfo;
import java.util.UUID;
/**
*
* @author BetaSteward_at_googlemail.com
@ -18,12 +17,12 @@ public class Plains extends BasicLand {
this.frameColor.setWhite(true);
}
public Plains(Plains land) {
private Plains(final Plains land) {
super(land);
}
@Override
public Card copy() {
public Plains copy() {
return new Plains(this);
}
}

View file

@ -2,12 +2,11 @@
package mage.cards.basiclands;
import java.util.UUID;
import mage.ObjectColor;
import mage.abilities.mana.BlackManaAbility;
import mage.cards.Card;
import mage.cards.CardSetInfo;
import java.util.UUID;
/**
*
* @author BetaSteward_at_googlemail.com
@ -18,12 +17,12 @@ public class Swamp extends BasicLand {
this.frameColor.setBlack(true);
}
public Swamp(Swamp land) {
private Swamp(final Swamp land) {
super(land);
}
@Override
public Card copy() {
public Swamp copy() {
return new Swamp(this);
}
}

View file

@ -21,7 +21,7 @@ public class FilterAbility extends FilterImpl<Ability> {
super(name);
}
public FilterAbility(FilterAbility filter) {
protected FilterAbility(final FilterAbility filter) {
super(filter);
}

View file

@ -34,7 +34,7 @@ public class FilterCard extends FilterObject<Card> {
super(name);
}
public FilterCard(FilterCard filter) {
protected FilterCard(final FilterCard filter) {
super(filter);
this.extraPredicates.addAll(filter.extraPredicates);
}

View file

@ -26,7 +26,7 @@ public abstract class FilterImpl<E> implements Filter<E> {
this.lockedFilter = false;
}
public FilterImpl(final FilterImpl<E> filter) {
protected FilterImpl(final FilterImpl<E> filter) {
this.message = filter.message;
this.predicates = new ArrayList<>(filter.predicates);
this.lockedFilter = false;// After copying a filter it's allowed to modify

View file

@ -24,7 +24,7 @@ public class FilterObject<E extends MageObject> extends FilterImpl<E> {
super(name);
}
public FilterObject(FilterObject<E> filter) {
protected FilterObject(final FilterObject<E> filter) {
super(filter);
}
}

View file

@ -24,7 +24,7 @@ public final class WolfToken extends TokenImpl {
}
@Override
public Token copy() {
public WolfToken copy() {
return new WolfToken(this);
}
}

View file

@ -26,7 +26,7 @@ public abstract class NthTargetPointer extends TargetPointerImpl {
this.targetNumber = targetNumber;
}
public NthTargetPointer(final NthTargetPointer nthTargetPointer) {
protected NthTargetPointer(final NthTargetPointer nthTargetPointer) {
super(nthTargetPointer);
this.targetNumber = nthTargetPointer.targetNumber;