Merge commit '7d0878431ed5b959c3fa6887396ac1e8773665ad' into HEAD

src/main/java/solitaer/Card.java

@@ -1,5 +1,7 @@
 package solitaer;
 
+import java.awt.Color;
+import java.awt.Graphics;
 import java.util.Objects;
 
 import javax.swing.JPanel;
@@ -9,17 +11,18 @@ enum Symbol {
 }
 
 public class Card extends JPanel {
-	
-	/**
-	 * 
-	 */
+
 	private static final long serialVersionUID = 1L;
 	private int nr;
 	private Symbol symbol;
-	
+
 	private boolean faceUp;
+	
+	private final int IMAGE_WIDTH = 72;
+	private final int IMAGE_HIGHT = 96;
 
 	public Card(int nr, Symbol symbol, boolean faceUp) {
+		this.setSize(IMAGE_WIDTH,IMAGE_HIGHT);
 		this.nr = nr;
 		this.symbol = symbol;
 		this.faceUp = faceUp;
@@ -37,10 +40,33 @@ public class Card extends JPanel {
 		return nr;
 	}
 
+	private String getNrText() {
+		if (this.nr < 10) {
+			return "0" + this.nr;
+		} else {
+			return "" + this.nr;
+		}
+	}
+
 	public Symbol getSymbol() {
 		return symbol;
 	}
 
+	private String getSymboleText() {
+		switch (this.symbol) {
+		case Herz:
+			return "Herz";
+		case Karo:
+			return "Karo";
+		case Pik:
+			return "Pik";
+		case Kreuz:
+			return "Kreuz";
+		default:
+			return "";
+		}
+	}
+
 	@Override
 	public String toString() {
 		return "Card [nr=" + nr + ", symbol=" + symbol + ", faceUp=" + faceUp + "]";
@@ -63,6 +89,37 @@ public class Card extends JPanel {
 		return faceUp == other.faceUp && nr == other.nr && symbol == other.symbol;
 	}
 
+	@Override
+	protected void paintComponent(Graphics g) {
+		// TODO Auto-generated method stub
+		super.paintComponent(g);
+		paintCard(g);
+
+	}
+
 	
+	private void paintCard(Graphics g) {
+		if (faceUp) {
+			g.setColor(Color.white);
+			g.fillRect(0, 0, this.getWidth(), this.getHeight());
+
+			g.setColor(Color.black);
+			g.drawRect(0, 0, this.getWidth() - 1, this.getHeight() - 1);
+
+			if (this.symbol == Symbol.Herz || this.symbol == Symbol.Karo)
+				g.setColor(Color.red);
+			else
+				g.setColor(Color.black);
+
+			String text = "" + this.getNrText() + " " + this.getSymboleText();
+			g.drawString(text, 3, 15);
+		} else {
+			g.setColor(Color.blue);
+			g.fillRect(0, 0, this.getWidth(), this.getHeight());
+
+			g.setColor(Color.black);
+			g.drawRect(0, 0, this.getWidth() - 1, this.getHeight() - 1);
+		}
+	}
 
 }

src/main/java/solitaer/SolitaerGamePanel.java

@@ -15,6 +15,13 @@ public class SolitaerGamePanel extends JPanel {
 	
 	public SolitaerGamePanel() {
 		setLayout(null);
+		StartStack a = new StartStack(25,25);
+		a.addCard(new Card(13, Symbol.Karo, true));
+		a.addCard(new Card(1, Symbol.Karo, true));
+		this.add(a);
+		
+		StartStack b = new StartStack(200,25);
+		this.add(b);
 	}
 	
 	

src/main/java/solitaer/StartStack.java

@@ -0,0 +1,80 @@
+package solitaer;
+
+import java.awt.Color;
+import java.awt.Graphics;
+import java.util.ArrayList;
+
+import javax.swing.JPanel;
+
+public class StartStack extends JPanel {
+
+	private static final long serialVersionUID = 1L;
+	private ArrayList<Card> stack = new ArrayList<Card>();
+	private final int OFFSET_VALUE = 20;
+	
+	private final int IMAGE_WIDTH = 72;
+	private final int IMAGE_HIGHT = 450;
+
+	private int offset;
+
+	public StartStack(int _x, int _y) {
+		super.setLocation(_x, _y);
+		super.setSize(IMAGE_WIDTH, IMAGE_HIGHT);
+		super.setOpaque(false);
+		super.setLayout(null);
+
+		offset = 0;
+	}
+
+	public boolean cardCheck(Card _topStack, Card _playerCard) {
+		if(_topStack == null && _playerCard == null) {
+			return false;
+		}		
+		if (_topStack == null) {
+			// Nur der König kann auf einen leeren Stapel gelegt werden
+			return _playerCard.getNr() == 13;
+		}else {
+			return (// Nummer nur aufsteigend
+					_topStack.getNr() == _playerCard.getNr() + 1) 
+					&&
+					// rot auf Schwarz
+					(					
+					((_topStack.getSymbol() == Symbol.Herz || _topStack.getSymbol() == Symbol.Karo)
+							&& (_playerCard.getSymbol() == Symbol.Pik || _playerCard.getSymbol() == Symbol.Kreuz))
+					||
+					// schwarz auf rot
+					((_topStack.getSymbol() == Symbol.Pik || _topStack.getSymbol() == Symbol.Kreuz)
+							&& (_playerCard.getSymbol() == Symbol.Herz || _playerCard.getSymbol() == Symbol.Karo))
+					);
+		}
+	}
+
+	public void addCard(Card _card) {
+		_card.setLocation(0, offset);
+		stack.add(_card);
+		addtoPanel();
+		offset += OFFSET_VALUE;
+	}
+
+	private void addtoPanel() {
+		this.removeAll();
+		//Alles neu Zeichnen
+		for (int i = stack.size() - 1; i >= 0; i--) {
+			this.add(stack.get(i));
+		}
+	}
+
+	@Override
+	protected void paintComponent(Graphics g) {
+		// TODO Auto-generated method stub
+		super.paintComponent(g);
+		if (stack.size() == 0) {
+			g.setColor(Color.gray);
+			g.fillRect(0, 0, this.getWidth(), 96);
+			
+			g.setColor(Color.black);
+			g.drawRect(0, 0, this.getWidth()-1, 96-1);
+		}
+	}
+
+}

src/test/java/solitaer/StartStackTest.java

@@ -0,0 +1,37 @@
+package solitaer;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class StartStackTest {
+
+	@ParameterizedTest
+	@MethodSource("testStartStackTestDaten")
+	//Jedes Symbol muss einmal vorhand sein
+	void testRulesetStartStack(String msg, Card _stapel, Card _spieler, boolean _expectedResult) {
+		StartStack stack = new StartStack(10, 10);
+		assertEquals(_expectedResult, stack.cardCheck(_stapel, _spieler), msg);
+	}
+
+
+	private static Stream<Arguments> testStartStackTestDaten(){
+		return Stream.of(
+				Arguments.of("Ass-Kreuz auf 2-Herz", new Card(2, Symbol.Herz, true), new Card(1, Symbol.Kreuz, true), true),
+				Arguments.of("Ass-Herz auf 2-Herz", new Card(2, Symbol.Herz, true), new Card(1, Symbol.Herz, true), false),
+				Arguments.of("Ass-Herz auf 2-Herz", new Card(1, Symbol.Herz, true), new Card(2, Symbol.Herz, true), false),
+				Arguments.of("Ass-Kreuz auf leeres Feld", null, new Card(1, Symbol.Kreuz, true), false),
+				Arguments.of("König auf leeres Feld", null, new Card(13, Symbol.Kreuz, true), true),
+				Arguments.of("5-Pik auf 6-Karo", new Card(6, Symbol.Karo, true), new Card(5, Symbol.Pik, true), true),
+				Arguments.of("König-Karo auf Ass-Kreuz", new Card(1, Symbol.Kreuz, true), new Card(13, Symbol.Karo, true), false),
+				Arguments.of("5-Karo auf 7-Kreuz", new Card(7, Symbol.Kreuz, true), new Card(5, Symbol.Karo, true), false),
+				Arguments.of("2-Herz auf Ass-Kreuz", new Card(2, Symbol.Herz, true), new Card(1, Symbol.Kreuz, true), true),
+				Arguments.of("null auf null", null, null, false)
+				);
+	}
+
+}