From 756c3d08ccf8e6cdefd5c22341cd0b16a390be3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D1=8F=D1=87=D0=B5=D1=81=D0=BB=D0=B0=D0=B2=20=D0=A2?=
 =?UTF-8?q?=D0=B8=D1=85=D0=BE=D0=BD=D0=BE=D0=B2?= <sl-tx@yandex.ru>
Date: Thu, 13 Oct 2022 18:35:59 +0300
Subject: [PATCH 1/5] part 1

---
 src/ru/skypro/Main.java                | 18 ++++++++-
 src/ru/skypro/transport/Bus.java       | 18 +++++++++
 src/ru/skypro/transport/Car.java       | 17 +++++++++
 src/ru/skypro/transport/Transport.java | 53 ++++++++++++++++++++++++++
 src/ru/skypro/transport/Truck.java     | 18 +++++++++
 5 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 src/ru/skypro/transport/Bus.java
 create mode 100644 src/ru/skypro/transport/Car.java
 create mode 100644 src/ru/skypro/transport/Transport.java
 create mode 100644 src/ru/skypro/transport/Truck.java

diff --git a/src/ru/skypro/Main.java b/src/ru/skypro/Main.java
index 625884e..49df5fe 100644
--- a/src/ru/skypro/Main.java
+++ b/src/ru/skypro/Main.java
@@ -1,7 +1,23 @@
 package ru.skypro;
 
+import ru.skypro.transport.Bus;
+import ru.skypro.transport.Car;
+import ru.skypro.transport.Transport;
+import ru.skypro.transport.Truck;
+
 public class Main {
     public static void main(String[] args){
-
+        Transport car1 = new Car("brand1","car1",1.6);
+        Transport car2 = new Car("brand2","car2",2.0);
+        Transport bus1 = new Bus("brand1","bus1",3.0);
+        Transport truck1 = new Truck("brand2","truck1",4.0);
+        car1.startMoving();
+        car2.startMoving();
+        bus1.startMoving();
+        truck1.startMoving();
+        truck1.stopMoving();
+        car1.stopMoving();
+        bus1.stopMoving();
+        car2.stopMoving();
     }
 }
