Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

fix some bugs from Sonar 06032019

Browse source
This commit is contained in:
Ingmar Goudt 2019-03-06 23:01:05 +01:00
parent e68b79336a
commit ee3f592186
6 changed files with 20 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java
View file

@ -907,7 +907,6 @@ public class NewTournamentDialog extends MageDialog {
packPanels.add(setPanel); // for later access
// combo set
JComboBox pack = new JComboBox();
pack = new JComboBox();
pack.setModel(new DefaultComboBoxModel(ExpansionRepository.instance.getWithBoostersSortedByReleaseDate()));
pack.addActionListener(evt -> packActionPerformed(evt));
pack.setAlignmentX(0.0F);
@ -963,7 +962,7 @@ public class NewTournamentDialog extends MageDialog {
int startIndex = 0;
for (int i = 0; i < packPanels.size(); i++) {
JComboBox pack = findComboInComponent(packPanels.get(i));
if (pack.equals(curentCombo)) {
if (pack != null && pack.equals(curentCombo)) {
startIndex = i + 1;
break;
}
@ -972,7 +971,9 @@ public class NewTournamentDialog extends MageDialog {
// change all from start index
for (int i = startIndex; i < packPanels.size(); i++) {
JComboBox pack = findComboInComponent(packPanels.get(i));
pack.setSelectedIndex(newValue);
if(pack != null) {
pack.setSelectedIndex(newValue);
}
}
}