vuminh224/cartailor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_v2' of https://gitlab2.istic.univ-rennes1.fr/tuvu/cartailor into dev_v2

Browse Source
This commit is contained in:
Minh VU
2024-12-04 16:56:40 +01:00
parent 6ca58a33f6 93c1fab4de
commit c2d6d245b4
5 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/fr/impl/PartImpl.java
View File

@@ -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;

7
src/fr/impl/Parts/Engine.java
View File

@@ -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;

1
src/fr/impl/Parts/Exterior.java
View File

@@ -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;

32
src/fr/impl/Parts/Interior.java
View File

@@ -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<String> 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;
}
}

14
src/fr/test/test.java
View File

@@ -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);