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

All 1-character strings converted to primitives

Browse source 
"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
Download patch file Download diff file Expand all files Collapse all files

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

@ -781,19 +781,19 @@ public abstract class GameImpl implements Game, Serializable {
}
if (gameOver(null) && !isSimulation()) {
winnerId = findWinnersAndLosers();
StringBuilder sb = new StringBuilder("GAME END gameId: ").append(this.getId()).append(" ");
StringBuilder sb = new StringBuilder("GAME END gameId: ").append(this.getId()).append(' ');
int count = 0;
for (Player player : this.getState().getPlayers().values()) {
if (count > 0) {
sb.append(" - ");
}
sb.append("[").append(player.getName()).append(" => ");
sb.append('[').append(player.getName()).append(" => ");
sb.append(player.hasWon() ? "W" : "");
sb.append(player.hasLost() ? "L" : "");
sb.append(player.hasQuit() ? "Q" : "");
sb.append(player.hasIdleTimeout() ? "I" : "");
sb.append(player.hasTimerTimeout() ? "T" : "");
sb.append("]");
sb.append(']');
count++;
}
logger.info(sb.toString());

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

@ -94,7 +94,7 @@ public abstract class GameTinyLeadersImpl extends GameImpl {
getState().getWatchers().add(watcher);
watcher.addCardInfoToCommander(this);
} else {
throw new UnknownError("Commander card could not be created. Name: [" + player.getMatchPlayer().getDeck().getName() + "]");
throw new UnknownError("Commander card could not be created. Name: [" + player.getMatchPlayer().getDeck().getName() + ']');
}
}

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

