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

[refactor] removed generic from Counter

Browse source
This commit is contained in:
North 2014-05-31 17:11:11 +03:00
parent 5870b0ed7d
commit 545e4298b7
53 changed files with 55 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/alliances/Contagion.java
View file

@ -86,7 +86,7 @@ public class Contagion extends CardImpl<Contagion> {
}
}
class ContagionCounter extends BoostCounter<ContagionCounter> {
class ContagionCounter extends BoostCounter {
public ContagionCounter(int count) {
super(-2, -1);

2
Mage.Sets/src/mage/sets/bornofthegods/ArbiterOfTheIdeal.java
View file

@ -141,7 +141,7 @@ class ArbiterOfTheIdealEffect extends OneShotEffect<ArbiterOfTheIdealEffect> {
}
}
class ManifestationCounter extends Counter<ManifestationCounter> {
class ManifestationCounter extends Counter {
public ManifestationCounter() {
super("manifestation");

2
Mage.Sets/src/mage/sets/championsofkamigawa/SenseiGoldenTail.java
View file

@ -87,7 +87,7 @@ public class SenseiGoldenTail extends CardImpl<SenseiGoldenTail> {
}
class TrainingCounter extends Counter<TrainingCounter> {
class TrainingCounter extends Counter {
public TrainingCounter() {
this(1);

2
Mage.Sets/src/mage/sets/gatecrash/AssembleTheLegion.java
View file

@ -112,7 +112,7 @@ class AssembleTheLegionEffect extends OneShotEffect<AssembleTheLegionEffect> {
}
}
class MusterCounter extends Counter<MusterCounter> {
class MusterCounter extends Counter {
public MusterCounter() {
super("Muster");

2
Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java
View file

@ -107,7 +107,7 @@ class WallOfRootsCost extends CostImpl<WallOfRootsCost> {
}
}
class WallOfRootsCounter extends BoostCounter<WallOfRootsCounter> {
class WallOfRootsCounter extends BoostCounter {
public WallOfRootsCounter() {
super(0, -1);

2
Mage.Sets/src/mage/sets/urzassaga/Smokestack.java
View file

@ -72,7 +72,7 @@ public class Smokestack extends CardImpl<Smokestack> {
}
}
class SootCounter extends Counter<SootCounter> {
class SootCounter extends Counter {
public SootCounter() {
super("soot");

2
Mage/src/mage/counters/BoostCounter.java
View file

@ -32,7 +32,7 @@ package mage.counters;
*
* @author BetaSteward_at_googlemail.com
*/
public abstract class BoostCounter<T extends BoostCounter<T>> extends Counter<T> {
public abstract class BoostCounter extends Counter {
protected int power;
protected int toughness;

7
Mage/src/mage/counters/Counter.java
View file

@ -33,9 +33,8 @@ import java.io.Serializable;
/**
*
* @author BetaSteward_at_googlemail.com
* @param <T>
*/
public class Counter<T extends Counter<T>> implements Serializable {
public class Counter implements Serializable {
protected String name;
protected int count;
@ -86,7 +85,7 @@ public class Counter<T extends Counter<T>> implements Serializable {
return count;
}
public T copy() {
return (T)new Counter(this);
public Counter copy() {
return new Counter(this);
}
}

2
Mage/src/mage/counters/common/AgeCounter.java
View file

@ -35,7 +35,7 @@ import mage.counters.Counter;
*
* @author Plopman
*/
public class AgeCounter extends Counter<AgeCounter> {
public class AgeCounter extends Counter {
public AgeCounter() {
super("age");

2
Mage/src/mage/counters/common/AimCounter.java
View file

@ -35,7 +35,7 @@ import mage.counters.Counter;
*
* @author LevelX
*/
public class AimCounter extends Counter<AimCounter> {
public class AimCounter extends Counter {
public AimCounter() {
super("aim");

2
Mage/src/mage/counters/common/ArrowheadCounter.java
View file

@ -35,7 +35,7 @@ import mage.counters.Counter;
*
* @author nantuko
*/
public class ArrowheadCounter extends Counter<ArrowheadCounter> {
public class ArrowheadCounter extends Counter {
public ArrowheadCounter() {
super("arrowhead");

2
Mage/src/mage/counters/common/AwakeningCounter.java
View file

@ -2,7 +2,7 @@ package mage.counters.common;
import mage.counters.Counter;
public class AwakeningCounter extends Counter<AwakeningCounter> {
public class AwakeningCounter extends Counter {
public AwakeningCounter() {
this(1);
}

2
Mage/src/mage/counters/common/BlazeCounter.java
View file

@ -2,7 +2,7 @@ package mage.counters.common;
import mage.counters.Counter;
public class BlazeCounter extends Counter<BlazeCounter> {
public class BlazeCounter extends Counter {
public BlazeCounter() {
this(1);
}

2
Mage/src/mage/counters/common/BriberyCounter.java
View file

@ -35,7 +35,7 @@ import mage.counters.Counter;
*
* @author jeffwadsworth
*/
public class BriberyCounter extends Counter<BriberyCounter> {
public class BriberyCounter extends Counter {
public BriberyCounter() {
super("bribery");

2
Mage/src/mage/counters/common/ChargeCounter.java
View file

@ -35,7 +35,7 @@ import mage.counters.Counter;
*
* @author nantuko
*/
public class ChargeCounter extends Counter<ChargeCounter> {
public class ChargeCounter extends Counter {
public ChargeCounter() {
super("Charge");

2
Mage/src/mage/counters/common/DepletionCounter.java
View file

@ -12,7 +12,7 @@ import mage.counters.Counter;
*
* @author Plopman
*/
public class DepletionCounter extends Counter<DepletionCounter> {
public class DepletionCounter extends Counter {
public DepletionCounter() {
super("Depletion");

2
Mage/src/mage/counters/common/DespairCounter.java
View file

@ -35,7 +35,7 @@ import mage.counters.Counter;
*
* @author noxx
*/
public class DespairCounter extends Counter<DespairCounter> {
public class DespairCounter extends Counter {
public DespairCounter() {
super("Despair");

2
Mage/src/mage/counters/common/DevotionCounter.java
View file

@ -7,7 +7,7 @@ import mage.counters.Counter;
*
* @author Loki
*/
public class DevotionCounter extends Counter<DevotionCounter> {
public class DevotionCounter extends Counter {
public DevotionCounter() {
super("Devotion");

2
Mage/src/mage/counters/common/DivinityCounter.java
View file

@ -7,7 +7,7 @@ import mage.counters.Counter;
*
* @author Loki
*/
public class DivinityCounter extends Counter<DivinityCounter> {
public class DivinityCounter extends Counter {
public DivinityCounter() {
super("Divinity");

2
Mage/src/mage/counters/common/DoomCounter.java
View file

@ -35,7 +35,7 @@ import mage.counters.Counter;
* @author LevelX2
*/
public class DoomCounter extends Counter<DoomCounter> {
public class DoomCounter extends Counter {
public DoomCounter() {
this(1);

2
Mage/src/mage/counters/common/ElixirCounter.java
View file

@ -33,7 +33,7 @@ import mage.counters.Counter;
*
* @author North
*/
public class ElixirCounter extends Counter<ElixirCounter> {
public class ElixirCounter extends Counter {
public ElixirCounter() {
super("Elixir");

2
Mage/src/mage/counters/common/EonCounter.java
View file

@ -35,7 +35,7 @@ import mage.counters.Counter;
*
* @author nantuko
*/
public class EonCounter extends Counter<EonCounter> {
public class EonCounter extends Counter {
public EonCounter() {
super("Eon");

2
Mage/src/mage/counters/common/EyeballCounter.java
View file

@ -33,7 +33,7 @@ import mage.counters.Counter;
*
* @author North
*/
public class EyeballCounter extends Counter<EyeballCounter> {
public class EyeballCounter extends Counter {
public EyeballCounter() {
super("Eyeball");

2
Mage/src/mage/counters/common/FadeCounter.java
View file

@ -35,7 +35,7 @@ import mage.counters.Counter;
*
* @author nantuko
*/
public class FadeCounter extends Counter<FadeCounter> {
public class FadeCounter extends Counter {
public FadeCounter() {
super("Fade");

2
Mage/src/mage/counters/common/FateCounter.java
View file

@ -7,7 +7,7 @@ import mage.counters.Counter;
*
* @author nantuko
*/
public class FateCounter extends Counter<FateCounter> {
public class FateCounter extends Counter {
public FateCounter() {
super("Fate");

2
Mage/src/mage/counters/common/FeatherCounter.java
View file

@ -35,7 +35,7 @@ import mage.counters.Counter;
*
* @author nantuko
*/
public class FeatherCounter extends Counter<FeatherCounter> {
public class FeatherCounter extends Counter {
public FeatherCounter() {
super("Feather");

2
Mage/src/mage/counters/common/FuseCounter.java
View file

@ -35,7 +35,7 @@ import mage.counters.Counter;
*
* @author LevelX2
*/
public class FuseCounter extends Counter<FuseCounter> {
public class FuseCounter extends Counter {
public FuseCounter() {
super("fuse");

2
Mage/src/mage/counters/common/HatchlingCounter.java
View file

@ -6,7 +6,7 @@ import mage.counters.Counter;
* Hatchling counter
* @author Loki
*/
public class HatchlingCounter extends Counter<HatchlingCounter> {
public class HatchlingCounter extends Counter {
public HatchlingCounter() {
super("Hatchling");
this.count = 1;

2
Mage/src/mage/counters/common/HoofprintCounter.java
View file

@ -5,7 +5,7 @@ import mage.counters.Counter;
/**
* @author Loki
*/
public class HoofprintCounter extends Counter<HoofprintCounter> {
public class HoofprintCounter extends Counter {
public HoofprintCounter() {
super("Hoofprint");

2
Mage/src/mage/counters/common/IceCounter.java
View file

@ -33,7 +33,7 @@ import mage.counters.Counter;
*
* @author Plopman
*/
public class IceCounter extends Counter<IceCounter> {
public class IceCounter extends Counter {
public IceCounter() {
super("Ice");

2
Mage/src/mage/counters/common/KiCounter.java
View file

@ -7,7 +7,7 @@ import mage.counters.Counter;
*
* @author Loki
*/
public class KiCounter extends Counter<KiCounter> {
public class KiCounter extends Counter {
public KiCounter() {
super("Ki");

2
Mage/src/mage/counters/common/LevelCounter.java
View file

@ -35,7 +35,7 @@ import mage.counters.Counter;
*
* @author nantuko
*/
public class LevelCounter extends Counter<LevelCounter> {
public class LevelCounter extends Counter {
public LevelCounter() {
super("Level");

2
Mage/src/mage/counters/common/LoreCounter.java
View file

@ -5,7 +5,7 @@ import mage.counters.Counter;
/**
* Lore counter
*/
public class LoreCounter extends Counter<LoreCounter> {
public class LoreCounter extends Counter {
public LoreCounter() {
super("Lore");
this.count = 1;

2
Mage/src/mage/counters/common/LoyaltyCounter.java
View file

@ -41,7 +41,7 @@ import mage.counters.Counter;
*
* @author nantuko
*/
public class LoyaltyCounter extends Counter<LoyaltyCounter> {
public class LoyaltyCounter extends Counter {
public LoyaltyCounter() {
super("Loyalty");

2
Mage/src/mage/counters/common/MiningCounter.java
View file

@ -33,7 +33,7 @@ import mage.counters.Counter;
*
* @author jeff
*/
public class MiningCounter extends Counter<MiningCounter> {
public class MiningCounter extends Counter {
public MiningCounter() {
super("mining");

2
Mage/src/mage/counters/common/MinusOneCounter.java
View file

@ -34,7 +34,7 @@ import mage.counters.BoostCounter;
*
* @author BetaSteward_at_googlemail.com
*/
public class MinusOneCounter extends BoostCounter<MinusOneCounter> {
public class MinusOneCounter extends BoostCounter {
public MinusOneCounter() {
super(-1, -1);

2
Mage/src/mage/counters/common/PageCounter.java
View file

@ -33,7 +33,7 @@ import mage.counters.Counter;
*
* @author Backfir3
*/
public class PageCounter extends Counter<PageCounter> {
public class PageCounter extends Counter {
public PageCounter() {
super("Page");

2
Mage/src/mage/counters/common/PainCounter.java
View file

@ -33,7 +33,7 @@ import mage.counters.Counter;
*
* @author North
*/
public class PainCounter extends Counter<PainCounter> {
public class PainCounter extends Counter {
public PainCounter() {
super("Pain");

2
Mage/src/mage/counters/common/PetrificationCounter.java
View file

@ -33,7 +33,7 @@ import mage.counters.Counter;
*
* @author jeff
*/
public class PetrificationCounter extends Counter<PetrificationCounter> {
public class PetrificationCounter extends Counter {
public PetrificationCounter() {
super("petrification");

2
Mage/src/mage/counters/common/PlagueCounter.java
View file

@ -34,7 +34,7 @@ import mage.counters.Counter;
* @author LevelX2
*/
public class PlagueCounter extends Counter<PlagueCounter> {
public class PlagueCounter extends Counter {
public PlagueCounter() {
super("plague");

2
Mage/src/mage/counters/common/PlusOneCounter.java
View file

@ -34,7 +34,7 @@ import mage.counters.BoostCounter;
*
* @author BetaSteward_at_googlemail.com
*/
public class PlusOneCounter extends BoostCounter<PlusOneCounter> {
public class PlusOneCounter extends BoostCounter {
public PlusOneCounter() {
this(1);

2
Mage/src/mage/counters/common/PoisonCounter.java
View file

@ -35,7 +35,7 @@ import mage.counters.Counter;
*
* @author nantuko
*/
public class PoisonCounter extends Counter<PoisonCounter> {
public class PoisonCounter extends Counter {
public PoisonCounter() {
super("Poison");

2
Mage/src/mage/counters/common/PressureCounter.java
View file

@ -33,7 +33,7 @@ import mage.counters.Counter;
*
* @author jeff
*/
public class PressureCounter extends Counter<PressureCounter> {
public class PressureCounter extends Counter {
public PressureCounter() {
super("pressure");

2
Mage/src/mage/counters/common/QuestCounter.java
View file

@ -35,7 +35,7 @@ import mage.counters.Counter;
*
* @author nantuko
*/
public class QuestCounter extends Counter<QuestCounter> {
public class QuestCounter extends Counter {
public QuestCounter() {
super("Quest");

2
Mage/src/mage/counters/common/SlimeCounter.java
View file

@ -33,7 +33,7 @@ import mage.counters.Counter;
*
* @author BetaSteward_at_googlemail.com
*/
public class SlimeCounter extends Counter<SlimeCounter> {
public class SlimeCounter extends Counter {
public SlimeCounter() {
this(1);

2
Mage/src/mage/counters/common/SporeCounter.java
View file

@ -35,7 +35,7 @@ import mage.counters.Counter;
*
* @author Loki
*/
public class SporeCounter extends Counter<SporeCounter> {
public class SporeCounter extends Counter {
public SporeCounter() {
super("Spore");

2
Mage/src/mage/counters/common/StorageCounter.java
View file

@ -34,7 +34,7 @@ import mage.counters.Counter;
*
* @author LevelX2
*/
public class StorageCounter extends Counter<SlimeCounter> {
public class StorageCounter extends Counter {
public StorageCounter() {
this(1);

2
Mage/src/mage/counters/common/StudyCounter.java
View file

@ -33,7 +33,7 @@ import mage.counters.Counter;
*
* @author BetaSteward_at_googlemail.com
*/
public class StudyCounter extends Counter<StudyCounter> {
public class StudyCounter extends Counter {
public StudyCounter() {
this(1);

2
Mage/src/mage/counters/common/TheftCounter.java
View file

@ -33,7 +33,7 @@ import mage.counters.Counter;
*
* @author LevelX2
*/
public class TheftCounter extends Counter<TheftCounter> {
public class TheftCounter extends Counter {
public TheftCounter() {
super("Theft");

2
Mage/src/mage/counters/common/TimeCounter.java
View file

@ -35,7 +35,7 @@ import mage.counters.Counter;
*
* @author nantuko
*/
public class TimeCounter extends Counter<TimeCounter> {
public class TimeCounter extends Counter {
public TimeCounter() {
super("Time");

2
Mage/src/mage/counters/common/TowerCounter.java
View file

@ -33,7 +33,7 @@ import mage.counters.Counter;
*
* @author jeffwadsworth
*/
public class TowerCounter extends Counter<TowerCounter> {
public class TowerCounter extends Counter {
public TowerCounter() {
super("Tower");

2
Mage/src/mage/counters/common/VileCounter.java
View file

@ -34,7 +34,7 @@ import mage.counters.Counter;
* @author LevelX2
*/
public class VileCounter extends Counter<VileCounter> {
public class VileCounter extends Counter {
public VileCounter() {
super("vile");

2
Mage/src/mage/counters/common/WishCounter.java
View file

@ -7,7 +7,7 @@ import mage.counters.Counter;
*
* @author nantuko
*/
public class WishCounter extends Counter<WishCounter> {
public class WishCounter extends Counter {
public WishCounter() {
super("Wish");