From f37c823aa8698f6c655f9fd934233c4c8d3a6155 Mon Sep 17 00:00:00 2001 From: vraskulin Date: Mon, 20 Mar 2017 14:00:18 +0300 Subject: [PATCH] String + string concatenation can be replaced by string + char concetenation --- Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java | 2 +- .../mage/test/cards/single/DivergentTransformationsTest.java | 2 +- Mage/src/main/java/mage/abilities/AbilityImpl.java | 2 +- .../mage/abilities/effects/PayCostToAttackBlockEffectImpl.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java index 9eda832ecac..91324908844 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java @@ -391,7 +391,7 @@ public class ConnectDialog extends MageDialog { connection.setUsername(this.txtUserName.getText().trim()); connection.setPassword(this.txtPassword.getText().trim()); connection.setForceDBComparison(this.chkForceUpdateDB.isSelected()); - connection.setUserIdStr(System.getProperty("user.name") + ":" + MagePreferences.getUserNames()); + connection.setUserIdStr(System.getProperty("user.name") + ':' + MagePreferences.getUserNames()); MageFrame.getPreferences().put(KEY_CONNECT_FLAG, ((CountryItemEditor) cbFlag.getEditor()).getImageItem()); PreferencesDialog.setProxyInformation(connection); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/DivergentTransformationsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/DivergentTransformationsTest.java index 0376f3fc39b..772923a1b6c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/DivergentTransformationsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/DivergentTransformationsTest.java @@ -38,7 +38,7 @@ public class DivergentTransformationsTest extends CardTestPlayerBase { addCard(Zone.LIBRARY, playerA, hGiant); addCard(Zone.LIBRARY, playerB, mFlunkies); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, dTransformations, memnite + "^" + gBears); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, dTransformations, memnite + '^' + gBears); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage/src/main/java/mage/abilities/AbilityImpl.java b/Mage/src/main/java/mage/abilities/AbilityImpl.java index 7cbce9ac759..cc30fc971fe 100644 --- a/Mage/src/main/java/mage/abilities/AbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/AbilityImpl.java @@ -518,7 +518,7 @@ public abstract class AbilityImpl implements Ability { PhyrexianManaCost phyrexianManaCost = (PhyrexianManaCost)cost; PayLifeCost payLifeCost = new PayLifeCost(2); if(payLifeCost.canPay(this, sourceId, controller.getId(), game) && - controller.chooseUse(Outcome.LoseLife, "Pay 2 life instead of " + phyrexianManaCost.getBaseText() + "?", this, game)) { + controller.chooseUse(Outcome.LoseLife, "Pay 2 life instead of " + phyrexianManaCost.getBaseText() + '?', this, game)) { costIterator.remove(); costs.add(payLifeCost); } diff --git a/Mage/src/main/java/mage/abilities/effects/PayCostToAttackBlockEffectImpl.java b/Mage/src/main/java/mage/abilities/effects/PayCostToAttackBlockEffectImpl.java index 9eb3e16e82f..aec6202603f 100644 --- a/Mage/src/main/java/mage/abilities/effects/PayCostToAttackBlockEffectImpl.java +++ b/Mage/src/main/java/mage/abilities/effects/PayCostToAttackBlockEffectImpl.java @@ -171,7 +171,7 @@ public abstract class PayCostToAttackBlockEffectImpl extends ReplacementEffectIm PhyrexianManaCost phyrexianManaCost = (PhyrexianManaCost)manaCost; PayLifeCost payLifeCost = new PayLifeCost(2); if(payLifeCost.canPay(source, source.getSourceId(), player.getId(), game) && - player.chooseUse(Outcome.LoseLife, "Pay 2 life instead of " + phyrexianManaCost.getBaseText() + "?", source, game)) { + player.chooseUse(Outcome.LoseLife, "Pay 2 life instead of " + phyrexianManaCost.getBaseText() + '?', source, game)) { manaCostIterator.remove(); costs.add(payLifeCost); }