Bläddra i källkod

abstractAcount

Roy 8 år sedan
förälder
incheckning
638995985c

+ 173
- 53
.idea/workspace.xml Visa fil

@@ -2,10 +2,11 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="268ab437-e0d5-4447-8401-9f321aad6d50" name="Default" comment="">
5
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" afterDir="false" />
6 5
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
7
-      <change beforePath="$PROJECT_DIR$/out/production/main/com/zipcodewilmington/bankaccountlab/Atm.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/main/com/zipcodewilmington/bankaccountlab/Atm.class" afterDir="false" />
8 6
       <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" />
7
+      <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" />
8
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java" afterDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" afterDir="false" />
9 10
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" afterDir="false" />
10 11
     </list>
11 12
     <ignored path="$PROJECT_DIR$/out/" />
@@ -39,8 +40,8 @@
39 40
       <file leaf-file-name="BankAccount.java" pinned="false" current-in-tab="false">
40 41
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java">
41 42
           <provider selected="true" editor-type-id="text-editor">
42
-            <state relative-caret-position="297">
43
-              <caret line="30" selection-start-line="30" selection-end-line="30" />
43
+            <state relative-caret-position="245">
44
+              <caret line="29" column="41" selection-start-line="29" selection-start-column="4" selection-end-line="29" selection-end-column="41" />
44 45
             </state>
45 46
           </provider>
46 47
         </entry>
@@ -48,8 +49,12 @@
48 49
       <file leaf-file-name="CheckingAccount.java" pinned="false" current-in-tab="false">
49 50
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
50 51
           <provider selected="true" editor-type-id="text-editor">
51
-            <state relative-caret-position="255">
52
-              <caret line="19" column="5" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
52
+            <state relative-caret-position="300">
53
+              <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
54
+              <folding>
55
+                <element signature="e#644#645#0" expanded="true" />
56
+                <element signature="e#684#685#0" expanded="true" />
57
+              </folding>
53 58
             </state>
54 59
           </provider>
55 60
         </entry>
@@ -57,8 +62,8 @@
57 62
       <file leaf-file-name="Atm.java" pinned="false" current-in-tab="true">
58 63
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Atm.java">
59 64
           <provider selected="true" editor-type-id="text-editor">
60
-            <state relative-caret-position="-125">
61
-              <caret line="35" column="76" selection-start-line="35" selection-start-column="76" selection-end-line="35" selection-end-column="76" />
65
+            <state relative-caret-position="194">
66
+              <caret line="19" column="8" lean-forward="true" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="8" />
62 67
               <folding>
63 68
                 <element signature="imports" expanded="true" />
64 69
               </folding>
@@ -70,7 +75,7 @@
70 75
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
71 76
           <provider selected="true" editor-type-id="text-editor">
72 77
             <state relative-caret-position="225">
73
-              <caret line="15" column="21" lean-forward="true" selection-start-line="15" selection-start-column="21" selection-end-line="15" selection-end-column="21" />
78
+              <caret line="15" column="21" selection-start-line="15" selection-start-column="21" selection-end-line="15" selection-end-column="21" />
74 79
             </state>
75 80
           </provider>
76 81
         </entry>
@@ -78,7 +83,7 @@
78 83
       <file leaf-file-name="testTest.java" pinned="false" current-in-tab="false">
79 84
         <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/testTest.java">
80 85
           <provider selected="true" editor-type-id="text-editor">
81
-            <state relative-caret-position="135">
86
+            <state relative-caret-position="120">
82 87
               <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
83 88
               <folding>
84 89
                 <element signature="imports" expanded="true" />
@@ -90,8 +95,12 @@
90 95
       <file leaf-file-name="SavingsAccount.java" pinned="false" current-in-tab="false">
91 96
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
92 97
           <provider selected="true" editor-type-id="text-editor">
