Cannes_CPOA/Projection_Planning
Archived
1
0
Fork 0
Code Activity

Merge branch 'master' of https://forge.univ-lyon1.fr/cannes-cpoa/projection-planning into master

Browse source 
 Conflicts:
	src/main/java/GUI/ProjectionHandler.java
This commit is contained in:
Tergel TSAGAAN 2021-01-12 17:42:17 +01:00
commit 34b1b1d55a
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/GUI/ProjectionHandler.java
View file

@ -49,8 +49,14 @@ public class ProjectionHandler extends JDialog {
try { try {
competitionComboBox.getModel().setSelectedItem(agenda.getCompetition()); competitionComboBox.getModel().setSelectedItem(agenda.getCompetition());
} catch (NotFoundInTable ignored) {} } catch (NotFoundInTable ignored) {}
if (agenda.getDate() != null || agenda.getSlot() != null) {
updateMovies();
updateDates();
dayComboBox.getModel().setSelectedItem(agenda.getDate()); dayComboBox.getModel().setSelectedItem(agenda.getDate());
updateSlots();
slotComboBox.getModel().setSelectedItem(agenda.getSlot()); slotComboBox.getModel().setSelectedItem(agenda.getSlot());
updateRooms();
}
createUIComponents(); createUIComponents();
} }