From 01bb9572e9932dd553adeee6a3eaed1f65ef34a9 Mon Sep 17 00:00:00 2001 From: vraskulin Date: Thu, 29 Dec 2016 15:38:22 +0300 Subject: [PATCH] Refactoring See github line by line comments in 'File changed' --- Mage/src/main/java/mage/choices/ChoiceImpl.java | 2 +- .../src/main/java/mage/constants/DependencyType.java | 2 +- Mage/src/main/java/mage/constants/ManaType.java | 2 +- .../src/main/java/mage/constants/MatchTimeLimit.java | 4 ++-- .../main/java/mage/constants/RangeOfInfluence.java | 2 +- .../main/java/mage/constants/SetTargetPointer.java | 2 +- Mage/src/main/java/mage/counters/BoostCounter.java | 4 ++-- Mage/src/main/java/mage/counters/Counter.java | 5 +---- Mage/src/main/java/mage/counters/CounterType.java | 2 +- .../src/main/java/mage/designations/Designation.java | 2 +- .../common/FilterControlledCreatureInPlay.java | 2 +- .../mage/filter/common/FilterCreatureOrPlayer.java | 2 +- .../mage/filter/common/FilterPermanentOrPlayer.java | 4 ++-- .../filter/common/FilterPlaneswalkerOrPlayer.java | 4 ++-- .../java/mage/filter/predicate/ObjectPlayer.java | 4 ++-- .../mage/filter/predicate/ObjectSourcePlayer.java | 2 +- .../main/java/mage/filter/predicate/Predicates.java | 12 ++++++------ .../predicate/mageobject/FromSetPredicate.java | 2 +- .../predicate/permanent/AttachedToPredicate.java | 2 +- .../permanent/ControllerControlsIslandPredicate.java | 2 +- .../predicate/permanent/PermanentIdPredicate.java | 2 +- 21 files changed, 31 insertions(+), 34 deletions(-) diff --git a/Mage/src/main/java/mage/choices/ChoiceImpl.java b/Mage/src/main/java/mage/choices/ChoiceImpl.java index bf8375c645e..bee47239a86 100644 --- a/Mage/src/main/java/mage/choices/ChoiceImpl.java +++ b/Mage/src/main/java/mage/choices/ChoiceImpl.java @@ -41,7 +41,7 @@ import java.util.Set; public class ChoiceImpl implements Choice, Serializable { protected boolean chosen; - protected boolean required; + protected final boolean required; protected String choice; protected String choiceKey; protected Set choices = new LinkedHashSet<>(); diff --git a/Mage/src/main/java/mage/constants/DependencyType.java b/Mage/src/main/java/mage/constants/DependencyType.java index 4141c330cf8..d5ada875ede 100644 --- a/Mage/src/main/java/mage/constants/DependencyType.java +++ b/Mage/src/main/java/mage/constants/DependencyType.java @@ -48,5 +48,5 @@ public enum DependencyType { BecomePlains, BecomeSwamp, EnchantmentAddingRemoving, - LooseDefenderEffect; + LooseDefenderEffect } diff --git a/Mage/src/main/java/mage/constants/ManaType.java b/Mage/src/main/java/mage/constants/ManaType.java index e4da25c96a7..3539dbfd6e7 100644 --- a/Mage/src/main/java/mage/constants/ManaType.java +++ b/Mage/src/main/java/mage/constants/ManaType.java @@ -24,4 +24,4 @@ public enum ManaType { public String toString() { return text; } -}; +} diff --git a/Mage/src/main/java/mage/constants/MatchTimeLimit.java b/Mage/src/main/java/mage/constants/MatchTimeLimit.java index 00fe3c3179f..1d034bc3d97 100644 --- a/Mage/src/main/java/mage/constants/MatchTimeLimit.java +++ b/Mage/src/main/java/mage/constants/MatchTimeLimit.java @@ -19,8 +19,8 @@ public enum MatchTimeLimit { MIN__90(5400, "90 Minutes"), MIN_120(7200, "120 Minutes"); - private int matchSeconds; - private String name; + private final int matchSeconds; + private final String name; MatchTimeLimit(int matchSeconds, String name) { this.matchSeconds = matchSeconds; diff --git a/Mage/src/main/java/mage/constants/RangeOfInfluence.java b/Mage/src/main/java/mage/constants/RangeOfInfluence.java index 7ed7ca58c2c..398c9ba9218 100644 --- a/Mage/src/main/java/mage/constants/RangeOfInfluence.java +++ b/Mage/src/main/java/mage/constants/RangeOfInfluence.java @@ -9,7 +9,7 @@ public enum RangeOfInfluence { TWO(2), ALL(0); - private int range; + private final int range; RangeOfInfluence(int range) { this.range = range; diff --git a/Mage/src/main/java/mage/constants/SetTargetPointer.java b/Mage/src/main/java/mage/constants/SetTargetPointer.java index 33014b54467..04c3afb9245 100644 --- a/Mage/src/main/java/mage/constants/SetTargetPointer.java +++ b/Mage/src/main/java/mage/constants/SetTargetPointer.java @@ -33,5 +33,5 @@ package mage.constants; */ public enum SetTargetPointer { - NONE, PLAYER, SPELL, CARD, PERMANENT, ATTACHED_TO_CONTROLLER; + NONE, PLAYER, SPELL, CARD, PERMANENT, ATTACHED_TO_CONTROLLER } diff --git a/Mage/src/main/java/mage/counters/BoostCounter.java b/Mage/src/main/java/mage/counters/BoostCounter.java index 8b25e647c80..70f0f994670 100644 --- a/Mage/src/main/java/mage/counters/BoostCounter.java +++ b/Mage/src/main/java/mage/counters/BoostCounter.java @@ -34,8 +34,8 @@ package mage.counters; */ public class BoostCounter extends Counter { - protected int power; - protected int toughness; + protected final int power; + protected final int toughness; public BoostCounter(int power, int toughness) { this(power, toughness, 1); diff --git a/Mage/src/main/java/mage/counters/Counter.java b/Mage/src/main/java/mage/counters/Counter.java index 67b19e08bdb..53ee5c039d5 100644 --- a/Mage/src/main/java/mage/counters/Counter.java +++ b/Mage/src/main/java/mage/counters/Counter.java @@ -158,10 +158,7 @@ public class Counter implements Serializable { Counter counter = (Counter) o; - if (count != counter.count) { - return false; - } - return !(name != null ? !name.equals(counter.name) : counter.name != null); + return count == counter.count && !(name != null ? !name.equals(counter.name) : counter.name != null); } diff --git a/Mage/src/main/java/mage/counters/CounterType.java b/Mage/src/main/java/mage/counters/CounterType.java index 87ddf281ad4..676e812ad67 100644 --- a/Mage/src/main/java/mage/counters/CounterType.java +++ b/Mage/src/main/java/mage/counters/CounterType.java @@ -123,7 +123,7 @@ public enum CounterType { private final String name; - private CounterType(String name) { + CounterType(String name) { this.name = name; } diff --git a/Mage/src/main/java/mage/designations/Designation.java b/Mage/src/main/java/mage/designations/Designation.java index ecf203ff47d..81e5682194d 100644 --- a/Mage/src/main/java/mage/designations/Designation.java +++ b/Mage/src/main/java/mage/designations/Designation.java @@ -31,7 +31,7 @@ public abstract class Designation implements MageObject { private static List emptyList = new ArrayList(); private static ObjectColor emptyColor = new ObjectColor(); - private static ManaCosts emptyCost = new ManaCostsImpl(); + private static ManaCosts emptyCost = new ManaCostsImpl(); private String name; private UUID id; diff --git a/Mage/src/main/java/mage/filter/common/FilterControlledCreatureInPlay.java b/Mage/src/main/java/mage/filter/common/FilterControlledCreatureInPlay.java index e063469fc1d..b25a7e72923 100644 --- a/Mage/src/main/java/mage/filter/common/FilterControlledCreatureInPlay.java +++ b/Mage/src/main/java/mage/filter/common/FilterControlledCreatureInPlay.java @@ -41,7 +41,7 @@ import mage.game.permanent.Permanent; */ public class FilterControlledCreatureInPlay extends FilterImpl implements FilterInPlay { - protected FilterCreaturePermanent creatureFilter; + protected final FilterCreaturePermanent creatureFilter; public FilterControlledCreatureInPlay() { this("creature"); diff --git a/Mage/src/main/java/mage/filter/common/FilterCreatureOrPlayer.java b/Mage/src/main/java/mage/filter/common/FilterCreatureOrPlayer.java index 80a28be2eb9..865e4cc5d6e 100644 --- a/Mage/src/main/java/mage/filter/common/FilterCreatureOrPlayer.java +++ b/Mage/src/main/java/mage/filter/common/FilterCreatureOrPlayer.java @@ -43,7 +43,7 @@ import mage.players.Player; public class FilterCreatureOrPlayer extends FilterImpl implements FilterInPlay { protected FilterCreaturePermanent creatureFilter; - protected FilterPlayer playerFilter; + protected final FilterPlayer playerFilter; public FilterCreatureOrPlayer() { this("creature or player"); diff --git a/Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayer.java b/Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayer.java index af06e5bd174..d4e024f4762 100644 --- a/Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayer.java +++ b/Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayer.java @@ -42,8 +42,8 @@ import mage.players.Player; */ public class FilterPermanentOrPlayer extends FilterImpl implements FilterInPlay { - protected FilterPermanent permanentFilter; - protected FilterPlayer playerFilter; + protected final FilterPermanent permanentFilter; + protected final FilterPlayer playerFilter; public FilterPermanentOrPlayer() { this("player or permanent"); diff --git a/Mage/src/main/java/mage/filter/common/FilterPlaneswalkerOrPlayer.java b/Mage/src/main/java/mage/filter/common/FilterPlaneswalkerOrPlayer.java index 025ef208030..f79ed9546ca 100644 --- a/Mage/src/main/java/mage/filter/common/FilterPlaneswalkerOrPlayer.java +++ b/Mage/src/main/java/mage/filter/common/FilterPlaneswalkerOrPlayer.java @@ -46,8 +46,8 @@ import mage.players.Player; */ public class FilterPlaneswalkerOrPlayer extends FilterImpl { - protected FilterPlaneswalkerPermanent planeswalkerFilter; - protected FilterPlayer playerFilter; + protected final FilterPlaneswalkerPermanent planeswalkerFilter; + protected final FilterPlayer playerFilter; public FilterPlaneswalkerOrPlayer(Set defenders) { super("planeswalker or player"); diff --git a/Mage/src/main/java/mage/filter/predicate/ObjectPlayer.java b/Mage/src/main/java/mage/filter/predicate/ObjectPlayer.java index 3d0a278f7b4..0bb0c44b176 100644 --- a/Mage/src/main/java/mage/filter/predicate/ObjectPlayer.java +++ b/Mage/src/main/java/mage/filter/predicate/ObjectPlayer.java @@ -36,8 +36,8 @@ import java.util.UUID; */ public class ObjectPlayer { - protected T object; - protected UUID playerId; + protected final T object; + protected final UUID playerId; public ObjectPlayer(T object, UUID playerId) { this.object = object; diff --git a/Mage/src/main/java/mage/filter/predicate/ObjectSourcePlayer.java b/Mage/src/main/java/mage/filter/predicate/ObjectSourcePlayer.java index 176a57d698f..360af498261 100644 --- a/Mage/src/main/java/mage/filter/predicate/ObjectSourcePlayer.java +++ b/Mage/src/main/java/mage/filter/predicate/ObjectSourcePlayer.java @@ -36,7 +36,7 @@ import java.util.UUID; */ public class ObjectSourcePlayer extends ObjectPlayer { - protected UUID sourceId; + protected final UUID sourceId; public ObjectSourcePlayer(T object, UUID sourceId, UUID playerId) { super(object, playerId); diff --git a/Mage/src/main/java/mage/filter/predicate/Predicates.java b/Mage/src/main/java/mage/filter/predicate/Predicates.java index 00a386a8469..103217fbf8e 100644 --- a/Mage/src/main/java/mage/filter/predicate/Predicates.java +++ b/Mage/src/main/java/mage/filter/predicate/Predicates.java @@ -168,8 +168,8 @@ public final class Predicates { @Override public boolean apply(T t, Game game) { - for (int i = 0; i < components.size(); i++) { - if (!components.get(i).apply(t, game)) { + for (Predicate component : components) { + if (!component.apply(t, game)) { return false; } } @@ -196,8 +196,8 @@ public final class Predicates { @Override public boolean apply(T t, Game game) { - for (int i = 0; i < components.size(); i++) { - if (components.get(i).apply(t, game)) { + for (Predicate component : components) { + if (component.apply(t, game)) { return true; } } @@ -244,8 +244,8 @@ public final class Predicates { private static String commaJoin(List components) { StringBuilder sb = new StringBuilder(); - for (int i = 0; i < components.size(); i++) { - sb.append(components.get(i).toString()); + for (Object component : components) { + sb.append(component.toString()); } sb.deleteCharAt(sb.length() - 1); return sb.toString(); diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/FromSetPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/FromSetPredicate.java index d330697e3d9..6fc541ee589 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/FromSetPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/FromSetPredicate.java @@ -38,7 +38,7 @@ import mage.game.Game; */ public class FromSetPredicate implements Predicate { - protected Set set; + protected final Set set; public FromSetPredicate(Set set) { this.set = set; diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/AttachedToPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/AttachedToPredicate.java index 7d155ffa14e..a5bbe26ed49 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/AttachedToPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/AttachedToPredicate.java @@ -39,7 +39,7 @@ import mage.game.permanent.Permanent; */ public class AttachedToPredicate implements Predicate { - private FilterPermanent filter; + private final FilterPermanent filter; public AttachedToPredicate(FilterPermanent filter) { this.filter = filter; diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/ControllerControlsIslandPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/ControllerControlsIslandPredicate.java index 70448795764..8705b893590 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/ControllerControlsIslandPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/ControllerControlsIslandPredicate.java @@ -41,7 +41,7 @@ import mage.game.permanent.Permanent; public class ControllerControlsIslandPredicate implements Predicate { public static final FilterLandPermanent filter = new FilterLandPermanent("Island"); - { + static { filter.add(new SubtypePredicate("Island")); } diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/PermanentIdPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/PermanentIdPredicate.java index 91eb073ee9a..268bcc305a9 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/PermanentIdPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/PermanentIdPredicate.java @@ -51,6 +51,6 @@ public class PermanentIdPredicate implements Predicate { @Override public String toString() { - return new StringBuilder("PermanentId(").append(permanentId).append(")").toString() ; + return "PermanentId(" + permanentId + ")"; } }