This commit is contained in:
SiboVG 2023-09-19 01:31:02 +02:00
parent 27b0498a3b
commit c7e9f46b39

View File

@ -56,6 +56,7 @@ public class ComponentPresetTable extends JTable {
tableModel = new AbstractTableModel() { tableModel = new AbstractTableModel() {
final ComponentPresetTableColumn[] myColumns = columns; final ComponentPresetTableColumn[] myColumns = columns;
@Override @Override
public int getRowCount() { public int getRowCount() {
return ComponentPresetTable.this.presets.size(); return ComponentPresetTable.this.presets.size();
@ -173,6 +174,7 @@ public class ComponentPresetTable extends JTable {
doPopup(e); doPopup(e);
} }
} }
@Override @Override
public void mouseReleased(MouseEvent e) { public void mouseReleased(MouseEvent e) {
if (e.isPopupTrigger()) { if (e.isPopupTrigger()) {
@ -237,11 +239,13 @@ public class ComponentPresetTable extends JTable {
private class SortAscColumnMenuItem extends JCheckBoxMenuItem implements ItemListener { private class SortAscColumnMenuItem extends JCheckBoxMenuItem implements ItemListener {
private int columnClicked; private int columnClicked;
SortAscColumnMenuItem(int columnClicked) { SortAscColumnMenuItem(int columnClicked) {
super(trans.get("ComponentPresetChooserDialog.menu.sortAsc")); super(trans.get("ComponentPresetChooserDialog.menu.sortAsc"));
this.addItemListener(this); this.addItemListener(this);
this.columnClicked = columnClicked; this.columnClicked = columnClicked;
} }
@Override @Override
public void itemStateChanged(ItemEvent e) { public void itemStateChanged(ItemEvent e) {
sorter.setSortKeys(Collections.singletonList(new SortKey(columnClicked, SortOrder.ASCENDING))); sorter.setSortKeys(Collections.singletonList(new SortKey(columnClicked, SortOrder.ASCENDING)));
@ -250,11 +254,13 @@ public class ComponentPresetTable extends JTable {
private class SortDescColumnMenuItem extends JCheckBoxMenuItem implements ItemListener { private class SortDescColumnMenuItem extends JCheckBoxMenuItem implements ItemListener {
private int columnClicked; private int columnClicked;
SortDescColumnMenuItem(int columnClicked) { SortDescColumnMenuItem(int columnClicked) {
super(trans.get("ComponentPresetChooserDialog.menu.sortDesc")); super(trans.get("ComponentPresetChooserDialog.menu.sortDesc"));
this.addItemListener(this); this.addItemListener(this);
this.columnClicked = columnClicked; this.columnClicked = columnClicked;
} }
@Override @Override
public void itemStateChanged(ItemEvent e) { public void itemStateChanged(ItemEvent e) {
sorter.setSortKeys(Collections.singletonList(new SortKey(columnClicked, SortOrder.DESCENDING))); sorter.setSortKeys(Collections.singletonList(new SortKey(columnClicked, SortOrder.DESCENDING)));
@ -263,11 +269,13 @@ public class ComponentPresetTable extends JTable {
private class ToggleColumnMenuItem extends JCheckBoxMenuItem implements ItemListener { private class ToggleColumnMenuItem extends JCheckBoxMenuItem implements ItemListener {
TableColumn col; TableColumn col;
ToggleColumnMenuItem(TableColumn col) { ToggleColumnMenuItem(TableColumn col) {
super(String.valueOf(col.getHeaderValue()), tableColumnModel.isColumnVisible(col)); super(String.valueOf(col.getHeaderValue()), tableColumnModel.isColumnVisible(col));
this.addItemListener(this); this.addItemListener(this);
this.col = col; this.col = col;
} }
@Override @Override
public void itemStateChanged(ItemEvent e) { public void itemStateChanged(ItemEvent e) {
tableColumnModel.setColumnVisible(col, !tableColumnModel.isColumnVisible(col)); tableColumnModel.setColumnVisible(col, !tableColumnModel.isColumnVisible(col));
@ -276,6 +284,7 @@ public class ComponentPresetTable extends JTable {
private class UnitSelectorMenuItem extends JMenu implements ItemListener { private class UnitSelectorMenuItem extends JMenu implements ItemListener {
ComponentPresetTableColumn.DoubleWithUnit col; ComponentPresetTableColumn.DoubleWithUnit col;
UnitSelectorMenuItem(ComponentPresetTableColumn.DoubleWithUnit col) { UnitSelectorMenuItem(ComponentPresetTableColumn.DoubleWithUnit col) {
super(trans.get("ComponentPresetChooserDialog.menu.units")); super(trans.get("ComponentPresetChooserDialog.menu.units"));
this.col = col; this.col = col;
@ -291,13 +300,13 @@ public class ComponentPresetTable extends JTable {
} }
} }
@Override @Override
public void itemStateChanged(ItemEvent e) { public void itemStateChanged(ItemEvent e) {
JCheckBoxMenuItem item = (JCheckBoxMenuItem) e.getItem(); JCheckBoxMenuItem item = (JCheckBoxMenuItem) e.getItem();
String val = item.getText(); String val = item.getText();
col.selectedUnit = col.unitGroup.findApproximate(val); col.selectedUnit = col.unitGroup.findApproximate(val);
ComponentPresetTable.this.tableModel.fireTableDataChanged(); ComponentPresetTable.this.tableModel.fireTableDataChanged();
return;
} }
} }