Merge pull request #6443 from IllianiCBT/infirmaryFix

Fixed Infirmary Assign/Unassign Interactions

Author: IllianiBird

Diff for: MekHQ/src/mekhq/gui/InfirmaryTab.java

@@ -27,6 +27,29 @@
  */
 package mekhq.gui;
 
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Graphics;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Image;
+import java.awt.Toolkit;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.image.ImageObserver;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.ResourceBundle;
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.SwingUtilities;
+
 import megamek.client.ui.swing.util.UIUtil;
 import megamek.common.TargetRoll;
 import megamek.common.event.Subscribe;
@@ -44,14 +67,6 @@
 import mekhq.gui.sorter.PersonTitleSorter;
 import mekhq.gui.utilities.JScrollPaneWithSpeed;
 
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.image.ImageObserver;
-import java.util.*;
-import java.util.List;
-
 /**
  * Shows injured and medical personnel
  */
@@ -93,7 +108,6 @@ public void initTab() {
             bgImage = Toolkit.getDefaultToolkit().createImage(bgImageFile);
         }
 
-        // Initialize doctors list
         doctorsModel = new DocTableModel(getCampaign());
         docTable = new JTable(doctorsModel);
         docTable.setRowHeight(UIUtil.scaleForGUI(60));
@@ -149,12 +163,6 @@ public void initTab() {
         listAssignedPatient.setVisibleRowCount(-1);
         listAssignedPatient.getSelectionModel().addListSelectionListener(ev -> updateAssignDoctorEnabled());
         listAssignedPatient.setOpaque(false);
-        JScrollPane scrollAssignedPatient = new JScrollPaneWithSpeed(listAssignedPatient);
-        scrollAssignedPatient.setMinimumSize(new Dimension(300, 360));
-        scrollAssignedPatient.setPreferredSize(new Dimension(300, 360));
-        scrollAssignedPatient.setOpaque(false);
-        scrollAssignedPatient.getViewport().setOpaque(false);
-        listAssignedPatient.setBorder(BorderFactory.createTitledBorder(resourceMap.getString("panAssignedPatient.title")));
         listAssignedPatient.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseReleased(MouseEvent e) {
@@ -172,22 +180,21 @@ public void mouseReleased(MouseEvent e) {
                 }
             }
         });
+        JScrollPane scrollAssignedPatient = new JScrollPaneWithSpeed(listAssignedPatient);
+        scrollAssignedPatient.setMinimumSize(new Dimension(300, 360));
+        scrollAssignedPatient.setPreferredSize(new Dimension(300, 360));
+        scrollAssignedPatient.setOpaque(false);
+        scrollAssignedPatient.getViewport().setOpaque(false);
+        listAssignedPatient
+              .setBorder(BorderFactory.createTitledBorder(resourceMap.getString("panAssignedPatient.title")));
 
-        // Unassigned patients
         unassignedPatientModel = new PatientTableModel(getCampaign());
         listUnassignedPatient = new JList<>(unassignedPatientModel);
         listUnassignedPatient.setCellRenderer(unassignedPatientModel.getRenderer());
         listUnassignedPatient.setLayoutOrientation(JList.HORIZONTAL_WRAP);
         listUnassignedPatient.setVisibleRowCount(-1);
         listUnassignedPatient.getSelectionModel().addListSelectionListener(ev -> updateAssignDoctorEnabled());
         listUnassignedPatient.setOpaque(false);
-        JScrollPane scrollUnassignedPatient = new JScrollPaneWithSpeed(listUnassignedPatient);
-        scrollUnassignedPatient.setMinimumSize(new Dimension(300, 200));
-        scrollUnassignedPatient.setPreferredSize(new Dimension(300, 300));
-        scrollUnassignedPatient.setOpaque(false);
-        scrollUnassignedPatient.getViewport().setOpaque(false);
-        listUnassignedPatient
-              .setBorder(BorderFactory.createTitledBorder(resourceMap.getString("panUnassignedPatient.title")));
         listUnassignedPatient.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseReleased(MouseEvent e) {
@@ -205,8 +212,14 @@ public void mouseReleased(MouseEvent e) {
                 }
             }
         });
+        JScrollPane scrollUnassignedPatient = new JScrollPaneWithSpeed(listUnassignedPatient);
+        scrollUnassignedPatient.setMinimumSize(new Dimension(300, 200));
+        scrollUnassignedPatient.setPreferredSize(new Dimension(300, 300));
+        scrollUnassignedPatient.setOpaque(false);
+        scrollUnassignedPatient.getViewport().setOpaque(false);
+        listUnassignedPatient
+                .setBorder(BorderFactory.createTitledBorder(resourceMap.getString("panUnassignedPatient.title")));
 
-        // Add assigned patient scroll pane
         gridBagConstraints = new GridBagConstraints();
         gridBagConstraints.gridx = 1;
         gridBagConstraints.gridy = 0;
@@ -217,7 +230,6 @@ public void mouseReleased(MouseEvent e) {
         gridBagConstraints.weighty = 0.0;
         add(scrollAssignedPatient, gridBagConstraints);
 
-        // Add unassigned patient scroll pane
         gridBagConstraints = new GridBagConstraints();
         gridBagConstraints.gridx = 1;
         gridBagConstraints.gridy = 2;
@@ -227,30 +239,8 @@ public void mouseReleased(MouseEvent e) {
         gridBagConstraints.weightx = 1.0;
         gridBagConstraints.weighty = 1.0;
         add(scrollUnassignedPatient, gridBagConstraints);
-
-        // Buttons for assigning and unassigning
-        btnAssignDoc = new JButton(resourceMap.getString("btnAssignDoc.text"));
-        btnAssignDoc.setToolTipText(resourceMap.getString("btnAssignDoc.toolTipText"));
-        btnAssignDoc.setEnabled(false);
-        btnAssignDoc.addActionListener(ev -> assignDoctor());
-        gridBagConstraints = new GridBagConstraints();
-        gridBagConstraints.gridx = 1;
-        gridBagConstraints.gridy = 1;
-        gridBagConstraints.anchor = GridBagConstraints.WEST;
-        add(btnAssignDoc, gridBagConstraints);
-
-        btnUnassignDoc = new JButton(resourceMap.getString("btnUnassignDoc.text"));
-        btnUnassignDoc.setEnabled(false);
-        btnUnassignDoc.addActionListener(ev -> unassignDoctor());
-        gridBagConstraints = new GridBagConstraints();
-        gridBagConstraints.gridx = 2;
-        gridBagConstraints.gridy = 1;
-        gridBagConstraints.anchor = GridBagConstraints.WEST;
-        add(btnUnassignDoc, gridBagConstraints);
     }
 
-
-
     /*
      * (non-Javadoc)
      *