fermeture correcte au click oui dans fenetre de fermeture

data/2223_S2/version.txt

-15
-230522
+17
+230524

shukan/Shukan.java

@@ -61,6 +61,7 @@ public class Shukan
                 int choix = JOptionPane.showConfirmDialog(frame, "Êtes-vous sûr de vouloir quitter sans sauvegarder ?", "Quitter", JOptionPane.YES_NO_OPTION);
                 if (choix == JOptionPane.YES_OPTION) {
                     frame.dispose();
+                    frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
                 } else {
                     frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
                 }

shukan/ShukanController.java

@@ -160,7 +160,6 @@ public class ShukanController
     // Manage the double click to open a new window
     if (e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1) {
       canvas.SpecWeekModuleWindow();
-
     }
 
     if (e.getButton () == MouseEvent.BUTTON3)

shukan/ShukanData.java

@@ -692,7 +692,6 @@ public class ShukanData
       for (int i =0; i<holly_weeks.length; i++) {
         if (week == holly_weeks[i]) return false;
       }
-      System.out.println(moduleStart(cursusNumber(), mod));
       // hollydays
       if (debut == 0) { if (week_durations[week-debut-4]==0) return false; }
       else { if (week_durations[week-debut]==0) return false; }

shukan/ShukanView.java

@@ -378,6 +378,12 @@ public class ShukanView extends JPanel
     int num_cursus = data.cursusNumber();
     int num_semaine = data.selectedWeek()+data.startWeekNumber();
 
+    System.out.println(data.subtitle(num_module));
+
+    int[] activities = data.schedule(num_semaine);
+    //for (int i =0; i<activities.length; i++) System.out.println(activities[i]);
+    int[] activities2 = data.scheduleInWeek(num_module, data.selectedWeek());
+    for (int i =0; i<activities2.length; i++) System.out.println(activities2[i]);
 
     // affiche la fenetre si il y a cours pendant cette periode
     if(data.isActiveWeek(num_semaine, num_module))