diff --git a/bin/C13_Heritage/Test.class b/bin/C13_Heritage/Test.class index f8dac5f..63860b7 100644 Binary files a/bin/C13_Heritage/Test.class and b/bin/C13_Heritage/Test.class differ diff --git a/bin/C14_GUI/14_gui_fr.pdf b/bin/C14_GUI/14_gui_fr.pdf new file mode 100644 index 0000000..e45bf17 Binary files /dev/null and b/bin/C14_GUI/14_gui_fr.pdf differ diff --git a/bin/C14_GUI/App.class b/bin/C14_GUI/App.class new file mode 100644 index 0000000..4867552 Binary files /dev/null and b/bin/C14_GUI/App.class differ diff --git a/src/C13_Heritage/Test (SFConflict remi@herdac.ch 2022-05-02-16-17-18).java b/src/C13_Heritage/Test (SFConflict remi@herdac.ch 2022-05-02-16-17-18).java new file mode 100644 index 0000000..149eb3b --- /dev/null +++ b/src/C13_Heritage/Test (SFConflict remi@herdac.ch 2022-05-02-16-17-18).java @@ -0,0 +1,18 @@ +package C13_Heritage; + +public class Test { + public static void main(String[] args) { + Car suzuki = new Car(2003, 4000); + Truck tracteur = new Truck(2020, 12000); + Car citroen = new Car(2006, 8000); + + System.out.println(suzuki); + System.out.println(tracteur); + System.out.println(citroen); + + suzuki.start(); + suzuki.accelerate(); + tracteur.start(); + tracteur.accelerate(); + } +} diff --git a/src/C13_Heritage/Test.java b/src/C13_Heritage/Test.java index 4050857..941768a 100644 --- a/src/C13_Heritage/Test.java +++ b/src/C13_Heritage/Test.java @@ -10,5 +10,9 @@ public class Test { System.out.println(tracteur); System.out.println(citroen); - } + suzuki.start(); + suzuki.accelerate(); + tracteur.start(); + tracteur.accelerate(); +} } diff --git a/src/C14_GUI/14_gui_fr.pdf b/src/C14_GUI/14_gui_fr.pdf new file mode 100644 index 0000000..e45bf17 Binary files /dev/null and b/src/C14_GUI/14_gui_fr.pdf differ diff --git a/src/C14_GUI/App.java b/src/C14_GUI/App.java new file mode 100644 index 0000000..5e2a3e3 --- /dev/null +++ b/src/C14_GUI/App.java @@ -0,0 +1,5 @@ +package C14_GUI; + +public class App { + +}