#2379 Fix player table selection refresh

src/main/java/core/gui/HOMainFrame.java

@@ -13,7 +13,6 @@
 import core.model.TranslationFacility;
 import core.model.UserParameter;
 import core.model.match.Weather;
-import core.model.player.Player;
 import core.module.IModule;
 import core.module.ModuleManager;
 import core.module.config.ModuleConfig;
@@ -69,16 +68,6 @@ public final class HOMainFrame extends JFrame implements Refreshable {
 	private final Color c_beta = new Color(162, 201, 255);
 	private final Color c_dev = new Color(235, 170, 170);
 
-	// TODO: Move this to a model backing the main window
-	public Player getSelectedPlayer() {
-		return m_selectedPlayer;
-	}
-
-	private Player m_selectedPlayer;
-
-	// ~ Constructors
-	// -------------------------------------------------------------------------------
-
 	/**
 	 * Singleton
 	 */
@@ -188,15 +177,6 @@ public static boolean isHOMainFrame_initialized() {
 		return m_HOMainFrame_initialized;
 	}
 
-	public void selectPlayer(Player player) {
-		if (m_selectedPlayer != player) {
-			m_selectedPlayer = player;
-			var lineupPanel = getLineupPanel();
-			if (lineupPanel != null) lineupPanel.setPlayer(player.getPlayerId());
-			getSpielerUebersichtPanel().setPlayer(player);
-		}
-	}
-
 	public LineupPanel getLineupPanel() {
 		Container c = getTabbedPane().getModulePanel(IModule.LINEUP);
 		if (c instanceof LineupPanel) {
@@ -674,15 +654,13 @@ private void saveUserParameter() {
 			parameter.spielerUebersichtsPanel_horizontalLeftSplitPane = sup[0];
 			parameter.spielerUebersichtsPanel_horizontalRightSplitPane = sup[1];
 			parameter.spielerUebersichtsPanel_verticalSplitPane = sup[2];
-//			getSpielerUebersichtPanel().saveColumnOrder();
 		}
 
 		// Lineup Panel
 		if (getTabbedPane().isModuleTabVisible(IModule.LINEUP)) {
 			final int[] ap = getLineupPanel().getDividerLocations();
 			parameter.lineupPanel_verticalSplitLocation = ap[0];
 			parameter.lineupPanel_horizontalSplitLocation = ap[1];
-			getLineupPanel().saveColumnOrder();
 		}
 
 		// TransferScoutPanel

src/main/java/core/gui/comp/entry/CheckBoxTableEntry.kt

@@ -0,0 +1,100 @@
+package core.gui.comp.entry
+
+import core.gui.comp.renderer.HODefaultTableCellRenderer
+import java.awt.Color
+import javax.swing.JCheckBox
+import javax.swing.JComponent
+
+open class CheckBoxTableEntry(isEnabled: Boolean, var value: Boolean, fgStandard: Color?, bgStandard: Color?) :
+    IHOTableCellEntry {
+    private val fgStandard: Color?
+    private val bgStandard: Color?
+    private val checkBox: JCheckBox = JCheckBox()
+
+    /**
+     * Create table cell entry for booleans by check box
+     * @param isEnabled boolean
+     * @param value Boolean - Checked
+     * @param fgStandard Color
+     * @param bgStandard Color
+     */
+    init {
+        this.checkBox.setSelected(value)
+        this.checkBox.setEnabled(isEnabled)
+        this.fgStandard = fgStandard
+        this.bgStandard = bgStandard
+        createComponent()
+    }
+
+    /**
+     * Set value is called from HOTableModel
+     * @param b boolean
+     */
+    open fun changeValue(b: Boolean) {
+        this.value = b
+        this.updateComponent()
+    }
+
+    /**
+     * Return the checkbox component
+     * @param selected boolean
+     * @return JComponent
+     */
+    override fun getComponent(selected: Boolean): JComponent {
+        if (selected) {
+            this.checkBox.setBackground(HODefaultTableCellRenderer.SELECTION_BG)
+            this.checkBox.setForeground(HODefaultTableCellRenderer.SELECTION_FG)
+        } else {
+            this.checkBox.setBackground(bgStandard)
+            this.checkBox.setForeground(fgStandard)
+        }
+        return this.checkBox
+    }
+
+    /**
+     * Reset the checkbox
+     */
+    override fun clear() {
+        this.value = false
+        this.checkBox.setSelected(false)
+    }
+
+    /**
+     * Compare with other cell entry.
+     * Descending order is true, false, null.
+     * @param obj the object to be compared.
+     * @return int [-1,0,1]
+     */
+    override fun compareTo(obj: IHOTableCellEntry): Int {
+        if (obj is CheckBoxTableEntry) {
+            return this.value.compareTo(obj.value)
+        }
+        // Not a checkbox
+        return -1
+    }
+
+    /**
+     * Same as compareTo
+     * @param obj IHOTableCellEntry The other entry
+     * @return int
+     */
+    override fun compareToThird(obj: IHOTableCellEntry): Int {
+        return this.compareTo(obj)
+    }
+
+    /**
+     * Update the component
+     */
+    override fun createComponent() {
+        updateComponent()
+    }
+
+    /**
+     * Update the component
+     */
+    override fun updateComponent() {
+        this.checkBox.setSelected(value)
+        this.checkBox.setBackground(bgStandard)
+        this.checkBox.setForeground(fgStandard)
+    }
+}

src/main/java/core/gui/comp/entry/IHOTableCellEntry.java

@@ -5,7 +5,7 @@
 /**
  * Classes implementing this interface create a {@link javax.swing.JComponent} that will
  * be displayed as a cell in a {@link javax.swing.JTable}: they act as factories to
- * create and initialise the UI component.
+ * create and update the UI component.
  *
  * <p>To display the component, call {@link #getComponent(boolean)}</p>.
  */
@@ -14,7 +14,7 @@ public interface IHOTableCellEntry extends Comparable<IHOTableCellEntry> {
 
     /**
      * This method returns the JComponent, which shall be shown in the Table. The component should
-     * be created be createComponent and only the background should be changed according to the
+     * be created by createComponent and only the background should be changed according to the
      * isSelected-Flag. Nevertheless, you  can ignore the createComponent and updateComponent and
      * create a new one everytime getComponent is called, but that is much slower!
      */

src/main/java/core/gui/comp/renderer/HODefaultTableCellRenderer.java

@@ -11,7 +11,6 @@
 import javax.swing.JLabel;
 import javax.swing.JTable;
 
-
 /**
  * Renderer for tables with JLabels as table objects
  */
@@ -26,12 +25,13 @@ public java.awt.Component getTableCellRendererComponent(JTable table, Object val
                                                             boolean isSelected,
                                                             boolean hasFocus,
                                                             int row,
-                                                            int column)
-    {
+                                                            int column) {
         if (value instanceof IHOTableCellEntry ihoTableCellEntry) {
             final JComponent component = ihoTableCellEntry.getComponent(isSelected);
-            if (isSelected) {
-                component.setOpaque(true);
+            if (component != null) {
+                if (isSelected) {
+                    component.setOpaque(true);
+                }
             }
             return component;
         } else if (value instanceof JComponent component) {
@@ -47,4 +47,4 @@ public java.awt.Component getTableCellRendererComponent(JTable table, Object val
             return component;
         }
     }
-}
+}

src/main/java/core/gui/comp/table/FixedColumnsTable.kt

@@ -79,12 +79,13 @@ open class FixedColumnsTable @JvmOverloads constructor(
 
         if (fixedColumnsCount > 0) {
             fixed = JTable(model)
-            fixed!!.setFocusable(false)
-            fixed!!.setSelectionModel(getSelectionModel())
+            fixed!!.setFocusable(true)
             fixed!!.getTableHeader().reorderingAllowed = false
             fixed!!.setSelectionModel(getSelectionModel())
+            fixed!!.columnModel.selectionModel = getSelectionModel()
+
             //  Remove the non-fixed columns from the fixed table
-            while (fixed!!.getColumnCount() > fixedColumnsCount) {
+            while (fixed!!.columnCount > fixedColumnsCount) {
                 val _columnModel = fixed!!.getColumnModel()
                 _columnModel.removeColumn(_columnModel.getColumn(fixedColumnsCount))
             }
@@ -173,7 +174,6 @@ open class FixedColumnsTable @JvmOverloads constructor(
         }
     }
 
-
     /**
      * Show the horizontal scroll bar of the scroll pane when the other horizontal scroll bar appeared in case of pane resizing
      * @param scrollPane The scroll pane that has to be synchronized with the other scroll pane
@@ -189,8 +189,8 @@ open class FixedColumnsTable @JvmOverloads constructor(
 
     /**
      * Hide the horizontal scroll bar of the scroll pane when the other horizontal scroll bar disappeared in case of pane resizing
-     * If the other scroll bar does not require a scroll bar, its scroll bar will be removed
-     * otherwise the disappearance in hidden scroll bar will be reset.
+     * If the other scroll bar does not require a scroll bar, its scroll bar will be removed,
+     * otherwise the disappearance in hidden scroll bar will reset.
      * @param hiddenScrollPane The scroll pane that removed the scroll bar
      * @param otherScrollPane The scroll pane that has to be adapted
      */