Drop down options for account number

src/main/java/rocks/zipcode/atm/CashMachine.java

@@ -1,8 +1,12 @@
 package rocks.zipcode.atm;
 
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import rocks.zipcode.atm.bank.AccountData;
 import rocks.zipcode.atm.bank.Bank;
 
+import java.util.ArrayList;
+import java.util.Observable;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
@@ -15,13 +19,23 @@ public class CashMachine {
     private AccountData accountData = null;
 
     public CashMachine(Bank bank) {
+
         this.bank = bank;
+
+
     }
 
     private Consumer<AccountData> update = data -> {
         accountData = data;
     };
 
+    public ObservableList<Integer> getIdList() {
+
+        ObservableList<Integer> idList = FXCollections.observableArrayList(bank.getIdList());
+
+        return idList;
+    }
+
     public void login(int id) {
         tryCall(
                 () -> bank.getAccountById(id),

src/main/java/rocks/zipcode/atm/CashMachineApp.java

@@ -1,27 +1,36 @@
 package rocks.zipcode.atm;
 
-import javafx.scene.control.Label;
+import javafx.scene.control.*;
+import javafx.scene.layout.HBox;
 import javafx.stage.StageStyle;
 import rocks.zipcode.atm.bank.Bank;
 import javafx.application.Application;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextArea;
-import javafx.scene.control.TextField;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 import javafx.scene.layout.FlowPane;
 
+import java.util.HashMap;
+
 /**
  * @author ZipCodeWilmington
  */
 public class CashMachineApp extends Application {
 
+
+/*
+    HashMap<String, String> estados = EstadosBrasil.getEstados();
+for(Entry<String, String> e : estados.entrySet()){
+        Object obj = comboEstado.addItem();
+        comboEstado.setItemCaption(e.getKey(), e.getValue());
+        comboEstado.setValue(obj);
+    }*/
+
     private TextField field = new TextField();
     private TextField field2 = new TextField();
     private CashMachine cashMachine = new CashMachine(new Bank());
-
+    private ComboBox accountNumbers = new ComboBox(cashMachine.getIdList());
 
     private Parent createContent() {
         VBox vbox = new VBox(10);
@@ -60,7 +69,7 @@ public class CashMachineApp extends Application {
             areaInfo.setText(cashMachine.toString());
         });
 
-        Button btnExit = new Button("LogOut");
+        Button btnExit = new Button("Log Out");
         btnExit.setOnAction(e -> {
             cashMachine.exit();
             field.clear();
@@ -72,7 +81,7 @@ public class CashMachineApp extends Application {
 
         Button btnSubmit = new Button("Enter");
         btnSubmit.setOnAction(e -> {
-            int id = Integer.parseInt(field.getText());
+            int id = Integer.parseInt(accountNumbers.getValue().toString());
             cashMachine.login(id);
 
             areaInfo.setText(cashMachine.toString());
@@ -96,7 +105,7 @@ public class CashMachineApp extends Application {
         field.setStyle("-fx-background-color: beige;");
         field2.setStyle("-fx-background-color: beige;");
         Label fieldLabel = new Label("Account Number:");
-        vbox.getChildren().addAll(fieldLabel, field, flowpane, fieldLabel2, field2, flowpane2, accountInfo2, areaInfo);
+        vbox.getChildren().addAll(fieldLabel, accountNumbers, flowpane, fieldLabel2, field2, flowpane2, accountInfo2, areaInfo);
 
 
 
@@ -106,15 +115,17 @@ public class CashMachineApp extends Application {
     }
 
     @Override
-    public void start(Stage stage) throws Exception {
-        stage.setTitle("ZipCloud Bank");
-        stage.setScene(new Scene(createContent()));
-        stage.show();
+    public void start(Stage primarystage) throws Exception {
+        primarystage.setTitle("ZipCloud Bank");
+        primarystage.setScene(new Scene(createContent()));
+        primarystage.show();
 
     }
 
     public static void main(String[] args) {
+
         launch(args);
+
     }
 
 

src/main/java/rocks/zipcode/atm/bank/Bank.java

@@ -1,7 +1,10 @@
 package rocks.zipcode.atm.bank;
 
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import rocks.zipcode.atm.ActionResult;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -21,7 +24,7 @@ public class Bank {
         )));
 
         accounts.put(1010, new BasicAccount(new AccountData(
-                1000, "Dan Green", "dgreen@gmail.com", 100000
+                1010, "Dan Green", "dgreen@gmail.com", 100000
         )));
 
         accounts.put(2000, new PremiumAccount(new AccountData(
@@ -44,6 +47,18 @@ public class Bank {
     }
 
 */
+
+    public ObservableList<Integer> getIdList() {
+
+        ObservableList<Integer> idList = FXCollections.observableArrayList();
+
+        for (Integer key: accounts.keySet()) {
+
+            idList.add(key);
+        }
+            return idList;
+    }
+
     public ActionResult<AccountData> getAccountById(int id) {
         Account account = accounts.get(id);