fixed game annoucnement for Craps and Blackjack

src/main/java/io/zipcoder/casino/Casino.java

@@ -49,57 +49,29 @@ public class Casino {
     }
 
     public void chooseTable() {
+        Game game = null;
+
+        Integer gameChoice = console.getGameChoice();
+
+        switch(gameChoice){
+            case 1:
+                game = new Craps();
+                break;
+            case 2:
+                game = new BlackJack();
+                break;
+            case 3:
+                game = new GoFish();
+                break;
+        }
 
-      console.println("GAME LIST\n");
-      console.println("1. CRAPS\n");
-      console.println("2. BLACK JACK\n");
-      console.println("3. GO FISH\n");
-      console.println("CHOOSE TABLE\n");
-      Integer number=console.getIntegerInput("") ;
-       switch(number){
-         case 1:
-             runGame(new Craps());
-             break;
-        case 2:
-             runGame(new BlackJack());
-             break;
-        case 3:
-             runGame(new GoFish());
-             break;
-       }        
+        runGame(game);
      }
 
     private void runGame(Game game) {
-        console.println("WELCOME TO %s", game.getClassName());
         this.game = game;
     }
 
-    public void confirmPlayers() {
-      boolean isConfirmed = false;
-      while(!isConfirmed){
-        console.println("Current Players: ");
-        for(Player player : players.getPlayers()){
-          console.println(player.getName());
-        }
-        Integer choice = console.getIntegerInput("Choose option:\n (1)Confirm Players\n (2)Add Player\n (3)Remove Player\n");
-        String name;
-        switch(choice){
-          case 1: isConfirmed = true;
-            break;
-          case 2: name = console.getStringInput("Enter name of player to add: ");
-                    players.addPlayer(new Player(name));
-            break;
-          case 3: name = console.getStringInput("Enter name of player to remove: ");
-                  for(Player player : players.getPlayers()){
-                    if(player.getName() == name)
-                      players.removePlayer(player);
-                  }
-            break;
-          default: break;
-        }
-      }
-    }
-
     public void bootPlayer() {
         // If player balance is 0, player game over
         for (int i = 0; i < players.getPlayers().size(); i++) {

src/main/java/io/zipcoder/casino/cardgames/BlackJack.java

@@ -32,6 +32,7 @@ public class BlackJack extends CardGame implements Gamble {
 
     @Override
     public void runGame(){
+        announceGameChoice();
         for(int i = 0; i < blackJackPlayers.size(); i++){
             play(blackJackPlayers.get(i),blackJackPlayers.get(i).getBet());
         }
@@ -181,8 +182,8 @@ public class BlackJack extends CardGame implements Gamble {
         for (int i = 0; i < blackJackPlayers.size(); i++) {
             p = blackJackPlayers.get(i);
             if (getSum(p.getHand()) == 21) {
-                Console.println(p.getName() + ", you have " + p.getHand().display());
-                Console.println(p.getName() + ", you have blackjack. You win!");
+                Console.println(p.getP().getName() + ", you have " + p.getHand().display());
+                Console.println(p.getP().getName() + ", you have blackjack. You win!");
                 evaluateBet(p, p.getBet());
                 blackJackPlayers.remove(i);
             }
@@ -212,7 +213,7 @@ public class BlackJack extends CardGame implements Gamble {
     @Override
     public void placeBet(Player player) {
         BlackJackPlayer blackJackPlayer = (BlackJackPlayer) player;
-        long bet = Console.getLongInput("Please enter your bet.");
+        long bet = Console.getLongInput(String.format("%s, please enter your bet.", ((BlackJackPlayer) player).getP().getName()));
         blackJackPlayer.setBet(bet);
     }
 

src/main/java/io/zipcoder/casino/dicegames/Craps.java

@@ -33,6 +33,7 @@ public class Craps extends DiceGame implements Gamble {
 
     @Override
     public void runGame(){
+        announceGameChoice();
         for(int i = 0; i < crapsPlayers.size(); i++){
             greetPlayer(crapsPlayers.get(i).getP());
             play(crapsPlayers.get(i));

src/main/java/io/zipcoder/casino/utilities/Console.java

@@ -1,5 +1,7 @@
 package io.zipcoder.casino.utilities;
 
+import io.zipcoder.casino.Casino;
+
 import java.awt.peer.SystemTrayPeer;
 import java.util.Scanner;
 
@@ -137,6 +139,15 @@ public class Console {
         return userInput;
     }
 
+    public Integer getGameChoice() {
+        println("GAME LIST\n");
+        println("1. CRAPS\n");
+        println("2. BLACK JACK\n");
+        println("3. GO FISH\n");
+        println("CHOOSE TABLE\n");
+        return getIntegerInput("");
+    }
+
 
 //
 //    public Integer getPlayersInput(String prompt){

src/main/java/io/zipcoder/casino/utilities/abstracts/Game.java

@@ -1,13 +1,22 @@
 package io.zipcoder.casino.utilities.abstracts;
 
+import io.zipcoder.casino.utilities.Console;
+
+import java.sql.DriverManager;
+
 public abstract class Game {
-    String className = this.getClass().getName();
+    String className = this.getClass().getSimpleName();
 
     public abstract void promptContinue();
 
     public abstract void runGame();
 
-    public String getClassName() {
+    private String getClassName() {
         return className;
     }
+
+    protected void announceGameChoice() {
+        Console console = new Console();
+        console.println("Welcome to %s\n", this.getClassName());
+    }
 }