rewrote singleton to enum where applicable

This commit is contained in:
ingmargoudt 2017-03-14 16:31:57 +01:00
parent 3b62489ef5
commit 234cfe9519
872 changed files with 1796 additions and 2135 deletions

View file

@ -21,14 +21,14 @@ import mage.game.stack.Spell;
*/
public class ColorsOfManaSpentToCastCount implements DynamicValue {
private static final ColorsOfManaSpentToCastCount fINSTANCE = new ColorsOfManaSpentToCastCount();
private static final ColorsOfManaSpentToCastCount instance = new ColorsOfManaSpentToCastCount();
private Object readResolve() throws ObjectStreamException {
return fINSTANCE;
return instance;
}
public static ColorsOfManaSpentToCastCount getInstance() {
return fINSTANCE;
return instance;
}
@Override

View file

@ -47,14 +47,14 @@ import mage.players.Player;
*/
public class ParleyCount implements DynamicValue, MageSingleton {
private static final ParleyCount fINSTANCE = new ParleyCount();
private static final ParleyCount instance = new ParleyCount();
private Object readResolve() throws ObjectStreamException {
return fINSTANCE;
return instance;
}
public static ParleyCount getInstance() {
return fINSTANCE;
return instance;
}
@Override
@ -82,7 +82,7 @@ public class ParleyCount implements DynamicValue, MageSingleton {
@Override
public ParleyCount copy() {
return fINSTANCE;
return instance;
}
@Override

View file

@ -44,14 +44,14 @@ import java.io.ObjectStreamException;
public class SourcePermanentToughnessValue implements DynamicValue {
private static final SourcePermanentToughnessValue fINSTANCE = new SourcePermanentToughnessValue();
private static final SourcePermanentToughnessValue instance = new SourcePermanentToughnessValue();
private Object readResolve() throws ObjectStreamException {
return fINSTANCE;
return instance;
}
public static SourcePermanentToughnessValue getInstance() {
return fINSTANCE;
return instance;
}
@Override

View file

@ -44,14 +44,14 @@ import java.io.ObjectStreamException;
public class TargetPermanenToughnessValue implements DynamicValue {
private static final TargetPermanenToughnessValue fINSTANCE = new TargetPermanenToughnessValue();
private static final TargetPermanenToughnessValue instance = new TargetPermanenToughnessValue();
private Object readResolve() throws ObjectStreamException {
return fINSTANCE;
return instance;
}
public static TargetPermanenToughnessValue getInstance() {
return fINSTANCE;
return instance;
}
@Override