external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent ListChooser getting caught in infinite loop of reprompting

Browse Source
This commit is contained in:
drdev
2014-01-04 16:27:24 +00:00
parent 45d7b43aa6
commit c8ac6b9f2d
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
forge-gui/src/main/java/forge/gui/ListChooser.java
View File

@@ -103,9 +103,24 @@ public class ListChooser<T> {
this.lstChoices.setCellRenderer(new TransformedCellRenderer(display));
}
this.optionPane = new FOptionPane(null, title, null, new JScrollPane(this.lstChoices), options, 0);
this.optionPane = new FOptionPane(null, title, null, new JScrollPane(this.lstChoices), options, -1);
this.optionPane.setButtonEnabled(0, minChoices == 0);
this.optionPane.addWindowFocusListener(new WindowFocusListener() {
@Override
public void windowGainedFocus(final WindowEvent e) {
ListChooser.this.lstChoices.grabFocus();
}
@Override
public void windowLostFocus(final WindowEvent e) {
}
});
if (this.minChoices != 0) {
this.optionPane.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
}
this.lstChoices.getSelectionModel().addListSelectionListener(new SelListener());
this.lstChoices.addKeyListener(new KeyAdapter() {
@Override
@@ -152,40 +167,23 @@ public class ListChooser<T> {
}
int result;
do {
if (this.minChoices != 0) {
this.optionPane.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
}
if (list.contains(item)) {
lstChoices.setSelectedValue(item, true);
}
else {
lstChoices.setSelectedIndex(0);
}
this.optionPane.addWindowFocusListener(new WindowFocusListener() {
@Override
public void windowGainedFocus(final WindowEvent e) {
ListChooser.this.lstChoices.grabFocus();
}
@Override
public void windowLostFocus(final WindowEvent e) {
}
});
this.optionPane.setVisible(true);
result = this.optionPane.getResult();
if (result != 0) {
this.lstChoices.clearSelection();
break;
}
// can't stop closing by ESC, so repeat if cancelled
} while (this.minChoices != 0);
} while (this.minChoices != 0 && result != 0);
this.optionPane.dispose();
// this assert checks if we really don't return on a cancel if input is
// mandatory
// this assert checks if we really don't return on a cancel if input is mandatory
assert (this.minChoices == 0) || (result == 0);
this.called = true;
return (result == 0);