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 parameter from MageObjectImpl

Browse source
This commit is contained in:
North 2014-06-02 21:00:56 +03:00
parent 77d05d665d
commit 8679e2b3d7
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Mage/src/mage/MageObjectImpl.java
View file

@ -41,7 +41,7 @@ import mage.abilities.keyword.ChangelingAbility;
import mage.constants.CardType; import mage.constants.CardType;
import mage.game.Game; import mage.game.Game;
public abstract class MageObjectImpl<T extends MageObjectImpl<T>> implements MageObject { public abstract class MageObjectImpl implements MageObject {
protected UUID objectId; protected UUID objectId;
@ -57,9 +57,6 @@ public abstract class MageObjectImpl<T extends MageObjectImpl<T>> implements Mag
protected MageInt toughness; protected MageInt toughness;
protected boolean copy; protected boolean copy;
@Override
public abstract T copy();
public MageObjectImpl() { public MageObjectImpl() {
this(UUID.randomUUID()); this(UUID.randomUUID());
} }
@ -73,7 +70,7 @@ public abstract class MageObjectImpl<T extends MageObjectImpl<T>> implements Mag
abilities = new AbilitiesImpl<>(); abilities = new AbilitiesImpl<>();
} }
public MageObjectImpl(final MageObjectImpl<T> object) { public MageObjectImpl(final MageObjectImpl object) {
objectId = object.objectId; objectId = object.objectId;
name = object.name; name = object.name;
manaCost = object.manaCost.copy(); manaCost = object.manaCost.copy();

2
Mage/src/mage/cards/CardImpl.java
View file

@ -59,7 +59,7 @@ import mage.game.command.Commander;
* *
* @param <T> * @param <T>
*/ */
public abstract class CardImpl<T extends CardImpl<T>> extends MageObjectImpl<T> implements Card { public abstract class CardImpl<T extends CardImpl<T>> extends MageObjectImpl implements Card {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Logger logger = Logger.getLogger(CardImpl.class); private static final Logger logger = Logger.getLogger(CardImpl.class);

2
Mage/src/mage/game/permanent/token/Token.java
View file

@ -46,7 +46,7 @@ import mage.players.Player;
import mage.util.CardUtil; import mage.util.CardUtil;
public class Token extends MageObjectImpl<Token> { public class Token extends MageObjectImpl {
protected String description; protected String description;
private UUID lastAddedTokenId; private UUID lastAddedTokenId;