Преглед изворни кода

having issues setting the accounts in the ATM

Chad пре 8 година
родитељ
комит
8f56e7b2bc

+ 71
- 55
.idea/workspace.xml Прегледај датотеку

2
 <project version="4">
2
 <project version="4">
3
   <component name="ChangeListManager">
3
   <component name="ChangeListManager">
4
     <list default="true" id="268ab437-e0d5-4447-8401-9f321aad6d50" name="Default" comment="">
4
     <list default="true" id="268ab437-e0d5-4447-8401-9f321aad6d50" name="Default" comment="">
5
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
6
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_0_0.xml" afterDir="false" />
7
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" />
8
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_2_0.xml" afterDir="false" />
9
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_2_0.xml" afterDir="false" />
10
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_opentest4j_opentest4j_1_1_0.xml" afterDir="false" />
11
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java" afterDir="false" />
12
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java" afterDir="false" />
13
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" afterDir="false" />
14
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Console.java" afterDir="false" />
15
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" afterDir="false" />
16
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java" afterDir="false" />
17
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BusinessAccountTest.java" afterDir="false" />
18
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" afterDir="false" />
19
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/SavingsAccountTest.java" afterDir="false" />
20
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
21
-      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
22
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
23
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
24
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" afterDir="false" />
5
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java" afterDir="false" />
25
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" afterDir="false" />
6
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java" afterDir="false" />
26
     </list>
8
     </list>
27
     <ignored path="$PROJECT_DIR$/out/" />
9
     <ignored path="$PROJECT_DIR$/out/" />
28
     <ignored path="$PROJECT_DIR$/target/" />
10
     <ignored path="$PROJECT_DIR$/target/" />
40
           <file leaf-file-name="ATM.java" pinned="false" current-in-tab="true">
22
           <file leaf-file-name="ATM.java" pinned="false" current-in-tab="true">
41
             <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java">
23
             <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java">
42
               <provider selected="true" editor-type-id="text-editor">
24
               <provider selected="true" editor-type-id="text-editor">
43
-                <state relative-caret-position="105">
44
-                  <caret line="7" column="25" lean-forward="true" selection-start-line="7" selection-start-column="25" selection-end-line="7" selection-end-column="25" />
25
+                <state relative-caret-position="192">
26
+                  <caret line="107" column="27" selection-start-line="107" selection-start-column="27" selection-end-line="107" selection-end-column="27" />
45
                   <folding>
27
                   <folding>
46
                     <element signature="e#219#220#0" expanded="true" />
28
                     <element signature="e#219#220#0" expanded="true" />
47
                     <element signature="e#250#251#0" expanded="true" />
29
                     <element signature="e#250#251#0" expanded="true" />
64
           <file leaf-file-name="MainApplication.java" pinned="false" current-in-tab="false">
46
           <file leaf-file-name="MainApplication.java" pinned="false" current-in-tab="false">
65
             <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
47
             <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
66
               <provider selected="true" editor-type-id="text-editor">
48
               <provider selected="true" editor-type-id="text-editor">
67
-                <state relative-caret-position="120">
68
-                  <caret line="8" selection-start-line="8" selection-end-line="8" />
49
+                <state relative-caret-position="150">
50
+                  <caret line="10" column="21" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="21" />
69
                 </state>
51
                 </state>
70
               </provider>
52
               </provider>
71
             </entry>
53
             </entry>
126
           <file leaf-file-name="ATMTest.java" pinned="false" current-in-tab="true">
108
           <file leaf-file-name="ATMTest.java" pinned="false" current-in-tab="true">
127
             <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java">
109
             <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java">
128
               <provider selected="true" editor-type-id="text-editor">
110
               <provider selected="true" editor-type-id="text-editor">
129
-                <state relative-caret-position="389">
130
-                  <caret line="30" column="32" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" />
111
+                <state relative-caret-position="139">
112
+                  <caret line="31" selection-start-line="31" selection-end-line="31" />
131
                   <folding>