93
-            <state relative-caret-position="285">
94
-              <caret line="21" column="15" selection-start-line="21" selection-start-column="15" selection-end-line="21" selection-end-column="15" />
98
+            <state relative-caret-position="291">
99
+              <caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" />
100
+              <folding>
101
+                <element signature="e#754#755#0" expanded="true" />
102
+                <element signature="e#794#795#0" expanded="true" />
103
+              </folding>
95 104
             </state>
96 105
           </provider>
97 106
         </entry>
@@ -99,8 +108,12 @@
99 108
       <file leaf-file-name="BusinessAccount.java" pinned="false" current-in-tab="false">
100 109
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
101 110
           <provider selected="true" editor-type-id="text-editor">
102
-            <state relative-caret-position="150">
103
-              <caret line="12" column="9" lean-forward="true" selection-start-line="12" selection-start-column="9" selection-end-line="12" selection-end-column="9" />
111
+            <state relative-caret-position="255">
112
+              <caret line="19" column="24" lean-forward="true" selection-start-line="19" selection-start-column="24" selection-end-line="19" selection-end-column="24" />
113
+              <folding>
114
+                <element signature="e#613#614#0" expanded="true" />
115
+                <element signature="e#637#638#0" expanded="true" />
116
+              </folding>
104 117
             </state>
105 118
           </provider>
106 119
         </entry>
@@ -148,19 +161,19 @@
148 161
         <option value="$PROJECT_DIR$/README.md" />
149 162
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java" />
150 163
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/checkingAccount.java" />
151
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" />
152 164
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" />
153 165
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/savingsAccount.java" />
154 166
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/SavingsAccountTest.java" />
155 167
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/businessAccount.java" />
156 168
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java" />
157
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" />
158
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java" />
159 169
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BusinessAccountTest.java" />
160 170
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" />
161 171
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/testTest.java" />
162
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" />
163 172
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" />
173
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" />
174
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java" />
175
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" />
176
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" />
164 177
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Atm.java" />
165 178
       </list>
166 179
     </option>
@@ -185,6 +198,9 @@
185 198
       <foldersAlwaysOnTop value="true" />
186 199
     </navigator>
187 200
     <panes>
201
+      <pane id="PackagesPane" />
202
+      <pane id="AndroidView" />
203
+      <pane id="Scope" />
188 204
       <pane id="ProjectPane">
189 205
         <subPane>
190 206
           <expand>
@@ -237,9 +253,6 @@
237 253
           <select />
238 254
         </subPane>
239 255
       </pane>
240
-      <pane id="Scope" />
241
-      <pane id="PackagesPane" />
242
-      <pane id="AndroidView" />
243 256
     </panes>
244 257
   </component>
245 258
   <component name="PropertiesComponent">
@@ -499,14 +512,12 @@
499 512
       <updated>1515620835041</updated>
500 513
       <workItem from="1528811890990" duration="598000" />
501 514
       <workItem from="1528996449711" duration="20849000" />
502
-      <workItem from="1529024548905" duration="24394000" />
515
+      <workItem from="1529024548905" duration="24593000" />
516
+      <workItem from="1530368916063" duration="2542000" />
503 517
     </task>
504 518
     <servers />
505 519
   </component>
506 520
   <component name="TestHistory">
507
-    <history-entry file="testTest_test1 - 2018.06.14 at 16h 37m 16s.xml">
508
-      <configuration name="testTest.test1" configurationId="JUnit" />
509
-    </history-entry>
510 521
     <history-entry file="com_zipcodewilmington_bankaccountlab_in_test - 2018.06.14 at 19h 07m 55s.xml">
511 522
       <configuration name="com.zipcodewilmington.bankaccountlab in test" configurationId="JUnit" />
512 523
     </history-entry>
@@ -534,9 +545,12 @@
534 545
     <history-entry file="com_zipcodewilmington_bankaccountlab_in_test - 2018.06.15 at 12h 04m 56s.xml">
