jes85 jrl48

src/resources/resources.properties

@@ -0,0 +1,3 @@
+RedBlack=Red or Black,1
+OddEven=Odd or Even,1
+ThreeConsecutive=Three in a Row,11

src/roulette/Game.java

@@ -1,8 +1,6 @@
 package roulette;
 
-import roulette.bets.OddEven;
-import roulette.bets.RedBlack;
-import roulette.bets.ThreeConsecutive;
+import roulette.bets.BetFactory;
 import util.ConsoleReader;
 
 
@@ -14,19 +12,15 @@
 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 myBetFactory;
     private Wheel myWheel;
 
     /**
      * Construct the game.
      */
     public Game () {
         myWheel = new Wheel();
+        myBetFactory = new BetFactory();
     }
 
     /**
@@ -69,10 +63,8 @@ public void play (Gambler player) {
      */
     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];
+        System.out.println(myBetFactory.betChoicesToString());
+        int response = ConsoleReader.promptRange("Please make a choice", 1, myBetFactory.numBets());
+        return myBetFactory.makeBet(response);
     }
 }

src/roulette/bets/BetFactory.java

@@ -0,0 +1,75 @@
+package roulette.bets;
+
+import java.lang.reflect.Constructor;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.AbstractMap.SimpleEntry;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.Map.Entry;
+import roulette.Bet;
+import java.util.ResourceBundle;
+
+public class BetFactory {
+
+    private ResourceBundle myResources;
+    private List<String> myPossibleBets;
+    private List<Entry<String, Integer>> myBetInfos;
+
+
+    public BetFactory () {
+        myResources = ResourceBundle.getBundle("resources/resources");
+        myBetInfos = new ArrayList<Entry<String, Integer>>();
+        myPossibleBets = new ArrayList<String>();
+        init();
+    }
+
+    private void init() {
+        Enumeration<String> iter = myResources.getKeys();
+        while (iter.hasMoreElements()) {
+            String key = iter.nextElement();
+            String value = myResources.getString(key);
+            String[] info = value.split(",");
+            String description = info[0];
+            System.out.println(info[1]);
+            int odds = Integer.parseInt(info[1]);
+
+            Entry<String, Integer> entry = new SimpleEntry<>(description, odds);
+            myPossibleBets.add(key);
+            myBetInfos.add(entry);
+
+        }
+
+    }
+
+    public Bet makeBet(int betIndex)  {
+        String betClass = myPossibleBets.get(betIndex);
+        Entry<String, Integer> betInfo = myBetInfos.get(betIndex);
+        try {
+            Class<?> c = Class.forName(betClass);
+            Constructor<?> constructor = null;
+            constructor = c.getConstructor(String.class, Integer.class); 
+            Bet bet = (Bet) constructor.newInstance(betInfo.getKey(), betInfo.getValue());
+            return bet;
+        } catch (ReflectiveOperationException e){
+           // Deal with error
+            return null;
+        }
+
+    }
+
+    public int numBets() {
+        return myPossibleBets.size();
+    }
+
+    public String betChoicesToString() {
+        String betChoices = ""; 
+        for (int k = 0; k < myPossibleBets.size(); k++) {
+           betChoices += (String.format("%d) %s \n", (k + 1), myPossibleBets.get(k)));
+        }       
+        return betChoices;
+    }
+
+
+
+}

src/roulette/bets/OddEven.java

@@ -2,6 +2,7 @@
 
 import roulette.Bet;
 import roulette.Wheel;
+import roulette.Wheel.SpinResult;
 import util.ConsoleReader;
 
 

src/roulette/bets/RedBlack.java

@@ -2,6 +2,7 @@
 
 import roulette.Bet;
 import roulette.Wheel;
+import roulette.Wheel.SpinResult;
 import util.ConsoleReader;
 
 

src/roulette/bets/ThreeConsecutive.java

@@ -2,6 +2,7 @@
 
 import roulette.Bet;
 import roulette.Wheel;
+import roulette.Wheel.SpinResult;
 import util.ConsoleReader;