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
This commit is contained in:
Tergel TSAGAAN 2021-01-12 15:36:58 +01:00
commit fe2d3e150f
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/GUI/GUI.java
View file

@ -52,7 +52,7 @@ public class GUI extends JFrame implements ActionListener {
setIconImage(img.getImage()); setIconImage(img.getImage());
this.renderMenu(); this.renderMenu();
new Agenda(agendaPanel, this.currentPage, this.currentCompetition); agenda = new Agenda(agendaPanel, this.currentPage, this.currentCompetition);
previousButton.addActionListener(this); previousButton.addActionListener(this);
nextButton.addActionListener(this); nextButton.addActionListener(this);
HCButton.addActionListener(this); HCButton.addActionListener(this);

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

@ -48,8 +48,7 @@ public class ProjectionHandler extends JDialog {
this.agenda = agenda; this.agenda = agenda;
try { try {
competitionComboBox.getModel().setSelectedItem(agenda.getCompetition()); competitionComboBox.getModel().setSelectedItem(agenda.getCompetition());
} catch (NotFoundInTable ignored) { } catch (NotFoundInTable ignored) {}
}
dayComboBox.getModel().setSelectedItem(agenda.getDate()); dayComboBox.getModel().setSelectedItem(agenda.getDate());
slotComboBox.getModel().setSelectedItem(agenda.getSlot()); slotComboBox.getModel().setSelectedItem(agenda.getSlot());
createUIComponents(); createUIComponents();