@ -399,7 +399,7 @@ public class Combat implements Serializable, Copyable<Combat> {
if (!effect.canAttackCheckAfter(numberAttackers, ability, game)) {
MageObject sourceObject = ability.getSourceObject(game);
if (attackingPlayer.isHuman()) {
game.informPlayer(attackingPlayer, attackingCreature.getIdName() + " can't attack this way (" + (sourceObject == null ? "null" : sourceObject.getIdName()) + ")");
game.informPlayer(attackingPlayer, attackingCreature.getIdName() + " can't attack this way (" + (sourceObject == null ? "null" : sourceObject.getIdName()) + ')');
return false;
} else {
// remove attacking creatures for AI that are not allowed to attack
@ -504,7 +504,7 @@ public class Combat implements Serializable, Copyable<Combat> {
if (attackingCreature != null) {
sb.append("Attacker: ");
sb.append(attackingCreature.getLogName()).append(" (");
sb.append(attackingCreature.getPower().getValue()).append("/").append(attackingCreature.getToughness().getValue()).append(") ");
sb.append(attackingCreature.getPower().getValue()).append('/').append(attackingCreature.getToughness().getValue()).append(") ");
} else {
// creature left battlefield
attackingCreature = (Permanent) game.getLastKnownInformation(attackingCreatureId, Zone.BATTLEFIELD);
@ -520,7 +520,7 @@ public class Combat implements Serializable, Copyable<Combat> {
Permanent blockingCreature = game.getPermanent(blockingCreatureId);
if (blockingCreature != null) {
sb.append(blockingCreature.getLogName()).append(" (");
sb.append(blockingCreature.getPower().getValue()).append("/").append(blockingCreature.getToughness().getValue()).append(") ");
sb.append(blockingCreature.getPower().getValue()).append('/').append(blockingCreature.getToughness().getValue()).append(") ");
}
}
@ -782,7 +782,7 @@ public class Combat implements Serializable, Copyable<Combat> {
possibleBlockerId, toBeBlockedCreatureId, mustBeBlockedByAtLeastOne, game);
if (blockRequiredMessage != null) { // message means not required
removeBlocker(possibleBlockerId, game);
game.informPlayer(controller, blockRequiredMessage + " Existing block removed. It's a requirement to block " + toBeBlockedCreature.getIdName() + ".");
game.informPlayer(controller, blockRequiredMessage + " Existing block removed. It's a requirement to block " + toBeBlockedCreature.getIdName() + '.');
return false;
}
}
@ -894,7 +894,7 @@ public class Combat implements Serializable, Copyable<Combat> {
}
if (!blockIsValid) {
sb.append(" ").append(creatureForcedToBlock.getIdName());
sb.append(' ').append(creatureForcedToBlock.getIdName());
}
}
if (sb.length() > 0) {

2
Mage/src/main/java/mage/game/command/Commander.java
View file

@ -96,7 +96,7 @@ public class Commander implements CommandObject {
@Override
public String getIdName() {
return sourceObject.getName() + " [" + sourceObject.getId().toString().substring(0, 3) + "]";
return sourceObject.getName() + " [" + sourceObject.getId().toString().substring(0, 3) + ']';
}
@Override

2
Mage/src/main/java/mage/game/command/Emblem.java
View file

@ -129,7 +129,7 @@ public class Emblem implements CommandObject {
@Override
public String getIdName() {
return getName() + " [" + getId().toString().substring(0, 3) + "]";
return getName() + " [" + getId().toString().substring(0, 3) + ']';
}
@Override

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

@ -119,11 +119,11 @@ public abstract class DraftCube {
booster.add(cardInfo.getCard());
done = true;
} else {
logger.warn(new StringBuilder(this.getName()).append(" - Card not found: ").append(cardId.getName()).append(":").append(cardId.extension));
logger.warn(new StringBuilder(this.getName()).append(" - Card not found: ").append(cardId.getName()).append(':').append(cardId.extension));
notValid++;
}
} else {
logger.error(new StringBuilder(this.getName()).append(" - Empty card name: ").append(cardId.getName()).append(":").append(cardId.extension));
logger.error(new StringBuilder(this.getName()).append(" - Empty card name: ").append(cardId.getName()).append(':').append(cardId.extension));
notValid++;
}

4
Mage/src/main/java/mage/game/match/MatchImpl.java
View file

@ -290,13 +290,13 @@ public abstract class MatchImpl implements Match {
String duelingTime = "";
if (game.hasEnded()) {
if (game.getEndTime() != null) {
duelingTime = " (" + DateFormat.getDuration((game.getEndTime().getTime() - game.getStartTime().getTime()) / 1000) + ")";
duelingTime = " (" + DateFormat.getDuration((game.getEndTime().getTime() - game.getStartTime().getTime()) / 1000) + ')';
}
state = "Finished" + duelingTime;
result = game.getWinner();
} else {
if (game.getStartTime() != null) {
duelingTime = " (" + DateFormat.getDuration((new Date().getTime() - game.getStartTime().getTime()) / 1000) + ")";
duelingTime = " (" + DateFormat.getDuration((new Date().getTime() - game.getStartTime().getTime()) / 1000) + ')';
}
state = "Dueling" + duelingTime;
result = "";

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

@ -189,7 +189,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
@Override
public String toString() {
StringBuilder sb = threadLocalBuilder.get();
sb.append(this.name).append("-").append(this.expansionSetCode);
sb.append(this.name).append('-').append(this.expansionSetCode);
if (copy) {
sb.append(" [Copy]");
}

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

@ -130,7 +130,7 @@ public class Token extends MageObjectImpl {
String subtype = this.subtype.toString().replaceAll("[^a-zA-Z0-9]", "");
String cardType = this.cardType.toString().replaceAll("[^a-zA-Z0-9]", "");
String originalset = this.getOriginalExpansionSetCode();
String descriptor = name + "." + color + "." + subtype + "." + cardType + "." + this.power + "." + this.toughness;
String descriptor = name + '.' + color + '.' + subtype + '.' + cardType + '.' + this.power + '.' + this.toughness;
descriptor = descriptor.toUpperCase();
return descriptor;
}

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

@ -41,7 +41,7 @@ public class ZombieToken2 extends Token {
}
public ZombieToken2(int zPower, int zToughness) {
super("Zombie", String.valueOf(zPower) + "/" + String.valueOf(zToughness) + " black Zombie creature token");
super("Zombie", String.valueOf(zPower) + '/' + String.valueOf(zToughness) + " black Zombie creature token");
cardType.add(CardType.CREATURE);
color.setBlack(true);
subtype.add("Zombie");

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

@ -427,7 +427,7 @@ public class Spell extends StackObjImpl implements Card {
} else {
idName = getId().toString().substring(0, 3);
}
return getName() + " [" + idName + "]";
return getName() + " [" + idName + ']';
}
@Override

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

@ -87,7 +87,7 @@ public class StackAbility extends StackObjImpl implements Ability {
public StackAbility(Ability ability, UUID controllerId) {
this.ability = ability;
this.controllerId = controllerId;
this.name = "stack ability (" + ability.getRule() + ")";
this.name = "stack ability (" + ability.getRule() + ')';
}
public StackAbility(final StackAbility stackAbility) {
@ -142,7 +142,7 @@ public class StackAbility extends StackObjImpl implements Ability {
@Override
public String getIdName() {
return getName() + " [" + getId().toString().substring(0, 3) + "]";
return getName() + " [" + getId().toString().substring(0, 3) + ']';
}
@Override

6
Mage/src/main/java/mage/game/stack/StackObjImpl.java
View file

@ -165,7 +165,7 @@ public abstract class StackObjImpl implements StackObject {
// change the target?
Outcome outcome = mode.getEffects().isEmpty() ? Outcome.Detriment : mode.getEffects().get(0).getOutcome();
if (targetNames != null
&& (forceChange || targetController.chooseUse(outcome, "Change this target: " + targetNames + "?", ability, game))) {
&& (forceChange || targetController.chooseUse(outcome, "Change this target: " + targetNames + '?', ability, game))) {
Set<UUID> possibleTargets = target.possibleTargets(this.getSourceId(), getControllerId(), game);
// choose exactly one other target - already targeted objects are not counted
if (forceChange && possibleTargets != null && possibleTargets.size() > 1) { // controller of spell must be used (e.g. TargetOpponent)
@ -182,7 +182,7 @@ public abstract class StackObjImpl implements StackObject {
if (newTarget.getFirstTarget() != null && filterNewTarget != null) {
Permanent newTargetPermanent = game.getPermanent(newTarget.getFirstTarget());
if (newTargetPermanent == null || !filterNewTarget.match(newTargetPermanent, game)) {
game.informPlayer(targetController, "Target does not fullfil the target requirements (" + filterNewTarget.getMessage() + ")");
game.informPlayer(targetController, "Target does not fullfil the target requirements (" + filterNewTarget.getMessage() + ')');
newTarget.clearChosen();
}
}
@ -235,7 +235,7 @@ public abstract class StackObjImpl implements StackObject {
} else if (newTarget.getFirstTarget() != null && filterNewTarget != null) {
Permanent newTargetPermanent = game.getPermanent(newTarget.getFirstTarget());
if (newTargetPermanent == null || !filterNewTarget.match(newTargetPermanent, game)) {
game.informPlayer(targetController, "This target does not fullfil the target requirements (" + filterNewTarget.getMessage() + ")");
game.informPlayer(targetController, "This target does not fullfil the target requirements (" + filterNewTarget.getMessage() + ')');
again = true;
}
} else {

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

@ -329,7 +329,7 @@ public abstract class TournamentImpl implements Tournament {
}
}
for (TournamentPlayer tp : round.getPlayerByes()) {
tp.setResults(new StringBuilder(tp.getResults()).append("R").append(round.getRoundNumber()).append(" ").append("Bye ").toString());
tp.setResults(new StringBuilder(tp.getResults()).append('R').append(round.getRoundNumber()).append(' ').append("Bye ").toString());
tp.setPoints(tp.getPoints() + 3);
}
}
@ -337,7 +337,7 @@ public abstract class TournamentImpl implements Tournament {
private static String addRoundResult(int round, TournamentPairing pair, TournamentPlayer tournamentPlayer, TournamentPlayer opponentPlayer) {
StringBuilder playerResult = new StringBuilder(tournamentPlayer.getResults());
playerResult.append("R").append(round).append(" ");
playerResult.append('R').append(round).append(' ');
playerResult.append(getMatchResultString(tournamentPlayer, opponentPlayer, pair.getMatch()));
return playerResult.toString();
}
@ -352,9 +352,9 @@ public abstract class TournamentImpl implements Tournament {
matchResult.append(mp1.getPlayer().hasIdleTimeout() ? "I" : (mp1.getPlayer().hasTimerTimeout() ? "T" : "Q"));
}
if (match.getDraws() > 0) {
matchResult.append("-").append(match.getDraws());
matchResult.append('-').append(match.getDraws());
}
matchResult.append("-").append(mp2.getWins());
matchResult.append('-').append(mp2.getWins());
if (mp2.hasQuit()) {
matchResult.append(mp2.getPlayer().hasIdleTimeout() ? "I" : (mp2.getPlayer().hasTimerTimeout() ? "T" : "Q"));
}

14
Mage/src/main/java/mage/game/turn/Turn.java
View file

@ -328,17 +328,17 @@ public class Turn implements Serializable {
public String getValue(int turnNum) {
StringBuilder sb = threadLocalBuilder.get();
sb.append("[").append(turnNum)
.append(":").append(currentPhase.getType())
.append(":").append(currentPhase.getStep().getType())
.append("]");
sb.append('[').append(turnNum)
.append(':').append(currentPhase.getType())
.append(':').append(currentPhase.getStep().getType())
.append(']');
return sb.toString();
}
private void logStartOfTurn(Game game, Player player) {
StringBuilder sb = new StringBuilder(game.getState().isExtraTurn() ? "Extra turn" : "Turn ");
sb.append(game.getState().getTurnNum()).append(" ");
sb.append(game.getState().getTurnNum()).append(' ');
sb.append(player.getLogName());
sb.append(" (");
int delimiter = game.getPlayers().size() - 1;
@ -346,14 +346,14 @@ public class Turn implements Serializable {
sb.append(gamePlayer.getLife());
int poison = gamePlayer.getCounters().getCount(CounterType.POISON);
if (poison > 0) {
sb.append("[P:").append(poison).append("]");
sb.append("[P:").append(poison).append(']');
}
if (delimiter > 0) {
sb.append(" - ");
delimiter--;
}
}
sb.append(")");
sb.append(')');
game.fireStatusEvent(sb.toString(), true);
}
}