School-DUT-info/M431-ShadowHunterGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changement des classes types par des enum

Browse Source
This commit is contained in:
Paul Gross
2020-05-06 16:15:36 +02:00
parent 1b554ad75c
commit 24cc4909bf
14 changed files with 152 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/Pioche.java
View File

@@ -6,13 +6,19 @@ import java.util.Stack;
import carte.CartePiochable;
public class Pioche<T extends Type> {
public class Pioche {
private Stack<CartePiochable<T>> cartesPiochables;
private Stack<CartePiochable> cartesPiochables;
private CartePiochable.Type type;
public Pioche(List<CartePiochable<T>> cartesPiochables) {
public Pioche(List<CartePiochable> cartesPiochables) {
}
public Pioche(CartePiochable.Type type, List<CartePiochable> list1) {
super();
this.cartesPiochables = new Stack<CartePiochable<T>>();
this.type = type;
this.cartesPiochables = new Stack<CartePiochable>();
this.cartesPiochables.addAll(cartesPiochables);
melanger();
}
@@ -22,7 +28,7 @@ public class Pioche<T extends Type> {
Collections.shuffle(cartesPiochables);
}
public CartePiochable<?> piocher() {
public CartePiochable piocher() {
return cartesPiochables.pop();
}
}