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; 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..f5e913f 100644 --- a/src/fr/test/test.java +++ b/src/fr/test/test.java @@ -24,19 +24,19 @@ 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,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);