113
                   <folding>
132
                     <element signature="imports" expanded="true" />
114
                     <element signature="imports" expanded="true" />
133
                   </folding>
115
                   </folding>
160
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java" />
142
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java" />
161
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" />
143
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" />
162
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Console.java" />
144
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Console.java" />
163
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java" />
164
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" />
165
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" />
145
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" />
166
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java" />
146
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java" />
147
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" />
148
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java" />
167
       </list>
149
       </list>
168
     </option>
150
     </option>
169
   </component>
151
   </component>
184
     <packageJsonPaths />
166
     <packageJsonPaths />
185
   </component>
167
   </component>
186
   <component name="ProjectFrameBounds">
168
   <component name="ProjectFrameBounds">
187
-    <option name="x" value="-96" />
188
-    <option name="y" value="-816" />
169
+    <option name="x" value="-121" />
170
+    <option name="y" value="-938" />
189
     <option name="width" value="1717" />
171
     <option name="width" value="1717" />
190
     <option name="height" value="849" />
172
     <option name="height" value="849" />
191
   </component>
173
   </component>
281
       </list>
263
       </list>
282
     </option>
264
     </option>
283
   </component>
265
   </component>
284
-  <component name="RunManager">
266
+  <component name="RunManager" selected="Application.MainApplication">
285
     <configuration default="true" type="Applet" factoryName="Applet">
267
     <configuration default="true" type="Applet" factoryName="Applet">
286
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
268
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
287
     </configuration>
269
     </configuration>
270
+    <configuration name="MainApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
271
+      <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.MainApplication" />
272
+      <module name="bankaccountlab" />
273
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
274
+      <extension name="coverage">
275
+        <pattern>
276
+          <option name="PATTERN" value="com.zipcodewilmington.bankaccountlab.*" />
277
+          <option name="ENABLED" value="true" />
278
+        </pattern>
279
+      </extension>
280
+    </configuration>
288
     <configuration default="true" type="Application" factoryName="Application">
281
     <configuration default="true" type="Application" factoryName="Application">
289
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
282
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
290
     </configuration>
283
     </configuration>
420
       <setting name="rowsRange" value="" />
413
       <setting name="rowsRange" value="" />
421
       <method />
414
       <method />
422
     </configuration>
415
     </configuration>
416
+    <list>
417
+      <item itemvalue="JUnit.ATMTest" />
418
+      <item itemvalue="Application.MainApplication" />
419
+    </list>
423
     <recent_temporary>
420
     <recent_temporary>
424
       <list>
421
       <list>
422
+        <item itemvalue="Application.MainApplication" />
425
         <item itemvalue="JUnit.ATMTest" />
423
         <item itemvalue="JUnit.ATMTest" />
426
       </list>
424
       </list>
427
     </recent_temporary>
425
     </recent_temporary>
436
       <option name="number" value="Default" />
434
       <option name="number" value="Default" />
437
       <option name="presentableId" value="Default" />
435
       <option name="presentableId" value="Default" />
438
       <updated>1515620835041</updated>
436
       <updated>1515620835041</updated>
439
-      <workItem from="1529100105765" duration="19016000" />
437
+      <workItem from="1529100105765" duration="20347000" />
440
     </task>
438
     </task>
441
     <servers />
439
     <servers />
442
   </component>
440
   </component>
456
     <history-entry file="ATMTest - 2018.06.16 at 16h 32m 38s.xml">
454
     <history-entry file="ATMTest - 2018.06.16 at 16h 32m 38s.xml">
457
       <configuration name="ATMTest" configurationId="JUnit" />
455
       <configuration name="ATMTest" configurationId="JUnit" />
458
     </history-entry>
456
     </history-entry>