535 546
       <configuration name="com.zipcodewilmington.bankaccountlab in test" configurationId="JUnit" />
536 547
     </history-entry>
548
+    <history-entry file="com_zipcodewilmington_bankaccountlab_in_test - 2018.06.30 at 10h 29m 42s.xml">
549
+      <configuration name="com.zipcodewilmington.bankaccountlab in test" configurationId="JUnit" />
550
+    </history-entry>
537 551
   </component>
538 552
   <component name="TimeTrackingManager">
539
-    <option name="totallyTimeSpent" value="45841000" />
553
+    <option name="totallyTimeSpent" value="48582000" />
540 554
   </component>
541 555
   <component name="ToolWindowManager">
542 556
     <frame x="0" y="23" width="1280" height="714" extended-state="0" />
@@ -548,16 +562,15 @@
548 562
       <window_info anchor="right" id="Palette&#9;" order="9" />
549 563
       <window_info id="Image Layers" order="7" />
550 564
       <window_info anchor="right" id="Capture Analysis" order="4" />
551
-      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.5054687" side_tool="true" visible="true" weight="0.33125" />
565
+      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50625" side_tool="true" visible="true" weight="0.33125" />
552 566
       <window_info anchor="right" id="Maven Projects" order="5" />
553 567
       <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
554
-      <window_info active="true" anchor="bottom" id="Run" order="3" sideWeight="0.49453124" visible="true" weight="0.33125" />
568
+      <window_info anchor="bottom" id="Run" order="3" sideWeight="0.49375" visible="true" weight="0.33125" />
555 569
       <window_info anchor="bottom" id="Version Control" order="10" />
556
-      <window_info anchor="right" id="Coverage" order="10" side_tool="true" weight="0.3296875" />
557 570
       <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49921876" weight="0.3281493" />
558 571
       <window_info id="Capture Tool" order="4" />
559 572
       <window_info id="Designer" order="2" />
560
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24921875" />
573
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24921875" />
561 574
       <window_info anchor="right" id="Database" order="8" />
562 575
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
563 576
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -569,9 +582,10 @@
569 582
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
570 583
       <window_info id="Nl-Palette" order="6" />
571 584
       <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
585
+      <window_info anchor="right" id="Coverage" order="10" side_tool="true" weight="0.3296875" />
572 586
       <window_info anchor="bottom" id="Message" order="1" />
573
-      <window_info anchor="right" id="Properties" order="6" />
574 587
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
588
+      <window_info anchor="right" id="Properties" order="6" />
575 589
       <window_info anchor="bottom" id="Find" order="2" />
576 590
     </layout>
577 591
   </component>
@@ -604,6 +618,100 @@
604 618
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
605 619
       <provider selected="true" editor-type-id="text-editor">
606 620
         <state relative-caret-position="255">
