All 1-character strings converted to primitives

"b" + "r" now changed to 'b' + 'w'.  It's more straight-forward, and may cause perfomance improvements - character primitives allocation is faster and less expensive than string creation.
This commit is contained in:
vraskulin 2017-01-27 15:57:10 +03:00
parent 31589778ca
commit f60ebfbb1f
451 changed files with 989 additions and 978 deletions

View file

@ -132,9 +132,9 @@ public abstract class TargetImpl implements Target {
StringBuilder sb = new StringBuilder();
sb.append("Select ").append(targetName);
if (getMaxNumberOfTargets() > 0 && getMaxNumberOfTargets() != Integer.MAX_VALUE) {
sb.append(" (").append(targets.size()).append("/").append(getMaxNumberOfTargets()).append(")");
sb.append(" (").append(targets.size()).append('/').append(getMaxNumberOfTargets()).append(')');
} else {
sb.append(" (").append(targets.size()).append(")");
sb.append(" (").append(targets.size()).append(')');
}
sb.append(suffix);
return sb.toString();

View file

@ -69,7 +69,7 @@ public abstract class TargetObject extends TargetImpl {
for (UUID targetId: getTargets()) {
MageObject object = game.getObject(targetId);
if (object != null) {
sb.append(object.getLogName()).append(" ");
sb.append(object.getLogName()).append(' ');
}
}
return sb.toString();

View file

@ -197,7 +197,7 @@ public class TargetPlayer extends TargetImpl {
for (UUID targetId : getTargets()) {
Player player = game.getPlayer(targetId);
if (player != null) {
sb.append(player.getLogName()).append(" ");
sb.append(player.getLogName()).append(' ');
} else {
sb.append("[target missing]");
}

View file

@ -115,10 +115,10 @@ public class TargetActivatedAbility extends TargetObject {
for (UUID targetId : getTargets()) {
StackAbility object = (StackAbility) game.getObject(targetId);
if (object != null) {
sb.append(object.getRule()).append(" ");
sb.append(object.getRule()).append(' ');
}
}
sb.append(")");
sb.append(')');
return sb.toString();
}
}

View file

@ -165,7 +165,7 @@
for (UUID targetId : getTargets()) {
Permanent permanent = game.getPermanent(targetId);
if (permanent != null) {
sb.append(permanent.getLogName()).append("(").append(getTargetAmount(targetId)).append(") ");
sb.append(permanent.getLogName()).append('(').append(getTargetAmount(targetId)).append(") ");
}
}
return sb.toString();

View file

@ -229,11 +229,11 @@ public class TargetCreatureOrPlayer extends TargetImpl {
for (UUID targetId : getTargets()) {
Permanent permanent = game.getPermanent(targetId);
if (permanent != null) {
sb.append(permanent.getLogName()).append(" ");
sb.append(permanent.getLogName()).append(' ');
} else {
Player player = game.getPlayer(targetId);
if (player != null) {
sb.append(player.getLogName()).append(" ");
sb.append(player.getLogName()).append(' ');
}
}
}

View file

@ -201,10 +201,10 @@ public class TargetCreatureOrPlayerAmount extends TargetAmount {
for (UUID targetId : getTargets()) {
Permanent permanent = game.getPermanent(targetId);
if (permanent != null) {
sb.append(permanent.getLogName()).append("(").append(getTargetAmount(targetId)).append(") ");
sb.append(permanent.getLogName()).append('(').append(getTargetAmount(targetId)).append(") ");
} else {
Player player = game.getPlayer(targetId);
sb.append(player.getLogName()).append("(").append(getTargetAmount(targetId)).append(") ");
sb.append(player.getLogName()).append('(').append(getTargetAmount(targetId)).append(") ");
}
}
return sb.toString();

View file

@ -163,7 +163,7 @@ public class TargetCreaturePermanentAmount extends TargetAmount {
for (UUID targetId : getTargets()) {
Permanent permanent = game.getPermanent(targetId);
if (permanent != null) {
sb.append(permanent.getLogName()).append("(").append(getTargetAmount(targetId)).append(") ");
sb.append(permanent.getLogName()).append('(').append(getTargetAmount(targetId)).append(") ");
}
}
return sb.toString();

View file

@ -170,11 +170,11 @@ public class TargetDefender extends TargetImpl {
for (UUID targetId: getTargets()) {
Permanent permanent = game.getPermanent(targetId);
if (permanent != null) {
sb.append(permanent.getName()).append(" ");
sb.append(permanent.getName()).append(' ');
}
else {
Player player = game.getPlayer(targetId);
sb.append(player.getLogName()).append(" ");
sb.append(player.getLogName()).append(' ');
}
}
return sb.toString();

View file

@ -242,11 +242,11 @@ public class TargetPermanentOrPlayer extends TargetImpl {
for (UUID targetId: getTargets()) {
Permanent permanent = game.getPermanent(targetId);
if (permanent != null) {
sb.append(permanent.getLogName()).append(" ");
sb.append(permanent.getLogName()).append(' ');
}
else {
Player player = game.getPlayer(targetId);
sb.append(player.getLogName()).append(" ");
sb.append(player.getLogName()).append(' ');
}
}
return sb.toString();

View file

@ -158,11 +158,11 @@ public class TargetPermanentOrSuspendedCard extends TargetImpl {
for (UUID targetId : this.getTargets()) {
Permanent permanent = game.getPermanent(targetId);
if (permanent != null) {
sb.append(permanent.getLogName()).append(" ");
sb.append(permanent.getLogName()).append(' ');
} else {
Card card = game.getExile().getCard(targetId, game);
if (card != null) {
sb.append(card.getLogName()).append(" ");
sb.append(card.getLogName()).append(' ');
}
}
}

View file

@ -245,13 +245,13 @@ public class TargetSpellOrPermanent extends TargetImpl {
for (UUID targetId : getTargets()) {
Permanent permanent = game.getPermanent(targetId);
if (permanent != null) {
sb.append(permanent.getLogName()).append(" ");
sb.append(permanent.getLogName()).append(' ');
} else {
Spell spell = game.getStack().getSpell(targetId);
if (spell.isFaceDown(game)) {
sb.append(GameLog.getNeutralColoredText("face down spell"));
} else {
sb.append(spell.getLogName()).append(" ");
sb.append(spell.getLogName()).append(' ');
}
}
}