457
+    <history-entry file="ATMTest - 2018.06.16 at 16h 38m 19s.xml">
458
+      <configuration name="ATMTest" configurationId="JUnit" />
459
+    </history-entry>
460
+    <history-entry file="ATMTest - 2018.06.16 at 16h 39m 04s.xml">
461
+      <configuration name="ATMTest" configurationId="JUnit" />
462
+    </history-entry>
463
+    <history-entry file="ATMTest - 2018.06.16 at 16h 39m 42s.xml">
464
+      <configuration name="ATMTest" configurationId="JUnit" />
465
+    </history-entry>
459
   </component>
466
   </component>
460
   <component name="TimeTrackingManager">
467
   <component name="TimeTrackingManager">
461
-    <option name="totallyTimeSpent" value="19016000" />
468
+    <option name="totallyTimeSpent" value="20347000" />
462
   </component>
469
   </component>
463
   <component name="ToolWindowManager">
470
   <component name="ToolWindowManager">
464
-    <frame x="-96" y="-816" width="1717" height="849" extended-state="0" />
471
+    <frame x="-121" y="-938" width="1717" height="849" extended-state="0" />
465
     <editor active="true" />
472
     <editor active="true" />
466
     <layout>
473
     <layout>
467
       <window_info anchor="right" id="Palette" order="3" />
474
       <window_info anchor="right" id="Palette" order="3" />
473
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5002912" side_tool="true" weight="0.32903227" />
480
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5002912" side_tool="true" weight="0.32903227" />
474
       <window_info anchor="right" id="Maven Projects" order="3" />
481
       <window_info anchor="right" id="Maven Projects" order="3" />
475
       <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
482
       <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
476
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.32903227" />
483
+      <window_info anchor="bottom" id="Run" order="2" weight="0.32903227" />
477
       <window_info anchor="bottom" id="Version Control" order="7" />
484
       <window_info anchor="bottom" id="Version Control" order="7" />
478
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.27225807" />
485
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.27225807" />
479
       <window_info id="Capture Tool" order="2" />
486
       <window_info id="Capture Tool" order="2" />
484
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
491
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
485
       <window_info id="UI Designer" order="2" />
492
       <window_info id="UI Designer" order="2" />
486
       <window_info anchor="right" id="Theme Preview" order="3" />
493
       <window_info anchor="right" id="Theme Preview" order="3" />
487
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
494
+      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.4" />
488
       <window_info id="Favorites" order="2" side_tool="true" />
495
       <window_info id="Favorites" order="2" side_tool="true" />
489
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
496
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
490
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
497
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
502
   <component name="VcsContentAnnotationSettings">
509
   <component name="VcsContentAnnotationSettings">
503
     <option name="myLimit" value="2678400000" />
510
     <option name="myLimit" value="2678400000" />
504
   </component>
511
   </component>
512
+  <component name="XDebuggerManager">
513
+    <breakpoint-manager>
514
+      <breakpoints>
515
+        <line-breakpoint enabled="true" type="java-line">
516
+          <url>file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java</url>
517
+          <line>29</line>
518
+          <properties />
519
+        </line-breakpoint>
520
+      </breakpoints>
521
+      <option name="time" value="1" />
522
+    </breakpoint-manager>
523
+  </component>
505
   <component name="editorHistoryManager">
524
   <component name="editorHistoryManager">
506
     <entry file="file://$PROJECT_DIR$/pom.xml">
525
     <entry file="file://$PROJECT_DIR$/pom.xml">
507
       <provider selected="true" editor-type-id="text-editor" />
526
       <provider selected="true" editor-type-id="text-editor" />
642
         </state>
661
         </state>
643
       </provider>
662
       </provider>
644
     </entry>
663
     </entry>
645
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
646
-      <provider selected="true" editor-type-id="text-editor">
647
-        <state relative-caret-position="120">
648
-          <caret line="8" selection-start-line="8" selection-end-line="8" />
649
-        </state>
650
-      </provider>
651
-    </entry>
652
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java">
664
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java">
653
       <provider selected="true" editor-type-id="text-editor">