621
+          <caret line="19" column="5" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
622
+          <folding>
623
+            <element signature="e#644#645#0" expanded="true" />
624
+            <element signature="e#684#685#0" expanded="true" />
625
+          </folding>
626
+        </state>
627
+      </provider>
628
+    </entry>
629
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
630
+      <provider selected="true" editor-type-id="text-editor">
631
+        <state relative-caret-position="225">
632
+          <caret line="15" column="21" lean-forward="true" selection-start-line="15" selection-start-column="21" selection-end-line="15" selection-end-column="21" />
633
+        </state>
634
+      </provider>
635
+    </entry>
636
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/testTest.java">
637
+      <provider selected="true" editor-type-id="text-editor">
638
+        <state relative-caret-position="120">
639
+          <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
640
+          <folding>
641
+            <element signature="imports" expanded="true" />
642
+          </folding>
643
+        </state>
644
+      </provider>
645
+    </entry>
646
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
647
+      <provider selected="true" editor-type-id="text-editor">
648
+        <state relative-caret-position="285">
649
+          <caret line="21" column="15" selection-start-line="21" selection-start-column="15" selection-end-line="21" selection-end-column="15" />
650
+          <folding>
651
+            <element signature="e#754#755#0" expanded="true" />
652
+            <element signature="e#794#795#0" expanded="true" />
653
+          </folding>
654
+        </state>
655
+      </provider>
656
+    </entry>
657
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
658
+      <provider selected="true" editor-type-id="text-editor">
659
+        <state relative-caret-position="150">
660
+          <caret line="12" column="9" lean-forward="true" selection-start-line="12" selection-start-column="9" selection-end-line="12" selection-end-column="9" />
661
+          <folding>
662
+            <element signature="e#613#614#0" expanded="true" />
663
+            <element signature="e#637#638#0" expanded="true" />
664
+          </folding>
665
+        </state>
666
+      </provider>
667
+    </entry>
668
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BusinessAccountTest.java">
669
+      <provider selected="true" editor-type-id="text-editor">
670
+        <state relative-caret-position="165">
671
+          <caret line="12" column="25" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
672
+          <folding>
673
+            <element signature="imports" expanded="true" />
674
+          </folding>
675
+        </state>
676
+      </provider>
677
+    </entry>
678
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/SavingsAccountTest.java">
679
+      <provider selected="true" editor-type-id="text-editor">
680
+        <state relative-caret-position="240">
681
+          <caret line="17" column="5" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="5" />
682
+          <folding>
683
+            <element signature="imports" expanded="true" />
684
+          </folding>
685
+        </state>
686
+      </provider>
687
+    </entry>
688
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Atm.java">
689
+      <provider selected="true" editor-type-id="text-editor">
690
+        <state relative-caret-position="510">
691
+          <caret line="35" column="76" selection-start-line="35" selection-start-column="76" selection-end-line="35" selection-end-column="76" />
692
+          <folding>
693
+            <element signature="imports" expanded="true" />
694
+          </folding>
695
+        </state>
696
+      </provider>
697
+    </entry>
698
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
699
+      <provider selected="true" editor-type-id="text-editor">
700
+        <state relative-caret-position="75">
701
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
702
+        </state>
703
+      </provider>
704
+    </entry>
705
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java">
706
+      <provider selected="true" editor-type-id="text-editor">
707
+        <state relative-caret-position="390">
708
+          <caret line="30" selection-start-line="30" selection-end-line="30" />
709
+        </state>
710
+      </provider>
711
+    </entry>
712
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
713
+      <provider selected="true" editor-type-id="text-editor">
714
+        <state relative-caret-position="255">
607 715
           <caret line="19" column="5" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
608 716
         </state>
609 717
       </provider>
@@ -807,6 +915,16 @@
807 915
         </state>
808 916
       </provider>
809 917
     </entry>
918
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/testTest.java">
919
+      <provider selected="true" editor-type-id="text-editor">
920
+        <state relative-caret-position="120">
921
+          <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
922
+          <folding>
923
+            <element signature="imports" expanded="true" />
924
+          </folding>
925
+        </state>
926
+      </provider>
927
+    </entry>
810 928
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
811 929
       <provider selected="true" editor-type-id="text-editor">
812 930
         <state relative-caret-position="75">
@@ -816,53 +934,55 @@
816 934
     </entry>
817 935
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java">
818 936
       <provider selected="true" editor-type-id="text-editor">
819
-        <state relative-caret-position="297">
820
-          <caret line="30" selection-start-line="30" selection-end-line="30" />
937
+        <state relative-caret-position="245">
938
+          <caret line="29" column="41" selection-start-line="29" selection-start-column="4" selection-end-line="29" selection-end-column="41" />
821 939
         </state>
822 940
       </provider>
823 941
     </entry>
824
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/testTest.java">
942
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
825 943
       <provider selected="true" editor-type-id="text-editor">
