hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More robust column remembering

Browse Source
This commit is contained in:
SiboVG 2023-09-19 22:12:20 +02:00
parent 4ab28ac276
commit d0f3f7b345
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
swing/src/net/sf/openrocket/gui/util/GUIUtil.java
View File

@ -19,6 +19,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Enumeration;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ -56,6 +57,7 @@ import javax.swing.event.ChangeListener;
import javax.swing.table.AbstractTableModel; import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableColumnModel; import javax.swing.table.DefaultTableColumnModel;
import javax.swing.table.DefaultTableModel; import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel; import javax.swing.table.TableColumnModel;
import javax.swing.table.TableModel; import javax.swing.table.TableModel;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
@ -404,23 +406,24 @@ public class GUIUtil {
public static void rememberTableColumnWidths(final JTable table, String keyName) { public static void rememberTableColumnWidths(final JTable table, String keyName) {
final String key = keyName == null ? table.getClass().getName() : keyName; final String key = keyName == null ? table.getClass().getName() : keyName;
for (int i = 0; i < table.getColumnCount(); i++) { Enumeration<TableColumn> columns = table.getColumnModel().getColumns();
final int column = i; while (columns.hasMoreElements()) {
table.getColumnModel().getColumn(i).addPropertyChangeListener(new PropertyChangeListener() { TableColumn column = columns.nextElement();
column.addPropertyChangeListener(new PropertyChangeListener() {
@Override @Override
public void propertyChange(PropertyChangeEvent evt) { public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals("width")) { if (evt.getPropertyName().equals("width")) {
log.debug("Storing width of " + table.getName() + "-" + table.getColumnName(column) + ": " + table.getColumnModel().getColumn(column).getWidth()); log.debug("Storing width of " + table.getName() + "-" + column + ": " + column.getWidth());
((SwingPreferences) Application.getPreferences()).setTableColumnWidth( ((SwingPreferences) Application.getPreferences()).setTableColumnWidth(
key, column, table.getColumnModel().getColumn(column).getWidth()); key, column.getModelIndex(), column.getWidth());
} }
} }
}); });
final Integer width = ((SwingPreferences) Application.getPreferences()).getTableColumnWidth( final Integer width = ((SwingPreferences) Application.getPreferences()).getTableColumnWidth(
key, column); key, column.getModelIndex());
if (width != null) { if (width != null) {
table.getColumnModel().getColumn(column).setPreferredWidth(width); column.setPreferredWidth(width);
} }
} }
} }