diff --git a/Blackjack25/src/de/th_mannheim/informatik/blackjack/facade/BlackjackGame.java b/Blackjack25/src/de/th_mannheim/informatik/blackjack/facade/BlackjackGame.java index 312d586..737826f 100644 --- a/Blackjack25/src/de/th_mannheim/informatik/blackjack/facade/BlackjackGame.java +++ b/Blackjack25/src/de/th_mannheim/informatik/blackjack/facade/BlackjackGame.java @@ -1,7 +1,7 @@ package de.th_mannheim.informatik.blackjack.facade; -import de.th_mannheim.informatik.blackjack.domain.Card; import de.th_mannheim.informatik.blackjack.domain.CardDeck; +import de.th_mannheim.informatik.blackjack.facade.dtos.CardDTO; public class BlackjackGame { private CardDeck deck; @@ -10,8 +10,8 @@ public class BlackjackGame { this.deck = new CardDeck(); } - public Card getNextCard() { - return deck.getNextCard(); + public CardDTO getNextCard() { + return new CardDTO(deck.getNextCard()); } } diff --git a/Blackjack25/src/de/th_mannheim/informatik/blackjack/facade/dtos/CardDTO.java b/Blackjack25/src/de/th_mannheim/informatik/blackjack/facade/dtos/CardDTO.java new file mode 100644 index 0000000..7e00c2e --- /dev/null +++ b/Blackjack25/src/de/th_mannheim/informatik/blackjack/facade/dtos/CardDTO.java @@ -0,0 +1,13 @@ +package de.th_mannheim.informatik.blackjack.facade.dtos; + +import de.th_mannheim.informatik.blackjack.domain.Card; + +public record CardDTO(String name, int points) { + public CardDTO(Card card) { + this(card.toString(), card.getPoints()); + } + + public String toString() { + return name; + } +} diff --git a/Blackjack25/src/de/th_mannheim/informatik/blackjack/tui/GameMenu.java b/Blackjack25/src/de/th_mannheim/informatik/blackjack/tui/GameMenu.java index dd48373..3b2b055 100644 --- a/Blackjack25/src/de/th_mannheim/informatik/blackjack/tui/GameMenu.java +++ b/Blackjack25/src/de/th_mannheim/informatik/blackjack/tui/GameMenu.java @@ -7,11 +7,11 @@ public class GameMenu { public GameMenu(BlackjackGame game) { this.game = game; - - System.out.println("Willkommen beim THMA Blackjack!"); } public void show() { + System.out.println(); + System.out.println("Ihre Karten sind: "); System.out.println(game.getNextCard());