From 2eba5c7213d5d11c94aa8322387a5e1dd46265e1 Mon Sep 17 00:00:00 2001 From: di7chro Date: Thu, 23 Apr 2015 11:48:21 +0200 Subject: [PATCH] =?UTF-8?q?F=C3=B6rsta=20committen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/session2/BowlingScoreCalculator.java | 15 +++++---------- .../test/session2/BowlingScoreCalculatorTest.java | 1 - 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/BowlingKata/src/session2/BowlingScoreCalculator.java b/BowlingKata/src/session2/BowlingScoreCalculator.java index 9bce1f8..1ebeb40 100644 --- a/BowlingKata/src/session2/BowlingScoreCalculator.java +++ b/BowlingKata/src/session2/BowlingScoreCalculator.java @@ -11,11 +11,9 @@ public class BowlingScoreCalculator { char roll = rolls.charAt(rollIndex); if (rollIsStrike(roll)) { handleStrike(rolls, rollIndex); - } - else if (rollIsSpare(roll)) { + } else if (rollIsSpare(roll)) { handleSpare(rolls, rollIndex); - } - else { + } else { handleRegularRoll(rolls, rollIndex); } } @@ -26,8 +24,7 @@ public class BowlingScoreCalculator { sum += getValueForRolls(rolls, i); if (firstRoll == true) { firstRoll = false; - } - else { + } else { countFrames++; firstRoll = true; } @@ -65,11 +62,9 @@ public class BowlingScoreCalculator { char roll = rolls.charAt(rollIndex); if (rollIsStrike(roll)) { return 10; - } - else if (roll == '-') { + } else if (roll == '-') { return 0; - } - else { + } else { return Integer.parseInt(roll + ""); } } diff --git a/BowlingKata/test/session2/BowlingScoreCalculatorTest.java b/BowlingKata/test/session2/BowlingScoreCalculatorTest.java index 4a8f36f..7c3a149 100644 --- a/BowlingKata/test/session2/BowlingScoreCalculatorTest.java +++ b/BowlingKata/test/session2/BowlingScoreCalculatorTest.java @@ -1,7 +1,6 @@ package session2; import static org.junit.Assert.assertEquals; - import org.junit.Test; public class BowlingScoreCalculatorTest {