diff --git a/src/main/java/solitaer/Card.java b/src/main/java/solitaer/Card.java index 5cad36d..e905f90 100644 --- a/src/main/java/solitaer/Card.java +++ b/src/main/java/solitaer/Card.java @@ -21,19 +21,19 @@ public class Card extends JPanel { private final int IMAGE_WIDTH = 72; private final int IMAGE_HIGHT = 96; - public Card(int nr, Symbol symbol, boolean faceUp) { + public Card(int _nr, Symbol _symbol, boolean _faceUp) { this.setSize(IMAGE_WIDTH,IMAGE_HIGHT); - this.nr = nr; - this.symbol = symbol; - this.faceUp = faceUp; + this.nr = _nr; + this.symbol = _symbol; + this.faceUp = _faceUp; } public boolean isFaceUp() { return faceUp; } - public void setFaceUp(boolean faceUp) { - this.faceUp = faceUp; + public void setFaceUp(boolean _faceUp) { + this.faceUp = _faceUp; } public int getNr() { diff --git a/src/main/java/solitaer/MyMouseListener.java b/src/main/java/solitaer/MyMouseListener.java index d222ac6..0ad21bb 100644 --- a/src/main/java/solitaer/MyMouseListener.java +++ b/src/main/java/solitaer/MyMouseListener.java @@ -118,6 +118,11 @@ public class MyMouseListener implements MouseInputListener { } else { tempStack = (GeberStack) com.getParent(); } + + if(this.saveStack.stackIsEmpty() == false) { + clearSaveStack(selectedStack); + } + if (tempStack.stackIsEmpty()) { // Move all from Waste to Geber ((GeberStack) this.tempStack).swapWasteGeber(); diff --git a/src/main/java/solitaer/images/01Herz.png b/src/main/java/solitaer/images/01Herz.png deleted file mode 100644 index 62d0956..0000000 Binary files a/src/main/java/solitaer/images/01Herz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/01Karo.png b/src/main/java/solitaer/images/01Karo.png deleted file mode 100644 index 73b0128..0000000 Binary files a/src/main/java/solitaer/images/01Karo.png and /dev/null differ diff --git a/src/main/java/solitaer/images/01Kreuz.png b/src/main/java/solitaer/images/01Kreuz.png deleted file mode 100644 index a202c88..0000000 Binary files a/src/main/java/solitaer/images/01Kreuz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/01Pik.png b/src/main/java/solitaer/images/01Pik.png deleted file mode 100644 index faa496e..0000000 Binary files a/src/main/java/solitaer/images/01Pik.png and /dev/null differ diff --git a/src/main/java/solitaer/images/02Herz.png b/src/main/java/solitaer/images/02Herz.png deleted file mode 100644 index 559fbbe..0000000 Binary files a/src/main/java/solitaer/images/02Herz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/02Karo.png b/src/main/java/solitaer/images/02Karo.png deleted file mode 100644 index 028c276..0000000 Binary files a/src/main/java/solitaer/images/02Karo.png and /dev/null differ diff --git a/src/main/java/solitaer/images/02Kreuz.png b/src/main/java/solitaer/images/02Kreuz.png deleted file mode 100644 index 8a0fd46..0000000 Binary files a/src/main/java/solitaer/images/02Kreuz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/02Pik.png b/src/main/java/solitaer/images/02Pik.png deleted file mode 100644 index 0a1e274..0000000 Binary files a/src/main/java/solitaer/images/02Pik.png and /dev/null differ diff --git a/src/main/java/solitaer/images/03Herz.png b/src/main/java/solitaer/images/03Herz.png deleted file mode 100644 index 05c7794..0000000 Binary files a/src/main/java/solitaer/images/03Herz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/03Karo.png b/src/main/java/solitaer/images/03Karo.png deleted file mode 100644 index da7c45d..0000000 Binary files a/src/main/java/solitaer/images/03Karo.png and /dev/null differ diff --git a/src/main/java/solitaer/images/03Kreuz.png b/src/main/java/solitaer/images/03Kreuz.png deleted file mode 100644 index aac5c92..0000000 Binary files a/src/main/java/solitaer/images/03Kreuz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/03Pik.png b/src/main/java/solitaer/images/03Pik.png deleted file mode 100644 index 16ebe5b..0000000 Binary files a/src/main/java/solitaer/images/03Pik.png and /dev/null differ diff --git a/src/main/java/solitaer/images/04Herz.png b/src/main/java/solitaer/images/04Herz.png deleted file mode 100644 index abf7b19..0000000 Binary files a/src/main/java/solitaer/images/04Herz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/04Karo.png b/src/main/java/solitaer/images/04Karo.png deleted file mode 100644 index 4c37a84..0000000 Binary files a/src/main/java/solitaer/images/04Karo.png and /dev/null differ diff --git a/src/main/java/solitaer/images/04Kreuz.png b/src/main/java/solitaer/images/04Kreuz.png deleted file mode 100644 index acbfba9..0000000 Binary files a/src/main/java/solitaer/images/04Kreuz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/04Pik.png b/src/main/java/solitaer/images/04Pik.png deleted file mode 100644 index d33a448..0000000 Binary files a/src/main/java/solitaer/images/04Pik.png and /dev/null differ diff --git a/src/main/java/solitaer/images/05Herz.png b/src/main/java/solitaer/images/05Herz.png deleted file mode 100644 index 4eaf218..0000000 Binary files a/src/main/java/solitaer/images/05Herz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/05Karo.png b/src/main/java/solitaer/images/05Karo.png deleted file mode 100644 index 45d75ca..0000000 Binary files a/src/main/java/solitaer/images/05Karo.png and /dev/null differ diff --git a/src/main/java/solitaer/images/05Kreuz.png b/src/main/java/solitaer/images/05Kreuz.png deleted file mode 100644 index 7ab055a..0000000 Binary files a/src/main/java/solitaer/images/05Kreuz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/05Pik.png b/src/main/java/solitaer/images/05Pik.png deleted file mode 100644 index 6bbfab9..0000000 Binary files a/src/main/java/solitaer/images/05Pik.png and /dev/null differ diff --git a/src/main/java/solitaer/images/06Herz.png b/src/main/java/solitaer/images/06Herz.png deleted file mode 100644 index 04e7477..0000000 Binary files a/src/main/java/solitaer/images/06Herz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/06Karo.png b/src/main/java/solitaer/images/06Karo.png deleted file mode 100644 index be2d58a..0000000 Binary files a/src/main/java/solitaer/images/06Karo.png and /dev/null differ diff --git a/src/main/java/solitaer/images/06Kreuz.png b/src/main/java/solitaer/images/06Kreuz.png deleted file mode 100644 index c79e672..0000000 Binary files a/src/main/java/solitaer/images/06Kreuz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/06Pik.png b/src/main/java/solitaer/images/06Pik.png deleted file mode 100644 index 35e3403..0000000 Binary files a/src/main/java/solitaer/images/06Pik.png and /dev/null differ diff --git a/src/main/java/solitaer/images/07Herz.png b/src/main/java/solitaer/images/07Herz.png deleted file mode 100644 index b16d663..0000000 Binary files a/src/main/java/solitaer/images/07Herz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/07Karo.png b/src/main/java/solitaer/images/07Karo.png deleted file mode 100644 index 854f4f0..0000000 Binary files a/src/main/java/solitaer/images/07Karo.png and /dev/null differ diff --git a/src/main/java/solitaer/images/07Kreuz.png b/src/main/java/solitaer/images/07Kreuz.png deleted file mode 100644 index 0cc142d..0000000 Binary files a/src/main/java/solitaer/images/07Kreuz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/07Pik.png b/src/main/java/solitaer/images/07Pik.png deleted file mode 100644 index 9391d2a..0000000 Binary files a/src/main/java/solitaer/images/07Pik.png and /dev/null differ diff --git a/src/main/java/solitaer/images/08Herz.png b/src/main/java/solitaer/images/08Herz.png deleted file mode 100644 index f95f90c..0000000 Binary files a/src/main/java/solitaer/images/08Herz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/08Karo.png b/src/main/java/solitaer/images/08Karo.png deleted file mode 100644 index 064e234..0000000 Binary files a/src/main/java/solitaer/images/08Karo.png and /dev/null differ diff --git a/src/main/java/solitaer/images/08Kreuz.png b/src/main/java/solitaer/images/08Kreuz.png deleted file mode 100644 index 3ed11e7..0000000 Binary files a/src/main/java/solitaer/images/08Kreuz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/08Pik.png b/src/main/java/solitaer/images/08Pik.png deleted file mode 100644 index 6519112..0000000 Binary files a/src/main/java/solitaer/images/08Pik.png and /dev/null differ diff --git a/src/main/java/solitaer/images/09Herz.png b/src/main/java/solitaer/images/09Herz.png deleted file mode 100644 index 67532fb..0000000 Binary files a/src/main/java/solitaer/images/09Herz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/09Karo.png b/src/main/java/solitaer/images/09Karo.png deleted file mode 100644 index 719aba4..0000000 Binary files a/src/main/java/solitaer/images/09Karo.png and /dev/null differ diff --git a/src/main/java/solitaer/images/09Kreuz.png b/src/main/java/solitaer/images/09Kreuz.png deleted file mode 100644 index 1838a50..0000000 Binary files a/src/main/java/solitaer/images/09Kreuz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/09Pik.png b/src/main/java/solitaer/images/09Pik.png deleted file mode 100644 index 9bd7df3..0000000 Binary files a/src/main/java/solitaer/images/09Pik.png and /dev/null differ diff --git a/src/main/java/solitaer/images/10Herz.png b/src/main/java/solitaer/images/10Herz.png deleted file mode 100644 index 80d7080..0000000 Binary files a/src/main/java/solitaer/images/10Herz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/10Karo.png b/src/main/java/solitaer/images/10Karo.png deleted file mode 100644 index 2e44348..0000000 Binary files a/src/main/java/solitaer/images/10Karo.png and /dev/null differ diff --git a/src/main/java/solitaer/images/10Kreuz.png b/src/main/java/solitaer/images/10Kreuz.png deleted file mode 100644 index 7f5e236..0000000 Binary files a/src/main/java/solitaer/images/10Kreuz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/10Pik.png b/src/main/java/solitaer/images/10Pik.png deleted file mode 100644 index fa6024a..0000000 Binary files a/src/main/java/solitaer/images/10Pik.png and /dev/null differ diff --git a/src/main/java/solitaer/images/11Herz.png b/src/main/java/solitaer/images/11Herz.png deleted file mode 100644 index a6efc0f..0000000 Binary files a/src/main/java/solitaer/images/11Herz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/11Karo.png b/src/main/java/solitaer/images/11Karo.png deleted file mode 100644 index 422760b..0000000 Binary files a/src/main/java/solitaer/images/11Karo.png and /dev/null differ diff --git a/src/main/java/solitaer/images/11Kreuz.png b/src/main/java/solitaer/images/11Kreuz.png deleted file mode 100644 index 2000018..0000000 Binary files a/src/main/java/solitaer/images/11Kreuz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/11Pik.png b/src/main/java/solitaer/images/11Pik.png deleted file mode 100644 index cb6ed92..0000000 Binary files a/src/main/java/solitaer/images/11Pik.png and /dev/null differ diff --git a/src/main/java/solitaer/images/12Herz.png b/src/main/java/solitaer/images/12Herz.png deleted file mode 100644 index cfda346..0000000 Binary files a/src/main/java/solitaer/images/12Herz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/12Karo.png b/src/main/java/solitaer/images/12Karo.png deleted file mode 100644 index d9f8a0b..0000000 Binary files a/src/main/java/solitaer/images/12Karo.png and /dev/null differ diff --git a/src/main/java/solitaer/images/12Kreuz.png b/src/main/java/solitaer/images/12Kreuz.png deleted file mode 100644 index a6356c8..0000000 Binary files a/src/main/java/solitaer/images/12Kreuz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/12Pik.png b/src/main/java/solitaer/images/12Pik.png deleted file mode 100644 index c57f94c..0000000 Binary files a/src/main/java/solitaer/images/12Pik.png and /dev/null differ diff --git a/src/main/java/solitaer/images/13Herz.png b/src/main/java/solitaer/images/13Herz.png deleted file mode 100644 index 5362efa..0000000 Binary files a/src/main/java/solitaer/images/13Herz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/13Karo.png b/src/main/java/solitaer/images/13Karo.png deleted file mode 100644 index 7945855..0000000 Binary files a/src/main/java/solitaer/images/13Karo.png and /dev/null differ diff --git a/src/main/java/solitaer/images/13Kreuz.png b/src/main/java/solitaer/images/13Kreuz.png deleted file mode 100644 index 2765266..0000000 Binary files a/src/main/java/solitaer/images/13Kreuz.png and /dev/null differ diff --git a/src/main/java/solitaer/images/13Pik.png b/src/main/java/solitaer/images/13Pik.png deleted file mode 100644 index 605141a..0000000 Binary files a/src/main/java/solitaer/images/13Pik.png and /dev/null differ diff --git a/src/main/java/solitaer/images/back.png b/src/main/java/solitaer/images/back.png deleted file mode 100644 index 9457b30..0000000 Binary files a/src/main/java/solitaer/images/back.png and /dev/null differ diff --git a/src/main/java/solitaer/images/empty.png b/src/main/java/solitaer/images/empty.png deleted file mode 100644 index f6c6284..0000000 Binary files a/src/main/java/solitaer/images/empty.png and /dev/null differ diff --git a/src/test/java/solitaer/AblageStackTest.java b/src/test/java/solitaer/AblageStackTest.java index 6059ac1..94ebe9d 100644 --- a/src/test/java/solitaer/AblageStackTest.java +++ b/src/test/java/solitaer/AblageStackTest.java @@ -12,9 +12,9 @@ class AblageStackTest { @ParameterizedTest @MethodSource("testAblageStackTestDaten") - void testRulesetAblageStack(String msg, Card _stapel, Card _spieler, boolean _expectedResult) { + void testRulesetAblageStack(String _msg, Card _stapel, Card _spieler, boolean _expectedResult) { AblageStack stack = new AblageStack(0, 0, Symbol.Kreuz); - assertEquals(_expectedResult, stack.cardCheck(_stapel, _spieler), msg); + assertEquals(_expectedResult, stack.cardCheck(_stapel, _spieler), _msg); } private static Stream testAblageStackTestDaten(){ diff --git a/src/test/java/solitaer/CardDeckTest.java b/src/test/java/solitaer/CardDeckTest.java index 48776f9..0576f3c 100644 --- a/src/test/java/solitaer/CardDeckTest.java +++ b/src/test/java/solitaer/CardDeckTest.java @@ -25,7 +25,7 @@ class CardDeckTest { @ParameterizedTest @MethodSource("testSymbole") //Jedes Symbol muss einmal vorhand sein - void testCardDeckSymbole(String msg, Symbol _sym) { + void testCardDeckSymbole(String _msg, Symbol _sym) { boolean result = false; @@ -36,7 +36,7 @@ class CardDeckTest { } } - assertTrue(result, msg); + assertTrue(result, _msg); } diff --git a/src/test/java/solitaer/StartStackTest.java b/src/test/java/solitaer/StartStackTest.java index d033e45..a618a19 100644 --- a/src/test/java/solitaer/StartStackTest.java +++ b/src/test/java/solitaer/StartStackTest.java @@ -13,9 +13,9 @@ class StartStackTest { @ParameterizedTest @MethodSource("testStartStackTestDaten") //Jedes Symbol muss einmal vorhand sein - void testRulesetStartStack(String msg, Card _stapel, Card _spieler, boolean _expectedResult) { + void testRulesetStartStack(String _msg, Card _stapel, Card _spieler, boolean _expectedResult) { StartStack stack = new StartStack(10, 10); - assertEquals(_expectedResult, stack.cardCheck(_stapel, _spieler), msg); + assertEquals(_expectedResult, stack.cardCheck(_stapel, _spieler), _msg); }