csv5, reb36

.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

src/roulette/Bet.java

@@ -38,7 +38,7 @@ public String toString () {
     /**
      * Place bet by prompting user for the specific information need to complete this bet.
      */
-    public abstract void place ();
+    public abstract String place ();
 
     /**
      * Checks if bet is won or lost given result of spinning the wheel.

src/roulette/BetFactory.java

@@ -0,0 +1,44 @@
+package roulette;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ResourceBundle;
+
+import roulette.bets.OddEven;
+import roulette.bets.RedBlack;
+import roulette.bets.ThreeConsecutive;
+import util.ConsoleReader;
+
+public class BetFactory {
+	private String[] myPossibleBets = {
+	        "Red or Black",
+	        "Odd or Even",
+	        "Three in a Row"
+	    };
+
+	private String RedBlack = "roulette.RedBlack";
+	private String OddEven = "roulette.OddEven";
+	private String ThreeConsecutive = "roulette.ThreeConsecutive";
+
+	private ResourceBundle propertiesBundle = ResourceBundle.getBundle("util/factory");
+
+	public BetFactory() {
+
+	}
+
+	public Bet getBet() throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException, ClassNotFoundException {
+
+		System.out.println("You can make one of the following types of bets:");
+        for (int k = 0; k < myPossibleBets.length; k++) {
+            System.out.println(String.format("%d) %s", (k + 1), myPossibleBets[k]));
+        }
+
+        int response = ConsoleReader.promptRange("Please make a choice", 1, myPossibleBets.length);
+
+        Class bet = Class.forName(propertiesBundle.getString(myPossibleBets[response]));
+        Constructor c = bet.getConstructor(Integer.class, String.class);
+        return (Bet) c.newInstance(myPossibleBets[response], 1);
+
+
+	}
+}

src/roulette/Game.java

@@ -1,5 +1,7 @@
 package roulette;
 
+import java.lang.reflect.InvocationTargetException;
+
 import roulette.bets.OddEven;
 import roulette.bets.RedBlack;
 import roulette.bets.ThreeConsecutive;
@@ -15,11 +17,8 @@ public class Game {
     // name of the game
     private static final String DEFAULT_NAME = "Roulette";
     // add new bet subclasses here
-    private Bet[] myPossibleBets = {
-        new RedBlack("Red or Black", 1),
-        new OddEven("Odd or Even", 1),
-        new ThreeConsecutive("Three in a Row", 11),
-    };
+    private BetFactory betFactory;
+
     private Wheel myWheel;
 
     /**
@@ -68,11 +67,30 @@ public void play (Gambler player) {
      * Prompt the user to make a bet from a menu of choices.
      */
     private Bet promptForBet () {
-        System.out.println("You can make one of the following types of bets:");
-        for (int k = 0; k < myPossibleBets.length; k++) {
-            System.out.println(String.format("%d) %s", (k + 1), myPossibleBets[k]));
-        }
-        int response = ConsoleReader.promptRange("Please make a choice", 1, myPossibleBets.length);
-        return myPossibleBets[response - 1];
+        try {
+			return betFactory.getBet();
+		} catch (InstantiationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IllegalAccessException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IllegalArgumentException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (InvocationTargetException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (NoSuchMethodException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (SecurityException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (ClassNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return null;
     }
 }

src/roulette/OddEven.java

@@ -1,5 +1,6 @@
 package roulette;
 
+import roulette.Wheel.SpinResult;
 import util.ConsoleReader;
 
 
@@ -19,9 +20,14 @@ public String place () {
     /**
      * @see Bet#isMade(String, Wheel)
      */
-    @Override
     public boolean isMade (String betChoice, Wheel wheel) {
         return (wheel.getNumber() % 2 == 0 && betChoice.equals("even")) ||
                (wheel.getNumber() % 2 == 1 && betChoice.equals("odd"));
     }
+
+	@Override
+	public boolean isMade(SpinResult spinResult) {
+		// TODO Auto-generated method stub
+		return false;
+	}
 }

src/roulette/Wheel.java

@@ -96,7 +96,7 @@ private String getColor () {
     }
 
     // @return number of the current spot on the wheel
-    private int getNumber () {
+    int getNumber () {
         return myValue;
     }
 

src/util/factory.properties

@@ -0,0 +1,3 @@
+Red Or Black = roulette.RedBlack
+Odd Or Even = roulette.OddEven
+Three in a Row = roulette.ThreeConsecutive