Merge branch 'master' of https://gvipers.imt-lille-douai.fr/arthur.poignonnec/geometry

# Conflicts:
#	garage/src/Option/Option.java
#	garage/src/vehicle/part/engine/Engine.java

garage/src/vehicle/Vehicle.java

@@ -21,7 +21,7 @@ public abstract class Vehicle {
     // return "\t" + this.brandName + "is a " + name + " with that options : + " ?? " + ". Price : " + price.
 
     // Add an option
-    // public void addOption(opt : Option)
+    // public void addOption(opt : vehicle.part.option)
 
     
     // GETTER
@@ -31,7 +31,7 @@ public abstract class Vehicle {
     // public Brand getBrand()
 
     // Get the options of the car
-    // public List<Option> getOptions()
+    // public List<vehicle.part.option> getOptions()
 
     // Get the price
     // public Double getPrice();

garage/src/vehicle/part/engine/DieselEngine.java

 package vehicle.part.engine;
 
-public class DieselEngine extends Engine {
+public class DieselEngine extends Engine{
 
     public DieselEngine(String _cylindre, Double _price) {
 

garage/src/vehicle/part/engine/ElectricEngine.java

 package vehicle.part.engine;
 
-public class ElectricEngine {
+public class ElectricEngine extends Engine {
+
+    public ElectricEngine(String _cylindre, Double _price) {
+
+        super(_cylindre, _price);
+        this.type = EngineType.ELECTRIC;
+    }
+
+    public String toString() {
+        return "Electric Engine";
+    }
+
 }
+

garage/src/vehicle/part/engine/Engine.java

@@ -3,22 +3,38 @@ package vehicle.part.engine;
 public class Engine {
 
     protected EngineType type;
-    private String cylindre;
-    private Double price;
+    protected String cylindre;
+    protected Double price;
 
     public Engine (String _cylindre, Double _price) {
 
         this.cylindre = _cylindre;
-        this.price = _price;
+        this.price = getPrice();
 
     }
 
     public String toString() {
-        return "This is a " + cylindre + "engine, it's a " + type + " engine and it costs " + price + " €.";
+        return "This vehicle has a " + cylindre + "engine, it's a " + type + " engine and it costs " + price + " €.";
     }
 
     public String getCylindre() {
         return this.cylindre;
     }
 
+    public Double getPrice() {
+        if (this.getClass() == DieselEngine.class) {
+            return 2000d;
+        } else if (this.getClass() == ElectricEngine.class) {
+            return 1800d;
+        } else if (this.getClass() == HybridEngine.class) {
+            return 3000d;
+        } else if (this.getClass() == PetrolEngine.class) {
+            return 1400d;
+        } else {
+                return 0d;
+        }
+    }
+
+
+
 }

garage/src/vehicle/part/engine/HybridEngine.java

 package vehicle.part.engine;
 
-public class HybridEngine {
+public class HybridEngine extends Engine {
+
+    public HybridEngine(String _cylindre, Double _price) {
+
+        super(_cylindre, _price);
+        this.type = EngineType.HYBRID;
+    }
+
+    public String toString() {
+        return "Hybrid Engine";
+    }
 }

garage/src/vehicle/part/engine/PetrolEngine.java

 package vehicle.part.engine;
 
-public class PetrolEngine {
+public class PetrolEngine extends Engine {
+
+    public PetrolEngine(String _cylindre, Double _price) {
+
+        super(_cylindre, _price);
+        this.type = EngineType.PETROL;
+    }
+
+    public String toString() {
+        return "Petrol Engine";
+    }
 }

garage/src/vehicle/part/option/Aircon.java

+package vehicle.part.option;
+
+public class Aircon implements Option {
+
+    public double getPrice() {
+        return 300d;
+    }
+
+    public String toString() {
+        return "Aircon (" + this.getPrice() + " €)";
+    }
+}

garage/src/vehicle/part/option/CareerBars.java

+package vehicle.part.option;
+
+public class CareerBars implements Option{
+    public double getPrice() {
+        return 100;
+    }
+
+    public String toString() {
+        return "Career bars (" + this.getPrice() + " €)";
+    }
+}

garage/src/vehicle/part/option/ElectricGlass.java

+package vehicle.part.option;
+
+public class ElectricGlass implements Option{
+
+    public double getPrice() {
+        return 200d;
+    }
+
+    public String toString() {
+        return "Electric glass (" + this.getPrice() + " €)";
+    }
+}

garage/src/vehicle/part/option/GPS.java

+package vehicle.part.option;
+
+public class GPS implements Option {
+
+    public double getPrice() {
+        return 50d;
+    }
+
+    public String toString() {
+        return "GPS (" + this.getPrice() + " €)";
+    }
+}

garage/src/vehicle/part/option/HotSeat.java

+package vehicle.part.option;
+
+public class HotSeat implements Option {
+
+        public double getPrice() {
+            return 150d;
+        }
+
+        public String toString() {
+            return "Hot seat (" + this.getPrice() + " €)";
+        }
+    }
+}

garage/src/vehicle/part/option/Option.java

+package vehicle.part.option;
+
+public interface Option {
+
+    double getPrice();
+
+    String toString();
+
+}