From f37c823aa8698f6c655f9fd934233c4c8d3a6155 Mon Sep 17 00:00:00 2001 From: vraskulin Date: Mon, 20 Mar 2017 14:00:18 +0300 Subject: [PATCH 1/2] 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); } From c783614cba6f72a944c75c5b71d988722b3c334f Mon Sep 17 00:00:00 2001 From: vraskulin Date: Mon, 20 Mar 2017 15:17:30 +0300 Subject: [PATCH 2/2] NotifyAll --- .../client/unusedFiles/DelayedViewerThread.java | 2 +- .../java/mage/client/game/StartMultiGamesTest.java | 2 +- .../src/mage/player/human/HumanPlayer.java | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/unusedFiles/DelayedViewerThread.java b/Mage.Client/src/main/java/mage/client/unusedFiles/DelayedViewerThread.java index 851bffeabe2..89976b2669f 100644 --- a/Mage.Client/src/main/java/mage/client/unusedFiles/DelayedViewerThread.java +++ b/Mage.Client/src/main/java/mage/client/unusedFiles/DelayedViewerThread.java @@ -24,7 +24,7 @@ public class DelayedViewerThread extends Thread { public synchronized void show(Component component, long delay) { delayedViewers.put(component, System.currentTimeMillis() + delay); - notify(); + notifyAll(); } public synchronized void hide(Component component) { diff --git a/Mage.Client/src/test/java/mage/client/game/StartMultiGamesTest.java b/Mage.Client/src/test/java/mage/client/game/StartMultiGamesTest.java index 10e2d072f90..f5dea6e8c51 100644 --- a/Mage.Client/src/test/java/mage/client/game/StartMultiGamesTest.java +++ b/Mage.Client/src/test/java/mage/client/game/StartMultiGamesTest.java @@ -48,7 +48,7 @@ public class StartMultiGamesTest { synchronized (sync) { frame = new MageFrame(); frame.setVisible(true); - sync.notify(); + sync.notifyAll(); } }); synchronized (sync) { diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java index 6fe57b2d0a0..3c11dbc5879 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java @@ -1407,7 +1407,7 @@ public class HumanPlayer extends PlayerImpl { public void setResponseString(String responseString) { synchronized (response) { response.setString(responseString); - response.notify(); + response.notifyAll(); logger.debug("Got response string from player: " + getId()); } } @@ -1417,7 +1417,7 @@ public class HumanPlayer extends PlayerImpl { synchronized (response) { response.setManaType(manaType); response.setResponseManaTypePlayerId(manaTypePlayerId); - response.notify(); + response.notifyAll(); logger.debug("Got response mana type from player: " + getId()); } } @@ -1426,7 +1426,7 @@ public class HumanPlayer extends PlayerImpl { public void setResponseUUID(UUID responseUUID) { synchronized (response) { response.setUUID(responseUUID); - response.notify(); + response.notifyAll(); logger.debug("Got response UUID from player: " + getId()); } } @@ -1435,7 +1435,7 @@ public class HumanPlayer extends PlayerImpl { public void setResponseBoolean(Boolean responseBoolean) { synchronized (response) { response.setBoolean(responseBoolean); - response.notify(); + response.notifyAll(); logger.debug("Got response boolean from player: " + getId()); } } @@ -1444,7 +1444,7 @@ public class HumanPlayer extends PlayerImpl { public void setResponseInteger(Integer responseInteger) { synchronized (response) { response.setInteger(responseInteger); - response.notify(); + response.notifyAll(); logger.debug("Got response integer from player: " + getId()); } } @@ -1453,7 +1453,7 @@ public class HumanPlayer extends PlayerImpl { public void abort() { abort = true; synchronized (response) { - response.notify(); + response.notifyAll(); logger.debug("Got cancel action from player: " + getId()); } } @@ -1462,7 +1462,7 @@ public class HumanPlayer extends PlayerImpl { public void skip() { synchronized (response) { response.setInteger(0); - response.notify(); + response.notifyAll(); logger.debug("Got skip action from player: " + getId()); } }