665
       <provider selected="true" editor-type-id="text-editor">
654
         <state relative-caret-position="214">
666
         <state relative-caret-position="214">
681
         </state>
693
         </state>
682
       </provider>
694
       </provider>
683
     </entry>
695
     </entry>
696
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java">
697
+      <provider selected="true" editor-type-id="text-editor">
698
+        <state relative-caret-position="30">
699
+          <caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
700
+        </state>
701
+      </provider>
702
+    </entry>
703
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
704
+      <provider selected="true" editor-type-id="text-editor">
705
+        <state relative-caret-position="150">
706
+          <caret line="10" column="21" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="21" />
707
+        </state>
708
+      </provider>
709
+    </entry>
684
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java">
710
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java">
685
       <provider selected="true" editor-type-id="text-editor">
711
       <provider selected="true" editor-type-id="text-editor">
686
-        <state relative-caret-position="105">
687
-          <caret line="7" column="25" lean-forward="true" selection-start-line="7" selection-start-column="25" selection-end-line="7" selection-end-column="25" />
712
+        <state relative-caret-position="192">
713
+          <caret line="107" column="27" selection-start-line="107" selection-start-column="27" selection-end-line="107" selection-end-column="27" />
688
           <folding>
714
           <folding>
689
             <element signature="e#219#220#0" expanded="true" />
715
             <element signature="e#219#220#0" expanded="true" />
690
             <element signature="e#250#251#0" expanded="true" />
716
             <element signature="e#250#251#0" expanded="true" />
694
         </state>
720
         </state>
695
       </provider>
721
       </provider>
696
     </entry>
722
     </entry>
697
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java">
698
-      <provider selected="true" editor-type-id="text-editor">
699
-        <state relative-caret-position="389">
700
-          <caret line="30" column="32" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" />
701
-          <folding>
702
-            <element signature="imports" expanded="true" />
703
-          </folding>
704
-        </state>
705
-      </provider>
706
-    </entry>
707
   </component>
723
   </component>
708
   <component name="masterDetails">
724
   <component name="masterDetails">
709
     <states>
725
     <states>

+ 45
- 49
src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java Прегледај датотеку

6
     BankAccount account1;
6
     BankAccount account1;
7
     BankAccount account2;
7
     BankAccount account2;
8
     BankAccount account3;
8
     BankAccount account3;
9
-    BankAccount[] accounts = new BankAccount[]{account1,account2,account3};
9
+    BankAccount[] accounts = new BankAccount[]{account1, account2, account3};
10
 
10
 
11
-    public ATM(){
11
+    public ATM() {
12
 
12
 
13
     }
13
     }
14
 
14
 
20
         this.accounts = accounts;
20
         this.accounts = accounts;
21
     }
21
     }
22
 
22
 
23
-    public void runATM(){
23
+    public void runATM() {
24
         console.println("Welcome to the ATM! You may type \"leave\" at any word entry to close the application");
24
         console.println("Welcome to the ATM! You may type \"leave\" at any word entry to close the application");
25
         createAccounts();
25
         createAccounts();
26
 
26
 
27
-        boolean run =true;
28
-        while(run) {
27
+        boolean run = true;
28
+        while (run) {
29
             console.println("Here are your current accounts:");
29
             console.println("Here are your current accounts:");
30
             for (BankAccount account : accounts) {
30
             for (BankAccount account : accounts) {
31
-                console.println("\nOwner Name: " + account.getOwnerName()+"\nAccount Number: "+ account.getAccountNumber() + "\nCurrent Balance: " + account.getCurrentBalance());
31
+                console.println("\nOwner Name: " + account.getOwnerName() + "\nAccount Number: " + account.getAccountNumber() + "\nCurrent Balance: " + account.getCurrentBalance());
32
             }
32
             }
33
             int currentAccount = console.getIntInput("please enter your account number");
33
             int currentAccount = console.getIntInput("please enter your account number");
34
 
34
 
35
-            switch(console.getIntInput("What would you like to do?\n1.Transfer Funds\n2.Change An Account Owner\n")){
36
-                case (1) : transferFunds(currentAccount);
37
-                break;
38
-                case (2) : changeAccountOwner(currentAccount,console.getStringInput("What is the new name on the account?"));
39
-                break;
35
+            switch (console.getIntInput("What would you like to do?\n1.Transfer Funds\n2.Change An Account Owner\n")) {
36
+                case (1):
37
+                    transferFunds(currentAccount);
38
+                    break;
39
+                case (2):
40
+                    changeAccountOwner(currentAccount, console.getStringInput("What is the new name on the account?"));
41
+                    break;
40
                 default:
42
                 default:
41
-                console.println("Please enter the number associated with your choice");
43
+                    console.println("Please enter the number associated with your choice");
42
             }
44
             }
43
         }
45
         }
44
     }
46
     }
