added null-safety for unknown nationalities; added smarter selection of list entries of known SwissTiming configurations

Change-Id: I98717e130aa686ebca306d6c02c1a573a9896d2b
This commit is contained in:
Axel Uhl committed 2018-08-03 11:23:15 +02:00
1 parent 297066ea9e
commit 66c5fbf71b
2 files changed
+8 -2

No files matched your search

@@ -119,9 +119,9 @@ public class SwissTimingAdapterImpl implements SwissTimingAdapter {
Person person = persons.get(crewMember.getPersonID());
crew.add(new CrewMemberImpl(
person.getGivenName() + " " + person.getFamilyName(),
person.getNOC().name(), crewMember.getPosition().name()));
(person.getNOC()==null)?null:(person.getNOC().name()), crewMember.getPosition().name()));
}
String nationality = team.getNOC().name();
String nationality = team.getNOC()==null?null:team.getNOC().name();
CompetitorWithID competitor = new CompetitorWithID(team.getTeamID(),
boat.getSailNumber(), nationality, team.getTeamName(), crew);
competitors.add(competitor);
@@ -510,6 +510,12 @@ public class SwissTimingEventManagementPanel extends AbstractEventManagementPane
if (previousConfigurations.put(stConfig.getName(), stConfig) == null) {
previousConfigurationsComboBox.addItem(stConfig.getName());
}
for (int i=0; i<previousConfigurationsComboBox.getItemCount(); i++) {
if (previousConfigurationsComboBox.getValue(i).equals(stConfig.getName())) {
previousConfigurationsComboBox.setSelectedIndex(i);
break;
}
}
updatePanelFromSelectedStoredConfiguration();
}
});