Some more clean up of action panels buttons UI. (#10437)

* Some more clean up of action panels buttons UI.

My previous refactoring in #10435 introduces a few layout issues I noticed in testing. This change fixes that and consolidates some similar code into a helper method.

Author: asvitkine

game-app/game-core/src/main/java/games/strategy/triplea/ui/ActionPanel.java

@@ -58,6 +58,15 @@ public static JLabel createIndentedLabel() {
     return new JLabelBuilder().border(BorderFactory.createEmptyBorder(0, 5, 0, 0)).build();
   }
 
+  protected static JPanel createButtonsPanel(JButton... buttons) {
+    JPanel buttonsPanel = new JPanel();
+    buttonsPanel.setLayout(new BoxLayout(buttonsPanel, BoxLayout.X_AXIS));
+    for (JButton button : buttons) {
+      buttonsPanel.add(button);
+    }
+    return buttonsPanel;
+  }
+
   /**
    * Wait for another thread to call release. If the thread is interrupted, we will return silently.
    *

game-app/game-core/src/main/java/games/strategy/triplea/ui/PoliticsPanel.java

@@ -176,18 +176,14 @@ public void display(final GamePlayer gamePlayer) {
         () -> {
           removeAll();
           actionLabel.setText(gamePlayer.getName() + " Politics");
-          add(actionLabel);
           add(SwingComponents.leftBox(actionLabel));
 
           selectPoliticalActionButton = new JButton(selectPoliticalActionAction);
           selectPoliticalActionButton.setEnabled(false);
           doneButton = createDoneButton();
           doneButton.setEnabled(false);
 
-          final JPanel buttonsPanel = new JPanel();
-          buttonsPanel.add(selectPoliticalActionButton);
-          buttonsPanel.add(doneButton);
-          add(buttonsPanel);
+          add(createButtonsPanel(selectPoliticalActionButton, doneButton));
 
           SwingUtilities.invokeLater(() -> doneButton.requestFocusInWindow());
         });

game-app/game-core/src/main/java/games/strategy/triplea/ui/PurchasePanel.java

@@ -23,7 +23,6 @@
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
-import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 import org.triplea.java.collections.CollectionUtils;
 import org.triplea.java.collections.IntegerMap;
@@ -92,34 +91,30 @@ public void display(final GamePlayer gamePlayer) {
         () -> {
           removeAll();
           actionLabel.setText(gamePlayer.getName() + " production");
-          add(actionLabel);
           add(SwingComponents.leftBox(actionLabel));
 
           buyButton.setText(BUY);
-          final JPanel buttonsPanel = new JPanel();
-          buttonsPanel.add(buyButton);
-          buttonsPanel.add(createDoneButton());
-          add(buttonsPanel);
+          add(createButtonsPanel(buyButton, createDoneButton()));
 
           add(Box.createVerticalStrut(9));
 
           purchasedLabel.setText("");
-          add(purchasedLabel);
+          add(SwingComponents.leftBox(purchasedLabel));
 
           add(Box.createVerticalStrut(4));
 
           purchasedUnits.setUnitsFromProductionRuleMap(new IntegerMap<>(), gamePlayer);
-          add(purchasedUnits);
+          add(SwingComponents.leftBox(purchasedUnits));
 
           getData().acquireReadLock();
           try {
             purchasedPreviousRoundsUnits.setUnitsFromCategories(
                 UnitSeparator.categorize(gamePlayer.getUnits()));
             add(Box.createVerticalStrut(4));
             if (!gamePlayer.getUnitCollection().isEmpty()) {
-              add(purchasedPreviousRoundsLabel);
+              add(SwingComponents.leftBox(purchasedPreviousRoundsLabel));
             }
-            add(purchasedPreviousRoundsUnits);
+            add(SwingComponents.leftBox(purchasedPreviousRoundsUnits));
           } finally {
             getData().releaseReadLock();
           }

game-app/game-core/src/main/java/games/strategy/triplea/ui/RepairPanel.java

@@ -16,7 +16,6 @@
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
-import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 import org.triplea.java.collections.IntegerMap;
 import org.triplea.swing.SwingComponents;
@@ -75,14 +74,10 @@ public void display(final GamePlayer gamePlayer) {
         () -> {
           removeAll();
           actionLabel.setText(gamePlayer.getName() + " repair");
-          add(actionLabel);
           add(SwingComponents.leftBox(actionLabel));
 
           buyButton.setText(BUY);
-          final JPanel buttonsPanel = new JPanel();
-          buttonsPanel.add(buyButton);
-          buttonsPanel.add(createDoneButton());
-          add(buttonsPanel);
+          add(createButtonsPanel(buyButton, createDoneButton()));
 
           repairedSoFar.setText("");
           add(Box.createVerticalStrut(9));

game-app/game-core/src/main/java/games/strategy/triplea/ui/TechPanel.java

@@ -224,18 +224,13 @@ public void display(final GamePlayer gamePlayer) {
         () -> {
           removeAll();
           actionLabel.setText(gamePlayer.getName() + " Tech Roll");
-          add(actionLabel);
           add(SwingComponents.leftBox(actionLabel));
 
-          final JPanel buttonsPanel = new JPanel();
           if (Properties.getWW2V3TechModel(getData().getProperties())) {
-            buttonsPanel.add(new JButton(getTechTokenAction));
-            buttonsPanel.add(new JButton(justRollTech));
+            add(createButtonsPanel(new JButton(getTechTokenAction), new JButton(justRollTech)));
           } else {
-            buttonsPanel.add(new JButton(getTechRollsAction));
-            buttonsPanel.add(createDoneButton());
+            add(createButtonsPanel(new JButton(getTechRollsAction), createDoneButton()));
           }
-          add(buttonsPanel);
         });
   }
 

game-app/game-core/src/main/java/games/strategy/triplea/ui/UserActionPanel.java

@@ -121,18 +121,14 @@ public void display(final GamePlayer gamePlayer) {
         () -> {
           removeAll();
           actionLabel.setText(gamePlayer.getName() + " Actions and Operations");
-          add(actionLabel);
           add(SwingComponents.leftBox(actionLabel));
 
           selectUserActionButton = new JButton(selectUserActionAction);
           selectUserActionButton.setEnabled(false);
           doneButton = createDoneButton();
           doneButton.setEnabled(false);
 
-          final JPanel buttonsPanel = new JPanel();
-          buttonsPanel.add(selectUserActionButton);
-          buttonsPanel.add(doneButton);
-          add(buttonsPanel);
+          add(createButtonsPanel(selectUserActionButton, doneButton));
 
           SwingUtilities.invokeLater(() -> doneButton.requestFocusInWindow());
         });