diff --git a/src/ru/skypro/transport/Bus.java b/src/ru/skypro/transport/Bus.java
new file mode 100644
index 0000000..c5f5e8b
--- /dev/null
+++ b/src/ru/skypro/transport/Bus.java
@@ -0,0 +1,18 @@
+package ru.skypro.transport;
+
+public class Bus extends Transport {
+
+    public Bus(String brand, String model, Double engineVolume) {
+        super(brand, model, engineVolume);
+    }
+
+    @Override
+    public void startMoving() {
+        super.startMoving();
+    }
+
+    @Override
+    public void stopMoving() {
+        super.stopMoving();
+    }
+}
diff --git a/src/ru/skypro/transport/Car.java b/src/ru/skypro/transport/Car.java
new file mode 100644
index 0000000..c46cd2b
--- /dev/null
+++ b/src/ru/skypro/transport/Car.java
@@ -0,0 +1,17 @@
+package ru.skypro.transport;
+
+public class Car extends Transport{
+    public Car(String brand, String model, Double engineVolume) {
+        super(brand, model, engineVolume);
+    }
+
+    @Override
+    public void startMoving() {
+        super.startMoving();
+    }
+
+    @Override
+    public void stopMoving() {
+        super.stopMoving();
+    }
+}
diff --git a/src/ru/skypro/transport/Transport.java b/src/ru/skypro/transport/Transport.java
new file mode 100644
index 0000000..dcb6486
--- /dev/null
+++ b/src/ru/skypro/transport/Transport.java
@@ -0,0 +1,53 @@
+package ru.skypro.transport;
+
+public abstract class Transport {
+    private String brand;
+    private String model;
+    private Double engineVolume;
+
+    public Transport(String brand, String model, Double engineVolume) {
+        this.brand = brand == null || brand.equals("") ? "default" : brand;
+        this.model = model == null || model.equals("") ? "default" : model;
+        this.engineVolume = (engineVolume == null || engineVolume<0) ? 1.6 : engineVolume;
+    }
+
+    public void startMoving(){
+        System.out.println(this.getClass() +" "+ this.brand +" "+ this.model + "Начал движение");
+    }
+    public void stopMoving(){
+        System.out.println(this.getClass() +" "+ this.brand +" "+ this.model + "Закончил движение");
+    }
+
+    @Override
+    public String toString() {
+        return "Transport{" +
+                "brand='" + brand + '\'' +
+                ", model='" + model + '\'' +
+                ", engineVolume=" + engineVolume +
+                '}';
+    }
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public String getModel() {
+        return model;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    public void setModel(String model) {
+        this.model = model;
+    }
+
+    public Double getEngineVolume() {
+        return engineVolume;
+    }
+
+    public void setEngineVolume(Double engineVolume) {
+        this.engineVolume = engineVolume;
+    }
+}
diff --git a/src/ru/skypro/transport/Truck.java b/src/ru/skypro/transport/Truck.java
new file mode 100644
index 0000000..30cd4ab
--- /dev/null
+++ b/src/ru/skypro/transport/Truck.java
@@ -0,0 +1,18 @@
+package ru.skypro.transport;
+
+public class Truck extends Transport{
+
+    public Truck(String brand, String model, Double engineVolume) {
+        super(brand, model, engineVolume);
+    }
+
+    @Override
+    public void startMoving() {
+        System.out.println(super.getBrand() +" "+ super.getModel() + " Начал движение");
+    }
+
+    @Override
+    public void stopMoving() {
+        System.out.println(super.getBrand() +" "+ super.getModel() + " Закончил движение");
+    }
+}

From 6263c3f6206820ba0f2c349ea0c908a45dfa4eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D1=8F=D1=87=D0=B5=D1=81=D0=BB=D0=B0=D0=B2=20=D0=A2?=
 =?UTF-8?q?=D0=B8=D1=85=D0=BE=D0=BD=D0=BE=D0=B2?= <sl-tx@yandex.ru>
Date: Thu, 13 Oct 2022 18:38:29 +0300
Subject: [PATCH 2/5] part 2

---
 src/ru/skypro/transport/Competitive.java | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 src/ru/skypro/transport/Competitive.java

diff --git a/src/ru/skypro/transport/Competitive.java b/src/ru/skypro/transport/Competitive.java
new file mode 100644
index 0000000..6fe64c3
--- /dev/null
+++ b/src/ru/skypro/transport/Competitive.java
@@ -0,0 +1,7 @@
+package ru.skypro.transport;
+
+public interface Competitive {
+    void pitStop();
+    void maxSpeed();
+    void bestTime();
+}

From 1217fb2fa2e5350e0034f2e30001bebb6d3cd224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D1=8F=D1=87=D0=B5=D1=81=D0=BB=D0=B0=D0=B2=20=D0=A2?=
 =?UTF-8?q?=D0=B8=D1=85=D0=BE=D0=BD=D0=BE=D0=B2?= <sl-tx@yandex.ru>
Date: Thu, 13 Oct 2022 18:44:27 +0300
Subject: [PATCH 3/5] part 3

---
 src/ru/skypro/Main.java            | 15 ++++++++++++---
 src/ru/skypro/transport/Bus.java   | 16 +++++++++++++++-
 src/ru/skypro/transport/Car.java   | 17 ++++++++++++++++-
 src/ru/skypro/transport/Truck.java | 17 ++++++++++++++++-
 4 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/src/ru/skypro/Main.java b/src/ru/skypro/Main.java
index 49df5fe..6e01618 100644
--- a/src/ru/skypro/Main.java
+++ b/src/ru/skypro/Main.java
@@ -7,10 +7,10 @@
 
 public class Main {
     public static void main(String[] args){
-        Transport car1 = new Car("brand1","car1",1.6);
+        Car car1 = new Car("brand1","car1",1.6);
         Transport car2 = new Car("brand2","car2",2.0);
-        Transport bus1 = new Bus("brand1","bus1",3.0);
-        Transport truck1 = new Truck("brand2","truck1",4.0);
+        Bus bus1 = new Bus("brand1","bus1",3.0);
+        Truck truck1 = new Truck("brand2","truck1",4.0);
         car1.startMoving();
         car2.startMoving();
         bus1.startMoving();
@@ -19,5 +19,14 @@ public static void main(String[] args){
         car1.stopMoving();
         bus1.stopMoving();
         car2.stopMoving();
+        car1.pitStop();
+        car1.bestTime();
+        car1.maxSpeed();
+        truck1.pitStop();
+        truck1.bestTime();
+        truck1.maxSpeed();
+        bus1.pitStop();
+        bus1.bestTime();
+        bus1.maxSpeed();
     }
 }
diff --git a/src/ru/skypro/transport/Bus.java b/src/ru/skypro/transport/Bus.java
index c5f5e8b..85dcf64 100644
--- a/src/ru/skypro/transport/Bus.java
+++ b/src/ru/skypro/transport/Bus.java
@@ -1,6 +1,6 @@
 package ru.skypro.transport;
 
-public class Bus extends Transport {
+public class Bus extends Transport implements Competitive {
 
     public Bus(String brand, String model, Double engineVolume) {
         super(brand, model, engineVolume);
@@ -15,4 +15,18 @@ public void startMoving() {
     public void stopMoving() {
         super.stopMoving();
     }
+    @Override
+    public void pitStop() {
+        System.out.println("false");
+    }
+
+    @Override
+    public void maxSpeed() {
+        System.out.println("200");
+    }
+
+    @Override
+    public void bestTime() {
+        System.out.println("9.00");
+    }
 }
diff --git a/src/ru/skypro/transport/Car.java b/src/ru/skypro/transport/Car.java
index c46cd2b..88dc3f0 100644
--- a/src/ru/skypro/transport/Car.java
+++ b/src/ru/skypro/transport/Car.java
@@ -1,6 +1,6 @@
 package ru.skypro.transport;
 
-public class Car extends Transport{
+public class Car extends Transport implements Competitive{
     public Car(String brand, String model, Double engineVolume) {
         super(brand, model, engineVolume);
     }
@@ -14,4 +14,19 @@ public void startMoving() {
     public void stopMoving() {
         super.stopMoving();
     }
+
+    @Override
+    public void pitStop() {
+        System.out.println("false");
+    }
+
+    @Override
+    public void maxSpeed() {
+        System.out.println("160");
+    }
+
+    @Override
+    public void bestTime() {
+        System.out.println("10.00");
+    }
 }
diff --git a/src/ru/skypro/transport/Truck.java b/src/ru/skypro/transport/Truck.java
index 30cd4ab..84edcee 100644
--- a/src/ru/skypro/transport/Truck.java
+++ b/src/ru/skypro/transport/Truck.java
@@ -1,6 +1,6 @@
 package ru.skypro.transport;
 
-public class Truck extends Transport{
+public class Truck extends Transport implements Competitive{
 
     public Truck(String brand, String model, Double engineVolume) {
         super(brand, model, engineVolume);
@@ -15,4 +15,19 @@ public void startMoving() {
     public void stopMoving() {
         System.out.println(super.getBrand() +" "+ super.getModel() + " Закончил движение");
     }
+
+    @Override
+    public void pitStop() {
+        System.out.println("true");
+    }
+
+    @Override
+    public void maxSpeed() {
+        System.out.println("330");
+    }
+
+    @Override
+    public void bestTime() {
+        System.out.println("6.00");
+    }
 }

From 0b0bb9211f1dede4fe48ac7b79a072c29b0da94c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D1=8F=D1=87=D0=B5=D1=81=D0=BB=D0=B0=D0=B2=20=D0=A2?=
 =?UTF-8?q?=D0=B8=D1=85=D0=BE=D0=BD=D0=BE=D0=B2?= <sl-tx@yandex.ru>
Date: Thu, 13 Oct 2022 19:11:06 +0300
Subject: [PATCH 4/5] part 4

---
 src/ru/skypro/Main.java             | 13 +++++++++----
 src/ru/skypro/transport/Driver.java | 24 ++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 src/ru/skypro/transport/Driver.java

diff --git a/src/ru/skypro/Main.java b/src/ru/skypro/Main.java
index 6e01618..5af92ac 100644
--- a/src/ru/skypro/Main.java
+++ b/src/ru/skypro/Main.java
@@ -1,9 +1,6 @@
 package ru.skypro;
 
-import ru.skypro.transport.Bus;
-import ru.skypro.transport.Car;
-import ru.skypro.transport.Transport;
-import ru.skypro.transport.Truck;
+import ru.skypro.transport.*;
 
 public class Main {
     public static void main(String[] args){
@@ -28,5 +25,13 @@ public static void main(String[] args){
         bus1.pitStop();
         bus1.bestTime();
         bus1.maxSpeed();
+        Driver<Car> driver1 = new Driver<>("F I O 1", true,5);
+        Driver<Transport> driver2 = new Driver<>("F I O 2", false,0);
+        Driver<Bus> driver3 = new Driver<>("F I O 3", true,9);
+        Driver<Truck> driver4 = new Driver<>("F I O 4", true,7);
+        driver1.refill(car1);
+        driver2.refill(car2);
+        driver3.refill(bus1);
+        driver4.refill(truck1);
     }
 }
diff --git a/src/ru/skypro/transport/Driver.java b/src/ru/skypro/transport/Driver.java
new file mode 100644
index 0000000..f11e4a8
--- /dev/null
+++ b/src/ru/skypro/transport/Driver.java
@@ -0,0 +1,24 @@
+package ru.skypro.transport;
+
+public class Driver<T extends Transport > {
+    private String fio;
+    private Boolean haveRights;
+    private Integer stazh;
+
+    public Driver(String fio, Boolean haveRights, Integer stazh) {
+        this.fio = fio;
+        this.haveRights = haveRights;
+        this.stazh = stazh;
+    }
+
+    public void startMoving(T transport){
+        transport.startMoving();
+    }
+    public void stopMoving(T transport){
+        transport.stopMoving();
+
+    }
+    public void refill(T transport){
+        System.out.println("водитель "+fio+" управляет автомобилем "+transport.getBrand()+" "+transport.getModel()+" и будет участвовать в заезде");
+    }
+}

From 435a9ad445cddb666de662ba38b0eeaea2226673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D1=8F=D1=87=D0=B5=D1=81=D0=BB=D0=B0=D0=B2=20=D0=A2?=
 =?UTF-8?q?=D0=B8=D1=85=D0=BE=D0=BD=D0=BE=D0=B2?= <sl-tx@yandex.ru>
Date: Sun, 23 Oct 2022 13:30:59 +0300
Subject: [PATCH 5/5] fixes

---
 src/ru/skypro/Main.java              | 17 +++++++++--------
 src/ru/skypro/transport/Driver.java  | 13 ++++++++-----
 src/ru/skypro/transport/DriverB.java |  7 +++++++
 src/ru/skypro/transport/DriverC.java |  7 +++++++
 src/ru/skypro/transport/DriverD.java |  7 +++++++
 5 files changed, 38 insertions(+), 13 deletions(-)
 create mode 100644 src/ru/skypro/transport/DriverB.java
 create mode 100644 src/ru/skypro/transport/DriverC.java
 create mode 100644 src/ru/skypro/transport/DriverD.java

diff --git a/src/ru/skypro/Main.java b/src/ru/skypro/Main.java
index 5af92ac..35e44ee 100644
--- a/src/ru/skypro/Main.java
+++ b/src/ru/skypro/Main.java
@@ -25,13 +25,14 @@ public static void main(String[] args){
         bus1.pitStop();
         bus1.bestTime();
         bus1.maxSpeed();
-        Driver<Car> driver1 = new Driver<>("F I O 1", true,5);
-        Driver<Transport> driver2 = new Driver<>("F I O 2", false,0);
-        Driver<Bus> driver3 = new Driver<>("F I O 3", true,9);
-        Driver<Truck> driver4 = new Driver<>("F I O 4", true,7);
-        driver1.refill(car1);
-        driver2.refill(car2);
-        driver3.refill(bus1);
-        driver4.refill(truck1);
+        Car car2c = (Car) car2;
+        Driver driver1 = new DriverB("F I O 1", true,5, car1);
+        Driver driver2 = new DriverB("F I O 2", false,0, car2c);
+        Driver driver3 = new DriverD("F I O 3", true,9, bus1);
+        Driver driver4 = new DriverC("F I O 4", true,7, truck1);
+        driver1.refill();
+        driver2.refill();
+        driver3.refill();
+        driver4.refill();
     }
 }
diff --git a/src/ru/skypro/transport/Driver.java b/src/ru/skypro/transport/Driver.java
index f11e4a8..f900c7d 100644
--- a/src/ru/skypro/transport/Driver.java
+++ b/src/ru/skypro/transport/Driver.java
@@ -1,24 +1,27 @@
 package ru.skypro.transport;
 
-public class Driver<T extends Transport > {
+public abstract class Driver{
+
+    private final Transport transport;
     private String fio;
     private Boolean haveRights;
     private Integer stazh;
 
-    public Driver(String fio, Boolean haveRights, Integer stazh) {
+    public Driver(String fio, Boolean haveRights, Integer stazh, Transport transport) {
         this.fio = fio;
         this.haveRights = haveRights;
         this.stazh = stazh;
+        this.transport = transport;
     }
 
-    public void startMoving(T transport){
+    public void startMoving(){
         transport.startMoving();
     }
-    public void stopMoving(T transport){
+    public void stopMoving(){
         transport.stopMoving();
 
     }
-    public void refill(T transport){
+    public void refill(){
         System.out.println("водитель "+fio+" управляет автомобилем "+transport.getBrand()+" "+transport.getModel()+" и будет участвовать в заезде");
     }
 }
diff --git a/src/ru/skypro/transport/DriverB.java b/src/ru/skypro/transport/DriverB.java
new file mode 100644
index 0000000..41aca26
--- /dev/null
+++ b/src/ru/skypro/transport/DriverB.java
@@ -0,0 +1,7 @@
+package ru.skypro.transport;
+
+public class DriverB extends Driver{
+    public DriverB(String fio, Boolean haveRights, Integer stazh, Car transport) {
+        super(fio, haveRights, stazh, transport);
+    }
+}
diff --git a/src/ru/skypro/transport/DriverC.java b/src/ru/skypro/transport/DriverC.java
new file mode 100644
index 0000000..858bae5
--- /dev/null
+++ b/src/ru/skypro/transport/DriverC.java
@@ -0,0 +1,7 @@
+package ru.skypro.transport;
+
+public class DriverC extends Driver{
+    public DriverC(String fio, Boolean haveRights, Integer stazh, Truck transport) {
+        super(fio, haveRights, stazh, transport);
+    }
+}
diff --git a/src/ru/skypro/transport/DriverD.java b/src/ru/skypro/transport/DriverD.java
new file mode 100644
index 0000000..d3184fd
--- /dev/null
+++ b/src/ru/skypro/transport/DriverD.java
@@ -0,0 +1,7 @@
+package ru.skypro.transport;
+
+public class DriverD extends Driver{
+    public DriverD(String fio, Boolean haveRights, Integer stazh, Bus transport) {
+        super(fio, haveRights, stazh, transport);
+    }
+}