826
-        <state relative-caret-position="135">
827
-          <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
944
+        <state relative-caret-position="255">
945
+          <caret line="19" column="24" lean-forward="true" selection-start-line="19" selection-start-column="24" selection-end-line="19" selection-end-column="24" />
828 946
           <folding>
829
-            <element signature="imports" expanded="true" />
947
+            <element signature="e#613#614#0" expanded="true" />
948
+            <element signature="e#637#638#0" expanded="true" />
830 949
           </folding>
831 950
         </state>
832 951
       </provider>
833 952
     </entry>
834
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
835
-      <provider selected="true" editor-type-id="text-editor">
836
-        <state relative-caret-position="285">
837
-          <caret line="21" column="15" selection-start-line="21" selection-start-column="15" selection-end-line="21" selection-end-column="15" />
838
-        </state>
839
-      </provider>
840
-    </entry>
841
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
953
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
842 954
       <provider selected="true" editor-type-id="text-editor">
843
-        <state relative-caret-position="150">
844
-          <caret line="12" column="9" lean-forward="true" selection-start-line="12" selection-start-column="9" selection-end-line="12" selection-end-column="9" />
955
+        <state relative-caret-position="300">
956
+          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
957
+          <folding>
958
+            <element signature="e#644#645#0" expanded="true" />
959
+            <element signature="e#684#685#0" expanded="true" />
960
+          </folding>
845 961
         </state>
846 962
       </provider>
847 963
     </entry>
848
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
964
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
849 965
       <provider selected="true" editor-type-id="text-editor">
850
-        <state relative-caret-position="255">
851
-          <caret line="19" column="5" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
966
+        <state relative-caret-position="291">
967
+          <caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" />
968
+          <folding>
969
+            <element signature="e#754#755#0" expanded="true" />
970
+            <element signature="e#794#795#0" expanded="true" />
971
+          </folding>
852 972
         </state>
853 973
       </provider>
854 974
     </entry>
855 975
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
856 976
       <provider selected="true" editor-type-id="text-editor">
857 977
         <state relative-caret-position="225">
858
-          <caret line="15" column="21" lean-forward="true" selection-start-line="15" selection-start-column="21" selection-end-line="15" selection-end-column="21" />
978
+          <caret line="15" column="21" selection-start-line="15" selection-start-column="21" selection-end-line="15" selection-end-column="21" />
859 979
         </state>
860 980
       </provider>
861 981
     </entry>
862 982
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Atm.java">
863 983
       <provider selected="true" editor-type-id="text-editor">
864
-        <state relative-caret-position="-125">
865
-          <caret line="35" column="76" selection-start-line="35" selection-start-column="76" selection-end-line="35" selection-end-column="76" />
984
+        <state relative-caret-position="194">
985
+          <caret line="19" column="8" lean-forward="true" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="8" />
866 986
           <folding>
867 987
             <element signature="imports" expanded="true" />
868 988
           </folding>

Binär
out/production/main/com/zipcodewilmington/bankaccountlab/Atm.class Visa fil


Binär
out/production/main/com/zipcodewilmington/bankaccountlab/BankAccount.class Visa fil


Binär
out/production/main/com/zipcodewilmington/bankaccountlab/BusinessAccount.class Visa fil


Binär
out/production/main/com/zipcodewilmington/bankaccountlab/CheckingAccount.class Visa fil


Binär
out/production/main/com/zipcodewilmington/bankaccountlab/SavingsAccount.class Visa fil


+ 13
- 11
src/main/java/com/zipcodewilmington/bankaccountlab/Atm.java Visa fil

@@ -1,12 +1,13 @@
1 1
 package com.zipcodewilmington.bankaccountlab;
2 2
 
3
+import java.util.ArrayList;
3 4
 import java.util.InputMismatchException;
4 5
 import java.util.Scanner;
5 6
 
