Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

list.size > 0 changed to !list.isEmpty

Browse source 
We care about if it's empty or not, not about it's size
This commit is contained in:
vraskulin 2017-01-27 16:04:56 +03:00
parent f60ebfbb1f
commit 0557b5e89c
366 changed files with 532 additions and 548 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/game/GameCommanderImpl.java
View file

@ -72,7 +72,7 @@ public abstract class GameCommanderImpl extends GameImpl {
for (UUID playerId : state.getPlayerList(startingPlayerId)) {
Player player = getPlayer(playerId);
if (player != null) {
while (player.getSideboard().size() > 0) {
while (!player.getSideboard().isEmpty()) {
Card commander = this.getCard(player.getSideboard().iterator().next());
if (commander != null) {
player.addCommanderId(commander.getId());

2
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -1899,7 +1899,7 @@ public abstract class GameImpl implements Game, Serializable {
//20091005 - 704.5q If a creature is attached to an object or player, it becomes unattached and remains on the battlefield.
// Similarly, if a permanent that’s neither an Aura, an Equipment, nor a Fortification is attached to an object or player,
// it becomes unattached and remains on the battlefield.
if (perm.getAttachments().size() > 0) {
if (!perm.getAttachments().isEmpty()) {
for (UUID attachmentId : perm.getAttachments()) {
Permanent attachment = getPermanent(attachmentId);
if (attachment != null

6
Mage/src/main/java/mage/game/GameStates.java
View file

@ -60,7 +60,7 @@ public class GameStates implements Serializable {
}
public GameState rollback(int index) {
if (states.size() > 0 && index < states.size()) {
if (!states.isEmpty() && index < states.size()) {
while (states.size() > index + 1) {
states.remove(states.size() - 1);
}
@ -72,8 +72,8 @@ public class GameStates implements Serializable {
}
public int remove(int index) {
if (states.size() > 0 && index < states.size()) {
while (states.size() > index && states.size() > 0) {
if (!states.isEmpty() && index < states.size()) {
while (states.size() > index && !states.isEmpty()) {
states.remove(states.size() - 1);
}
}

2
Mage/src/main/java/mage/game/ZonesHandler.java
View file

@ -34,7 +34,7 @@ public class ZonesHandler {
public static boolean moveCard(ZoneChangeInfo info, Game game) {
List<ZoneChangeInfo> list = new ArrayList<>();
list.add(info);
return moveCards(list, game).size() > 0;
return !moveCards(list, game).isEmpty();
}
public static List<ZoneChangeInfo> moveCards(List<ZoneChangeInfo> zoneChangeInfos, Game game) {

2
Mage/src/main/java/mage/game/combat/Combat.java
View file

@ -514,7 +514,7 @@ public class Combat implements Serializable, Copyable<Combat> {
}
}
if (attackerExists) {
if (group.getBlockers().size() > 0) {
if (!group.getBlockers().isEmpty()) {
sb.append("blocked by ");
for (UUID blockingCreatureId : group.getBlockerOrder()) {
Permanent blockingCreature = game.getPermanent(blockingCreatureId);

6
Mage/src/main/java/mage/game/combat/CombatGroup.java
View file

@ -134,7 +134,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
}
public void assignDamageToBlockers(boolean first, Game game) {
if (attackers.size() > 0 && (!first || hasFirstOrDoubleStrike(game))) {
if (!attackers.isEmpty() && (!first || hasFirstOrDoubleStrike(game))) {
if (blockers.isEmpty()) {
unblockedDamage(first, game);
} else {
@ -156,7 +156,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
}
public void assignDamageToAttackers(boolean first, Game game) {
if (blockers.size() > 0 && (!first || hasFirstOrDoubleStrike(game))) {
if (!blockers.isEmpty() && (!first || hasFirstOrDoubleStrike(game))) {
if (attackers.size() == 1) {
singleAttackerDamage(first, game);
} else {
@ -583,7 +583,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
for (UUID uuid : attackers) {
Permanent attacker = game.getPermanent(uuid);
// Check if there are enough blockers to have a legal block
if (attacker != null && this.blocked && attacker.getMinBlockedBy() > 1 && blockers.size() > 0 && blockers.size() < attacker.getMinBlockedBy()) {
if (attacker != null && this.blocked && attacker.getMinBlockedBy() > 1 && !blockers.isEmpty() && blockers.size() < attacker.getMinBlockedBy()) {
for (UUID blockerId : blockers) {
Permanent blocker = game.getPermanent(blockerId);
if (blocker != null) {

2
Mage/src/main/java/mage/game/draft/DraftCube.java
View file

@ -108,7 +108,7 @@ public abstract class DraftCube {
if (!cardId.getExtension().isEmpty()) {
CardCriteria criteria = new CardCriteria().name(cardId.getName()).setCodes(cardId.extension);
List<CardInfo> cardList = CardRepository.instance.findCards(criteria);
if (cardList != null && cardList.size() > 0) {
if (cardList != null && !cardList.isEmpty()) {
cardInfo = cardList.get(0);
}
} else {

2
Mage/src/main/java/mage/game/draft/RandomBoosterDraft.java
View file

@ -63,7 +63,7 @@ public class RandomBoosterDraft extends BoosterDraft {
}
private ExpansionSet getNextBooster() {
if (0 == useBoosters.size()){
if (useBoosters.isEmpty()){
resetBoosters();
}
ExpansionSet theBooster = useBoosters.get(0);

2
Mage/src/main/java/mage/game/match/MatchPlayer.java
View file

@ -105,7 +105,7 @@ public class MatchPlayer implements Serializable {
public Deck generateDeck() {
//TODO: improve this
while (deck.getCards().size() < 40 && deck.getSideboard().size() > 0) {
while (deck.getCards().size() < 40 && !deck.getSideboard().isEmpty()) {
Card card = deck.getSideboard().iterator().next();
deck.getCards().add(card);
deck.getSideboard().remove(card);

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

@ -284,7 +284,7 @@ public class Token extends MageObjectImpl {
}
public void setExpansionSetCodeForImage(String code) {
if (availableImageSetCodes.size() > 0) {
if (!availableImageSetCodes.isEmpty()) {
if (availableImageSetCodes.contains(code)) {
setOriginalExpansionSetCode(code);
} else // we should not set random set if appropriate set is already used

2
Mage/src/main/java/mage/game/stack/Spell.java
View file

@ -315,7 +315,7 @@ public class Spell extends StackObjImpl implements Card {
boolean legalTargetedMode = false;
for (UUID modeId : spellAbility.getModes().getSelectedModes()) {
Mode mode = spellAbility.getModes().get(modeId);
if (mode.getTargets().size() > 0) {
if (!mode.getTargets().isEmpty()) {
targetedMode = true;
if (mode.getTargets().stillLegal(spellAbility, game)) {
legalTargetedMode = true;

2
Mage/src/main/java/mage/game/stack/StackAbility.java
View file

@ -589,7 +589,7 @@ public class StackAbility extends StackObjImpl implements Ability {
newAbility.newId();
StackAbility newStackAbility = new StackAbility(newAbility, newControllerId);
game.getStack().push(newStackAbility);
if (chooseNewTargets && newAbility.getTargets().size() > 0) {
if (chooseNewTargets && !newAbility.getTargets().isEmpty()) {
Player controller = game.getPlayer(newControllerId);
Outcome outcome = newAbility.getEffects().isEmpty() ? Outcome.Detriment : newAbility.getEffects().get(0).getOutcome();
if (controller.chooseUse(outcome, "Choose new targets?", source, game)) {

2
Mage/src/main/java/mage/game/tournament/TournamentImpl.java
View file

@ -202,7 +202,7 @@ public abstract class TournamentImpl implements Tournament {
round.addPairing(new TournamentPairing(player1, player2));
}
if (roundPlayers.size() > 0) {
if (!roundPlayers.isEmpty()) {
// player free round - add to bye players of this round
TournamentPlayer player1 = roundPlayers.get(0);
round.getPlayerByes().add(player1);

2
Mage/src/main/java/mage/game/tournament/pairing/SwissPairingSimple.java
View file

@ -67,7 +67,7 @@ public class SwissPairingSimple {
});
// create pairings
while (players.size() > 0) {
while (!players.isEmpty()) {
TournamentPlayer player1 = players.get(0);
players.remove(0);
TournamentPlayer playerForPossibleSecondPairing = null;