From 1f0e3fb2969b39a7026ebae55fb00d3f89aa2628 Mon Sep 17 00:00:00 2001
From: Feror <contact@feror.fr>
Date: Thu, 23 Jan 2025 11:31:20 +0100
Subject: [PATCH] =?UTF-8?q?D=C3=A9portation=20des=20m=C3=A9thodes=20startC?=
 =?UTF-8?q?ar,=20stopCar=20et=20changeSpeed=20vers=20la=20classe=20Car?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 carApp/.DS_Store                      | Bin 6148 -> 6148 bytes
 carApp/src/.DS_Store                  | Bin 6148 -> 6148 bytes
 carApp/src/main/java/Application.java |  16 +++++++-------
 carApp/src/main/java/Car.java         |  25 ++++++++++++++++++++++
 carApp/src/main/java/Driver.java      |  29 +++++++++-----------------
 5 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/carApp/.DS_Store b/carApp/.DS_Store
index fd1350e94d48f377aadca1f79a8101f73d1dc4d6..5aa1c5be30400539e29c4facf594824d494cbae2 100644
GIT binary patch
delta 46
zcmV+}0MY-1FoZC$Ed&AjlP&~`0)o?%x&#^pLN?E^D3jR)Ujj<NvpNL=0RlLqvpxpK
E5rr8K^#A|>

delta 44
zcmZoMXffEJ%fhHPS&yZQslIOVE*7cD-&n*Zzhd!Y^7h?q#mdCUWbU)sj_sHr06d!w
Ah5!Hn

diff --git a/carApp/src/.DS_Store b/carApp/src/.DS_Store
index 872849ba784ee84d260cb7f034aa65241b2c4f01..41722a8e6ed631a5f4a2b2359c5dfa7edf50d94e 100644
GIT binary patch
delta 15
WcmZoMXffEJ#>m9;X0rz49WekXPz4A8

delta 15
WcmZoMXffEJ#>m7yb+ZQJ9WekVKLoG<

diff --git a/carApp/src/main/java/Application.java b/carApp/src/main/java/Application.java
index e34b1af..1809791 100644
--- a/carApp/src/main/java/Application.java
+++ b/carApp/src/main/java/Application.java
@@ -4,15 +4,15 @@ public class Application {
     private static final int REDUCED_SPEED = 30;
 
     public static void main(final String[] args) {
-        Car maVoiture = new Car("Sedan", "Bleu");
-        Driver moi = new Driver("John", AGE);
+        Car myCar = new Car("Sedan", "Bleu");
+        Driver me = new Driver("John", AGE);
 
-        moi.startCar(maVoiture);
-        maVoiture.accelerate();
-        moi.changeSpeed(maVoiture, INITIAL_SPEED);
-        maVoiture.slowDown();
-        moi.changeSpeed(maVoiture, REDUCED_SPEED);
-        moi.stopCar(maVoiture);
+        me.startCar(myCar);
+        myCar.accelerate();
+        me.changeSpeed(myCar, INITIAL_SPEED);
+        myCar.slowDown();
+        me.changeSpeed(myCar, REDUCED_SPEED);
+        me.stopCar(myCar);
         System.out.println("fini");
     }
 }
\ No newline at end of file
diff --git a/carApp/src/main/java/Car.java b/carApp/src/main/java/Car.java
index a8d9867..efdd0eb 100644
--- a/carApp/src/main/java/Car.java
+++ b/carApp/src/main/java/Car.java
@@ -38,4 +38,29 @@ public class Car {
         System.out.println("Couleur : " + couleur);
         System.out.println("Vitesse actuelle : " + vitesse);
     }
+
+    public void startCar(final Driver driver) {
+        if (driver.isAdult()) {
+            System.out.println(driver.getNom() + " démarre la voiture.");
+        } else {
+            System.out.println("Le conducteur n'est pas assez âgé pour conduire.");
+        }
+    }
+
+    public void stopCar(final Driver driver) {
+        System.out.println(driver.getNom() + " arrête la voiture.");
+    }
+
+    public void changeSpeed(final Driver driver, final int nouvelleVitesse) {
+        System.out.println(driver.getNom() + " change la vitesse de la voiture à " + nouvelleVitesse);
+        if (this.getSpeed() >= nouvelleVitesse) {
+            while (this.getSpeed() > nouvelleVitesse) {
+                this.slowDown();
+            }
+        } else {
+            while (this.getSpeed() < nouvelleVitesse) {
+                this.accelerate();
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/carApp/src/main/java/Driver.java b/carApp/src/main/java/Driver.java
index a86139b..fa4efb5 100644
--- a/carApp/src/main/java/Driver.java
+++ b/carApp/src/main/java/Driver.java
@@ -12,28 +12,19 @@ public class Driver {
         return age >= ADULT_AGE;
     }
 
-    public void startCar(final Car voiture) {
-        if (isAdult()) {
-            System.out.println(nom + " démarre la voiture.");
-        } else {
-            System.out.println("Le conducteur n'est pas assez âgé pour conduire.");
-        }
+    public String getNom() {
+        return this.nom;
     }
 
-    public void stopCar(final Car voiture) {
-        System.out.println(nom + " arrête la voiture.");
+    public void startCar(final Car car) {
+        car.startCar(this);
     }
 
-    public void changeSpeed(final Car voiture, final int nouvelleVitesse) {
-        System.out.println(nom + " change la vitesse de la voiture à " + nouvelleVitesse);
-        if (voiture.getSpeed() >= nouvelleVitesse) {
-            while (voiture.getSpeed() > nouvelleVitesse) {
-                voiture.slowDown();
-            }
-        } else {
-            while (voiture.getSpeed() < nouvelleVitesse) {
-                voiture.accelerate();
-            }
-        }
+    public void stopCar(final Car car) {
+        car.stopCar(this);
+    }
+
+    public void changeSpeed(final Car car, final int newSpeed) {
+        car.changeSpeed(this, newSpeed);
     }
 }
\ No newline at end of file