diff --git a/.vscode/launch.json b/.vscode/launch.json
index bbb66eb..61d0a31 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,5 +1,19 @@
{
"configurations": [
+ {
+ "type": "java",
+ "name": "Launch GUI2",
+ "request": "launch",
+ "mainClass": "GUI.GUI2",
+ "projectName": "Lab15_OOP_79fdc875"
+ },
+ {
+ "type": "java",
+ "name": "Launch GUI1",
+ "request": "launch",
+ "mainClass": "GUI.GUI1",
+ "projectName": "Lab15_OOP_79fdc875"
+ },
{
"type": "java",
"name": "Launch HesSoGarage",
diff --git a/bin/BillGUI/HesSoGarage.class b/bin/BillGUI/HesSoGarage.class
index ae13f61..4179702 100644
Binary files a/bin/BillGUI/HesSoGarage.class and b/bin/BillGUI/HesSoGarage.class differ
diff --git a/bin/GUI/ButtonListener.class b/bin/GUI/ButtonListener.class
index 5e05f10..ba26bdc 100644
Binary files a/bin/GUI/ButtonListener.class and b/bin/GUI/ButtonListener.class differ
diff --git a/bin/GUI/GUI1.class b/bin/GUI/GUI1.class
index 095518a..3bdfed1 100644
Binary files a/bin/GUI/GUI1.class and b/bin/GUI/GUI1.class differ
diff --git a/bin/GUI/GUI2.class b/bin/GUI/GUI2.class
index c550513..7984315 100644
Binary files a/bin/GUI/GUI2.class and b/bin/GUI/GUI2.class differ
diff --git a/bin/GUI/Listener.class b/bin/GUI/Listener.class
index 7e3c259..59066c1 100644
Binary files a/bin/GUI/Listener.class and b/bin/GUI/Listener.class differ
diff --git a/src/BillGUI/HesSoGarage.java b/src/BillGUI/HesSoGarage.java
index a3fee25..32e6e9a 100644
--- a/src/BillGUI/HesSoGarage.java
+++ b/src/BillGUI/HesSoGarage.java
@@ -2,9 +2,11 @@ package BillGUI;
public class HesSoGarage {
public static void main(String[] args) {
+ //Create a new garage
GarageManager garageManager = new GarageManager();
String name = "Garage manager
Prestations";
String logoFilePath = "src/logo_garage.png"; //TODO redimensionnement automatique
+ //Create a new HMI for calculate and print the bill
new ManagerGui(name, logoFilePath, garageManager.getServices(), garageManager); //TODO affichage sans redimensionnement
}
}
diff --git a/src/GUI/GUI1.java b/src/GUI/GUI1.java
index 04024be..e0dfb53 100644
--- a/src/GUI/GUI1.java
+++ b/src/GUI/GUI1.java
@@ -1,5 +1,4 @@
package GUI;
-//TODO mettre commentaire
import javax.swing.*;
diff --git a/src/GUI/GUI2.java b/src/GUI/GUI2.java
index aad4fb6..4ab0810 100644
--- a/src/GUI/GUI2.java
+++ b/src/GUI/GUI2.java
@@ -1,5 +1,4 @@
package GUI;
-//TODO mettre commentaire
import javax.swing.*;
import javax.swing.event.ChangeEvent;