EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2025-06-27 11:44:42 +02:00
Code Issues Projects Releases Wiki Activity

Fikser en del småfeil i Deck, ProgrammingCardDeck og tester

Browse Source
This commit is contained in:
Kristian Knarvik
2020-03-03 17:57:27 +01:00
parent 9f7ebb59b1
commit 315cbb2590
3 changed files with 43 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/inf112/fiasko/roborally/objects/Deck.java
View File

@ -8,13 +8,13 @@ import java.util.Random;
* This class represents a deck of cards
*/
public abstract class Deck<T> implements IDeck<T> {
private final ArrayList<T> cardList;
private final List<T> cardList;
/**
* Initializes the deck with cards
* @param cardList list of cards
*/
public Deck (ArrayList<T> cardList) {
public Deck (List<T> cardList) {
this.cardList = new ArrayList<>(cardList);
}
@ -68,5 +68,14 @@ public abstract class Deck<T> implements IDeck<T> {
public List<T> getCards() {
return new ArrayList<>(cardList);
}
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
for (T card : cardList) {
builder.append(card.toString()).append("\n");
}
return builder.toString();
}
}

4
src/main/java/inf112/fiasko/roborally/objects/ProgrammingCardDeck.java
View File

@ -1,6 +1,6 @@
package inf112.fiasko.roborally.objects;
import java.util.ArrayList;
import java.util.List;
/**
* This class represents a deck containing programming cards
@ -11,7 +11,7 @@ public class ProgrammingCardDeck extends Deck<ProgrammingCard> {
* Initializes the PlayerDeck with a list of cards
* @param cardList list of programing cards
*/
public ProgrammingCardDeck(ArrayList<ProgrammingCard> cardList) {
public ProgrammingCardDeck(List<ProgrammingCard> cardList) {
super(cardList);
}
}