javajigi · Apr 24, 2018 · Apr 13, 2018 · Apr 13, 2018 · Apr 13, 2018 · Apr 13, 2018
diff --git a/src/main/java/bowling/Main.java b/src/main/java/bowling/Main.java
@@ -1,27 +1,34 @@
 package bowling;
 
-import bowling.view.BowlingGame;
 import bowling.domain.Player;
-import bowling.domain.Utils.Validator;
-
-import static bowling.view.Prompter.*;
+import bowling.view.ResultView;
+import bowling.view.UserPrompt;
 
 public class Main {
     public static void main(String[] args) {
-        Player player = getPlayer();
-        BowlingGame game = new BowlingGame(player);
-
-        game.startGame();
+        String name = getUserName();
+        Player player = new Player(name);
+        startBowl(player);
     }
 
-    private static Player getPlayer() {
+    private static String getUserName() {
         try {
-            String playerName = promptForName();
-            Validator.validateName(playerName);
-            return new Player(playerName);
+            return UserPrompt.promptUserForName();
         } catch (IllegalArgumentException e) {
             System.out.println(e.getMessage());
-            return getPlayer();
+            return getUserName();
+        }
+    }
+
+    private static void startBowl(Player player) {
+        while (!player.isDone()) {
+            try {
+                int pins = UserPrompt.promptUserForBowl(player.getCurrentFrameNumber());
+                player.bowl(pins);
+                ResultView.printScoreBoard(player);
+            } catch (IllegalArgumentException e) {
+                System.out.println(e.getMessage());
+            }
         }
     }
 }
diff --git a/src/main/java/bowling/domain/Player.java b/src/main/java/bowling/domain/Player.java
@@ -1,30 +1,46 @@
 package bowling.domain;
 
-import bowling.domain.Utils.Formatter;
-import bowling.domain.frame.Frames;
+import bowling.domain.frame.frame;
+import bowling.domain.frame.NormalFrame;
+import bowling.domain.util.Formatter;
 
-public class Player {
-    private final Frames frames = new Frames();
-    private final String playerName;
+public class Player implements Printable {
+    private static final int FIRST = 1;
+    private static final int INITIAL = 0;
 
-    public Player(String playerName) {
-        this.playerName = playerName;
+    private final String name;
+    private final frame frames;
+
+    public Player(String name) {
+        this.name = name;
+        this.frames = new NormalFrame(FIRST);
+    }
+
+    public void bowl(int pins) {
+        frames.bowl(pins);
     }
 
-    public boolean throwBall(int frameNumber, int pinsKnocked) {
-        return frames.knockPins(frameNumber, pinsKnocked);
+    public boolean isDone() {
+        return frames.isLast();
     }
 
-    public boolean isStrike(int frameNumber) {
-        return frames.isStrike(frameNumber);
+    public int getCurrentFrameNumber() {
+        return frames.getFrameNumber();
     }
 
-    public boolean isSpare(int frameNumber) {
-        return frames.isSpare(frameNumber);
+    @Override
+    public String convertStatusToPrintable() {
+        return "|"
+                + Formatter.formatFrame(name)
+                + "|"
+                + frames.getPrintableStatus();
     }
 
     @Override
-    public String toString() {
-        return "|" + Formatter.formatFrame("  " + playerName) + frames.toString();
+    public String convertScoreToPrintable() {
+        return "|"
+                + Formatter.formatFrame("")
+                + "|"
+                + frames.getPrintableScore(INITIAL);
     }
 }
diff --git a/src/main/java/bowling/domain/Printable.java b/src/main/java/bowling/domain/Printable.java
@@ -0,0 +1,8 @@
+package bowling.domain;
+
+public interface Printable {
+
+    String convertStatusToPrintable();
+
+    String convertScoreToPrintable();
+}
diff --git a/src/main/java/bowling/domain/Utils/Formatter.java b/src/main/java/bowling/domain/Utils/Formatter.java
diff --git a/src/main/java/bowling/domain/Utils/Validator.java b/src/main/java/bowling/domain/Utils/Validator.java
diff --git a/src/main/java/bowling/domain/frame/Frame.java b/src/main/java/bowling/domain/frame/Frame.java
diff --git a/src/main/java/bowling/domain/frame/Frames.java b/src/main/java/bowling/domain/frame/Frames.java
diff --git a/src/main/java/bowling/domain/frame/LabelFrame.java b/src/main/java/bowling/domain/frame/LabelFrame.java
diff --git a/src/main/java/bowling/domain/frame/LabelFrames.java b/src/main/java/bowling/domain/frame/LabelFrames.java
diff --git a/src/main/java/bowling/domain/frame/LastFrame.java b/src/main/java/bowling/domain/frame/LastFrame.java
@@ -1,38 +1,47 @@
 package bowling.domain.frame;
 
-import bowling.domain.score.BonusScore;
-import bowling.domain.score.Scores;
-
-public class LastFrame implements Frame{
-    private Scores scores = new Scores();
-    private BonusScore bonusScore = new BonusScore();
-
-    public boolean knockPins(int pinsKnocked) {
-        if (!scores.firstThrowIsPlayed()) {
-            scores.updateFirstThrow(pinsKnocked);
-            return true;
-        }
-        if (!scores.secondThrowIsPlayed() && !scores.isStrike()) {
-            scores.updateSecondThrow(pinsKnocked);
-            return true;
-        }
-        if (!bonusScore.isPlayed()) {
-            bonusScore.updateScore(pinsKnocked);
-            return true;
-        }
-        return false;
+import bowling.domain.frame.status.LastFrameStatus;
+import bowling.domain.frame.score.Score;
+import bowling.domain.util.Formatter;
+
+public class LastFrame implements frame {
+    private static final int LAST = 10;
+
+    private final LastFrameStatus status = new LastFrameStatus();
+
+    @Override
+    public int getFrameNumber() {
+        return LAST;
     }
 
-    public boolean isStrike() {
-        return scores.isStrike();
+    @Override
+    public void bowl(int pins) {
+        status.bowl(pins);
+    }
+
+    @Override
+    public boolean isLast() {
+        return status.isComplete();
     }
 
-    public boolean isSpare() {
-        return scores.isSpare();
+    @Override
+    public String getPrintableStatus() {
+        return Formatter.formatFrame(status.toString()) + "|";
+    }
+
+    @Override
+    public String getPrintableScore(int total) {
+        Score score = status.createScore();
+        return score.getScore(total) + "|";
+    }
+
+    @Override
+    public void calculateAdditionalScore(Score prevScore) {
+        status.updateScoresFromPreviousFrames(prevScore);
     }
 
     @Override
-    public String toString() {
-        return " " + scores.toString() + bonusScore.toString();
+    public void updateScoreFromPrevPrev(Score prevPrev) {
+        status.updateScoresFromPreviousFrames(prevPrev);
     }
 }