From 503d24f1401945032ec6a2ceaba68e4fed4821f8 Mon Sep 17 00:00:00 2001 From: trochas Date: Wed, 4 Dec 2024 17:46:11 +0100 Subject: [PATCH 1/3] ajustement des prix --- src/fr/impl/Parts/Interior.java | 32 +++++++++++++++++++++++++++++++- src/fr/test/test.java | 12 ++++++------ 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/src/fr/impl/Parts/Interior.java b/src/fr/impl/Parts/Interior.java index 1b25fc0..7c5a800 100644 --- a/src/fr/impl/Parts/Interior.java +++ b/src/fr/impl/Parts/Interior.java @@ -1,11 +1,41 @@ package src.fr.impl.Parts; +import java.util.HashSet; +import java.util.Set; + import src.fr.impl.CategoryImpl; import src.fr.impl.PartImpl; import src.fr.impl.PartTypeImpl; -public class Interior extends PartImpl { + + + +public class Interior extends PartImpl { + + private static final Set colorSet; + static { + colorSet = new HashSet<>(); + colorSet.add("black"); + colorSet.add("white"); + colorSet.add("cream"); + } + + String color; + String material; + public Interior(String name, CategoryImpl category, int price){ super(new PartTypeImpl(name,Engine.class, category), price); + } + + public String getColor(){ + return this.color; + } + + public void setColor(String newColor){ + this.color = newColor; + } + + + } diff --git a/src/fr/test/test.java b/src/fr/test/test.java index adbebde..77970e9 100644 --- a/src/fr/test/test.java +++ b/src/fr/test/test.java @@ -24,12 +24,12 @@ public class test { PartType EG100PartType = new PartTypeImpl("EG100",Engine.class,engine); - Engine EG100 = new Engine("EG100",engine,3000); - Engine EG133 = new Engine("EG133",engine,8000); - Engine EG210= new Engine("EG210", engine,15000); - Engine ED110= new Engine("ED110", engine,2000); - Engine ED180= new Engine("ED180", engine,4000); - Engine EH120= new Engine("EH120", engine,15000); + Engine EG100 = new Engine("EG100",engine,19000); + Engine EG133 = new Engine("EG133",engine,2200); + Engine EG210= new Engine("EG210", engine,25000); + Engine ED110= new Engine("ED110", engine,18000); + Engine ED180= new Engine("ED180", engine,20000); + Engine EH120= new Engine("EH120", engine,30000); Transmission TM5= new Transmission("TM5", transmission,2000); Transmission TM6= new Transmission("TM6", transmission,4000); From 5e27042193a70a34f8b7e35b0e1cf1da4faa023c Mon Sep 17 00:00:00 2001 From: trochas Date: Wed, 4 Dec 2024 17:47:02 +0100 Subject: [PATCH 2/3] =?UTF-8?q?import=20inutile=20retir=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fr/impl/PartImpl.java | 1 - src/fr/impl/Parts/Engine.java | 7 ------- src/fr/impl/Parts/Exterior.java | 1 - 3 files changed, 9 deletions(-) diff --git a/src/fr/impl/PartImpl.java b/src/fr/impl/PartImpl.java index f76c15d..bf1262f 100644 --- a/src/fr/impl/PartImpl.java +++ b/src/fr/impl/PartImpl.java @@ -2,7 +2,6 @@ package src.fr.impl; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; import java.util.Objects; import java.util.Optional; diff --git a/src/fr/impl/Parts/Engine.java b/src/fr/impl/Parts/Engine.java index e4b3dad..2cf5c18 100644 --- a/src/fr/impl/Parts/Engine.java +++ b/src/fr/impl/Parts/Engine.java @@ -1,12 +1,5 @@ package src.fr.impl.Parts; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Optional; -import java.util.Set; - -import org.junit.Test.None; - import src.fr.impl.CategoryImpl; import src.fr.impl.PartImpl; import src.fr.impl.PartTypeImpl; diff --git a/src/fr/impl/Parts/Exterior.java b/src/fr/impl/Parts/Exterior.java index 389b866..702bc61 100644 --- a/src/fr/impl/Parts/Exterior.java +++ b/src/fr/impl/Parts/Exterior.java @@ -1,7 +1,6 @@ package src.fr.impl.Parts; import java.util.HashSet; -import java.util.Optional; import java.util.Set; import src.fr.impl.CategoryImpl; From 93c1fab4de2b377735c12221f5b2767ab2ce0981 Mon Sep 17 00:00:00 2001 From: trochas Date: Wed, 4 Dec 2024 17:49:12 +0100 Subject: [PATCH 3/3] ajustement des prix --- src/fr/test/test.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fr/test/test.java b/src/fr/test/test.java index 77970e9..f5e913f 100644 --- a/src/fr/test/test.java +++ b/src/fr/test/test.java @@ -29,14 +29,14 @@ public class test { Engine EG210= new Engine("EG210", engine,25000); Engine ED110= new Engine("ED110", engine,18000); Engine ED180= new Engine("ED180", engine,20000); - Engine EH120= new Engine("EH120", engine,30000); + Engine EH120= new Engine("EH120", engine,25000); Transmission TM5= new Transmission("TM5", transmission,2000); Transmission TM6= new Transmission("TM6", transmission,4000); Transmission TA5= new Transmission("TA5", transmission,7000); Transmission TS6= new Transmission("TS6", transmission,10000); Transmission TSF7= new Transmission("TSF7", transmission,15000); - Transmission TC120= new Transmission("TC120", transmission,1000); + Transmission TC120= new Transmission("TC120", transmission,5000); Exterior XC= new Exterior("XC", exterior,0); Exterior XM= new Exterior("XM", exterior,1000);