Enforce method reference usage for lambdas.

tsaglam · Feb 4, 2024 · 02d0236 · 02d0236
1 parent 72d6413
commit 02d0236
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/src/main/java/carcassonne/model/tile/TileDistribution.java b/src/main/java/carcassonne/model/tile/TileDistribution.java
@@ -49,7 +49,7 @@ public void setQuantity(TileType tileType, int quantity) {
      */
     public void createBackup() {
         restorationPoint.clear();
-        distribution.forEach((key, value) -> restorationPoint.put(key, value));
+        distribution.forEach(restorationPoint::put);
     }
 
     /**
@@ -58,7 +58,7 @@ public void createBackup() {
      */
     public void restoreLastBackup() {
         distribution.clear();
-        restorationPoint.forEach((key, value) -> distribution.put(key, value));
+        restorationPoint.forEach(restorationPoint::put);
     }
 
     /**

diff --git a/src/main/java/carcassonne/settings/GameSettings.java b/src/main/java/carcassonne/settings/GameSettings.java
@@ -341,7 +341,7 @@ public void toggleMeepleRule(TerrainType type) {
     private void notifyListeners() {
         PaintShop.clearCachedImages();
         for (NotifiableView notifiable : changeListeners) {
-            EventQueue.invokeLater(() -> notifiable.notifyChange());
+            EventQueue.invokeLater(notifiable::notifyChange);
         }
     }
 

diff --git a/src/main/java/carcassonne/view/ViewFacade.java b/src/main/java/carcassonne/view/ViewFacade.java
@@ -100,9 +100,7 @@ public void closeGameStatistics() {
      */
     public Tile getSelectedTile() {
         try {
-            EventQueue.invokeAndWait(() -> {
-                selectedTile = tileView.getSelectedTile();
-            });
+            EventQueue.invokeAndWait(() -> selectedTile = tileView.getSelectedTile());
         } catch (InvocationTargetException | InterruptedException exception) {
             exception.printStackTrace();
             GameMessage.showError("Cannot retrieve selected tile:\n" + exception);

diff --git a/src/main/java/carcassonne/view/tertiary/TileDistributionView.java b/src/main/java/carcassonne/view/tertiary/TileDistributionView.java
@@ -157,9 +157,7 @@ private List<JButton> createButtons() {
             }, this::updateFromDistribution);
         });
         JButton resetButton = new JButton(RESET);
-        resetButton.addMouseListener((MouseClickListener) event -> {
-            ThreadingUtil.runAndCallback(() -> distribution.reset(), this::updateFromDistribution);
-        });
+        resetButton.addMouseListener((MouseClickListener) event -> ThreadingUtil.runAndCallback(distribution::reset, this::updateFromDistribution));
         JButton acceptButton = new JButton(ACCEPT);
         acceptButton.addMouseListener((MouseClickListener) event -> {
             dispose();