45
 
47
 
46
-    public void transferFunds(int account){
47
-        switch (console.getIntInput("What would you like to do?\n1.Deposit\n2.Withdraw\n3.Transfer to a different account")){
48
-            case (1) : deposit(account, console.getDoubleInput("How much would you like to deposit?"));
48
+    public void transferFunds(int account) {
49
+        switch (console.getIntInput("What would you like to do?\n1.Deposit\n2.Withdraw\n3.Transfer to a different account")) {
50
+            case (1):
51
+                deposit(account, console.getDoubleInput("How much would you like to deposit?"));
49
                 break;
52
                 break;
50
-            case (2) : withdraw(account,console.getDoubleInput("How much would you like to withdraw?"));
53
+            case (2):
54
+                withdraw(account, console.getDoubleInput("How much would you like to withdraw?"));
51
                 break;
55
                 break;
52
-            case (3) : transfer(account,console.getDoubleInput("How much would you like to transfer?"),console.getIntInput("Enter the account number you would like to transfer to"));
56
+            case (3):
57
+                transfer(account, console.getDoubleInput("How much would you like to transfer?"), console.getIntInput("Enter the account number you would like to transfer to"));
53
                 break;
58
                 break;
54
             default:
59
             default:
55
                 console.println("Please enter the number associated with your choice");
60
                 console.println("Please enter the number associated with your choice");
59
 
64
 
60
     public void withdraw(int currentAccount, double amount) {
65
     public void withdraw(int currentAccount, double amount) {
61
         for (BankAccount account : accounts) {
66
         for (BankAccount account : accounts) {
62
-            if (currentAccount == account.getAccountNumber()){
63
-                account.setCurrentBalance(account.getCurrentBalance()-amount);
67
+            if (currentAccount == account.getAccountNumber()) {
68
+                account.setCurrentBalance(account.getCurrentBalance() - amount);
64
             }
69
             }
65
         }
70
         }
66
     }
71
     }
67
 
72
 
68
     public void deposit(int currentAccount, double amount) {
73
     public void deposit(int currentAccount, double amount) {
69
         for (BankAccount account : accounts) {
74
         for (BankAccount account : accounts) {
70
-            if (currentAccount == account.getAccountNumber()){
71
-                account.setCurrentBalance(account.getCurrentBalance()+amount);
75
+            if (currentAccount == account.getAccountNumber()) {
76
+                account.setCurrentBalance(account.getCurrentBalance() + amount);
72
             }
77
             }
73
         }
78
         }
74
     }
79
     }
76
     public void transfer(int currentAccount, double amount, int transferTo) {
81
     public void transfer(int currentAccount, double amount, int transferTo) {
77
 
82
 
78
         for (BankAccount account : accounts) {
83
         for (BankAccount account : accounts) {
79
-            if (currentAccount == account.getAccountNumber()){
80
-                account.setCurrentBalance(account.getCurrentBalance()-amount);
84
+            if (currentAccount == account.getAccountNumber()) {
85
+                account.setCurrentBalance(account.getCurrentBalance() - amount);
81
             }
86
             }
82
-            if (transferTo == account.getAccountNumber()){
83
-                account.setCurrentBalance(account.getCurrentBalance()+amount);
87
+            if (transferTo == account.getAccountNumber()) {
88
+                account.setCurrentBalance(account.getCurrentBalance() + amount);
84
 
89
 
85
             }
90
             }
86
         }
91
         }
87
     }
92
     }
88
 
93
 
89
-    public void changeAccountOwner(int currentAccount, String newName){
94
+    public void changeAccountOwner(int currentAccount, String newName) {
90
         for (BankAccount account : accounts) {
95
         for (BankAccount account : accounts) {
91
-            if (currentAccount == account.getAccountNumber()){
96
+            if (currentAccount == account.getAccountNumber()) {
92
                 account.setOwnerName(newName);
97
                 account.setOwnerName(newName);
93
             }
98
             }
94
         }
99
         }
97
     public void createAccounts() {
102
     public void createAccounts() {
98
 
103
 
99
         for (BankAccount account : accounts) {
104
         for (BankAccount account : accounts) {
100
-            boolean creating = true;
101
-            while (creating) {
102
-                switch (console.getIntInput("What kind of account would you like to open?\n1.Business\n2.Checking\n3.Savings\n4.Skip")) {
103
-                    case (1):
104
-                        account = new BusinessAccount(console.getDoubleInput("How much would you like to deposit?"), console.getStringInput("What is your name?"));
105
-                        creating = false;
106
-                        break;
107
-                    case (2):
108
-                        account = new CheckingAccount(console.getDoubleInput("How much would you like to deposit?"), console.getStringInput("What is your name?"));
109
-                        creating = false;
110
-                        break;
111
-                    case (3):
112
-                        account = new SavingsAccount(console.getDoubleInput("How much would you like to deposit?"), console.getStringInput("What is your name?"));
113
-                        creating = false;
114
-                        break;
115
-                    case (4):
116
-                        account = null;
117
-                        creating = false;
118
-                        break;
119
-                    default:
120
-                        console.println("Please enter the number associated with your choice");
121
-                }
105
+
106
+            switch (console.getIntInput("What kind of account would you like to open?\n1.Business\n2.Checking\n3.Savings\n")) {
107
+                case (1):
108
+                    account = new BusinessAccount(console.getDoubleInput("How much would you like to deposit?"), console.getStringInput("What is your name?"));
109
+                    break;
110
+                case (2):
111
+                    account = new CheckingAccount(console.getDoubleInput("How much would you like to deposit?"), console.getStringInput("What is your name?"));
112
+                    break;
113
+                case (3):
114
+                    account = new SavingsAccount(console.getDoubleInput("How much would you like to deposit?"), console.getStringInput("What is your name?"));
115
+                    break;
116
+                default:
117
+                    console.println("Please enter the number associated with your choice");
122
             }
118
             }
123
         }
119
         }
124
     }
120
     }

+ 6
- 1
src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java Прегледај датотеку

4
  * Created by leon on 1/10/18.
4
  * Created by leon on 1/10/18.
5
  */
5
  */
6
 public class MainApplication {
6
 public class MainApplication {
7
-    ATM atm = new ATM();
7
+
8
+
9
+    public static void main(String[] args) {
10
+        ATM atm = new ATM();
11
+        atm.runATM();
12
+    }
8
 
13
 
9
 
14
 
10
 }
15
 }

+ 1
- 0
src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java Прегледај датотеку

29
     @Test
29
     @Test
30
     public void withdrawTest(){
30
     public void withdrawTest(){
31
         //Given
31
         //Given
32
+
32
         test.setAccounts(chads);
33
         test.setAccounts(chads);
33
         test.withdraw(chadsChecking.getAccountNumber(), 300);
34
         test.withdraw(chadsChecking.getAccountNumber(), 300);
34
         //When
35
         //When