From 2fb7ad0c7bfd58a401b55bfa11267cf67adabf85 Mon Sep 17 00:00:00 2001 From: Jetz Date: Sat, 10 Aug 2024 12:58:32 -0400 Subject: [PATCH] Cleanup - Statement lambda -> expression lambda --- .../screens/home/quest/DialogChooseSets.java | 46 +++++++++---------- .../home/settings/CSubmenuPreferences.java | 4 +- .../src/forge/adventure/scene/ArenaScene.java | 12 ++--- .../src/forge/adventure/scene/EventScene.java | 10 ++-- 4 files changed, 32 insertions(+), 40 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseSets.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseSets.java index 0d6de0deacb..1bd34fdf521 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseSets.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseSets.java @@ -183,30 +183,28 @@ public class DialogChooseSets { spinnersEditionTypeMap.put(editionType, spinner); } // == SPINNERS ACTION PERFORMED == - editionTypeSpinners.forEach(spinner -> { - spinner.addChangeListener(e -> { - // As soon as the value of a spinner becomes different from zero, - // enabled the random selection button. - int spinValue = (int) spinner.getValue(); - if (spinValue > 0) { - if (!randomSelectionButton.isEnabled()) - randomSelectionButton.setEnabled(true); - } else { - // Similarly, when all spinners are set to zero, - // disable the random selection button - boolean allZeros = true; - for (FSpinner spin : editionTypeSpinners) { - int value = (int) spin.getValue(); - if (value != 0) { - allZeros = false; - break; - } - } - if (allZeros) - randomSelectionButton.setEnabled(false); - } - }); - }); + editionTypeSpinners.forEach(spinner -> spinner.addChangeListener(e -> { + // As soon as the value of a spinner becomes different from zero, + // enabled the random selection button. + int spinValue = (int) spinner.getValue(); + if (spinValue > 0) { + if (!randomSelectionButton.isEnabled()) + randomSelectionButton.setEnabled(true); + } else { + // Similarly, when all spinners are set to zero, + // disable the random selection button + boolean allZeros = true; + for (FSpinner spin : editionTypeSpinners) { + int value = (int) spin.getValue(); + if (value != 0) { + allZeros = false; + break; + } + } + if (allZeros) + randomSelectionButton.setEnabled(false); + } + })); // == ADD SPINNERS AND LABELS TO THE PANEL == JPanel typeFieldsPanel = null; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java index 6d3f328dbdc..1efcd550dbc 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java @@ -412,9 +412,7 @@ public enum CSubmenuPreferences implements ICDoc { final FComboBox comboBox = createComboBox(new String[] {"Off", "AI", "Human For AI"}, userSetting); final String selectedItem = this.prefs.getPref(userSetting); panel.setComboBox(comboBox, selectedItem); - comboBox.addActionListener(actionEvent -> { - AiProfileUtil.setAiSideboardingMode(AiProfileUtil.AISideboardingMode.normalizedValueOf(comboBox.getSelectedItem())); - }); + comboBox.addActionListener(actionEvent -> AiProfileUtil.setAiSideboardingMode(AiProfileUtil.AISideboardingMode.normalizedValueOf(comboBox.getSelectedItem()))); } private void initializeSoundSetsComboBox() { diff --git a/forge-gui-mobile/src/forge/adventure/scene/ArenaScene.java b/forge-gui-mobile/src/forge/adventure/scene/ArenaScene.java index 6949d4052a2..ba43cc72113 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/ArenaScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/ArenaScene.java @@ -246,13 +246,11 @@ public class ArenaScene extends UIScene implements IAfterMatch { started = true; DuelScene duelScene = DuelScene.instance(); EnemySprite enemy = enemies.get(enemies.size - 1); - FThreads.invokeInEdtNowOrLater(() -> { - Forge.setTransitionScreen(new TransitionScreen(() -> { - started = false; - duelScene.initDuels(WorldStage.getInstance().getPlayerSprite(), enemy, true, null); - Forge.switchScene(duelScene); - }, Forge.takeScreenshot(), true, false, false, false, "", Current.player().avatar(), enemy.getAtlasPath(), Current.player().getName(), enemy.getName())); - }); + FThreads.invokeInEdtNowOrLater(() -> Forge.setTransitionScreen(new TransitionScreen(() -> { + started = false; + duelScene.initDuels(WorldStage.getInstance().getPlayerSprite(), enemy, true, null); + Forge.switchScene(duelScene); + }, Forge.takeScreenshot(), true, false, false, false, "", Current.player().avatar(), enemy.getAtlasPath(), Current.player().getName(), enemy.getName()))); } public boolean start() { diff --git a/forge-gui-mobile/src/forge/adventure/scene/EventScene.java b/forge-gui-mobile/src/forge/adventure/scene/EventScene.java index f92ae256ee6..b0afb0269ce 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/EventScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/EventScene.java @@ -547,12 +547,10 @@ public class EventScene extends MenuScene implements IAfterMatch { DuelScene duelScene = DuelScene.instance(); EnemySprite enemy = humanMatch.p2.getSprite(); currentEvent.nextOpponent = humanMatch.p2; - FThreads.invokeInEdtNowOrLater(() -> { - Forge.setTransitionScreen(new TransitionScreen(() -> { - duelScene.initDuels(WorldStage.getInstance().getPlayerSprite(), enemy, false, currentEvent); - Forge.switchScene(duelScene); - }, Forge.takeScreenshot(), true, false, false, false, "", Current.player().avatar(), enemy.getAtlasPath(), Current.player().getName(), enemy.getName(), humanMatch.p1.getRecord(), humanMatch.p2.getRecord())); - }); + FThreads.invokeInEdtNowOrLater(() -> Forge.setTransitionScreen(new TransitionScreen(() -> { + duelScene.initDuels(WorldStage.getInstance().getPlayerSprite(), enemy, false, currentEvent); + Forge.switchScene(duelScene); + }, Forge.takeScreenshot(), true, false, false, false, "", Current.player().avatar(), enemy.getAtlasPath(), Current.player().getName(), enemy.getName(), humanMatch.p1.getRecord(), humanMatch.p2.getRecord()))); } else {