6 7
 public class Atm {
7 8
 
8 9
     BankAccount account;
9
-    BankAccount[] accounts;
10
+    ArrayList<BankAccount> accounts;
10 11
     Scanner in = new Scanner(System.in);
11 12
 
12 13
     public String getNameFromUser (){
@@ -15,14 +16,14 @@ public class Atm {
15 16
         return name;
16 17
     }
17 18
 
18
-    public BankAccount[] accountsArray(int num, String name){
19
-        BankAccount[] accounts = new BankAccount[num];
20
-        for (int i=0; i<accounts.length; i++){
19
+    public ArrayList<BankAccount> accountsArray(int num, String name){
20
+        accounts = new ArrayList<>();
21
+        for (int i=0; i<num; i++){
21 22
             System.out.println("Enter account name");
22 23
             String str = in.next();
23 24
             System.out.println("Enter amount");
24 25
             double balance = in.nextDouble();
25
-            accounts[i] = Account.accessAccount(str, name, balance);
26
+            accounts.add(Account.accessAccount(str, name, balance));
26 27
         }
27 28
         return accounts;
28 29
     }
@@ -56,16 +57,17 @@ public class Atm {
56 57
         Scanner in = new Scanner(System.in);
57 58
         String name = getNameFromUser();
58 59
         while(welcome){
59
-            System.out.println("enter choice");
60
+            System.out.println("enter choice:\n 1 to open account\n 2 to deposit\n 3 to withdraw\n 4 to check balance\n 5 to exit");
60 61
             int response = in.nextInt();
61 62
             switch (response){
62 63
                 case 1:
63 64
                     System.out.println("how many accounts to open");
64 65
                     num = in.nextInt();
65
-                    accounts = accountsArray(num, name);
66
+                    accountsArray(num, name);
66 67
                     break;
67 68
                 case 2:
68 69
                     System.out.println("choose account to deposit to");
70
+                    selectedAccount = in.next();
69 71
                     AccountIfo(selectedAccount).depositMoney(getAmountFromUser());
70 72
                     break;
71 73
                 case 3:
@@ -74,11 +76,11 @@ public class Atm {
74 76
                     AccountIfo(selectedAccount).withDraw(getAmountFromUser());
75 77
                     break;
76 78
                 case 4:
77
-                    if(num == 1){
78
-                        System.out.println("Your "+ selectedAccount + " balance is " +
79
-                                AccountIfo(selectedAccount).getAmount());
79
+                    if(accounts.size() == 1){
80
+                        System.out.println("Your "+ accounts.get(0).accountName()+" account balance is " +
81
+                                AccountIfo(accounts.get(0).accountName()).getAmount());
80 82
                     }
81
-                    else if (num>1) {
83
+                    else if (accounts.size()>1) {
82 84
                         System.out.println("Enter account name");
83 85
                         selectedAccount = in.next();
84 86
                         System.out.println("Your " + selectedAccount + " balance is " +

+ 1
- 0
src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java Visa fil

@@ -27,6 +27,7 @@ public abstract class BankAccount {
27 27
         setAmount(balance);
28 28
         return balance;
29 29
     }
30
+    public abstract String accountName();
30 31
 
31 32
 
32 33
 

+ 4
- 0
src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java Visa fil

@@ -16,4 +16,8 @@ public class BusinessAccount extends BankAccount{
16 16
         return  balance;
17 17
     }
18 18
 
19
+    public String accountName(){
20
+        return "business";
21
+    }
22
+
19 23
 }

+ 4
- 0
src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java Visa fil

@@ -18,4 +18,8 @@ public class CheckingAccount extends BankAccount{
18 18
         super.setAmount(balance);
19 19
         return balance;
20 20
     }
21
+
22
+    public String accountName(){
23
+        return "checkings";
24
+    }
21 25
 }

+ 4
- 0
src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java Visa fil

@@ -26,4 +26,8 @@ public class SavingsAccount extends BankAccount{
26 26
         return balance;
27 27
     }
28 28
 
29
+    public String accountName(){
30
+        return "savings";
31
+    }
32
+
29 33
 }