ZipCodeWilmington
/
ZCW-Inheritance-AbstractBankAccount
Volgen 4
Ster 1
Vork 36
Code Kwesties 0 Pull-aanvragen 24 Publicaties 0 Wiki Activiteit
Bladeren bron

updated bankaccount class with withdraw and deposit function

William Simkins 8 jaren geleden
bovenliggende
46b587fb18
commit
4f20d15a84
2 gewijzigde bestanden met toevoegingen van 160 en 308 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 158
    306
      .idea/workspace.xml
  2. 2
    2
      src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java

+ 158
- 306
.idea/workspace.xml Bestand weergeven 

@@ -13,20 +13,20 @@
13 13 
   </component>
14 14 
   <component name="FileEditorManager">
15 15 
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
16 
-      <file leaf-file-name="BankAccount.java" pinned="false" current-in-tab="true">
17 
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java">
16 
+      <file leaf-file-name="MainApplication.java" pinned="false" current-in-tab="true">
17 
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
18 18 
           <provider selected="true" editor-type-id="text-editor">
19 
-            <state relative-caret-position="447">
20 
-              <caret line="50" column="69" selection-start-line="50" selection-start-column="69" selection-end-line="50" selection-end-column="69" />
19 
+            <state relative-caret-position="180">
20 
+              <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
21 21 
             </state>
22 22 
           </provider>
23 23 
         </entry>
24 24 
       </file>
25 
-      <file leaf-file-name="BankAccountTest.java" pinned="false" current-in-tab="false">
26 
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java">
25 
+      <file leaf-file-name="BankAccount.java" pinned="false" current-in-tab="false">
26 
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java">
27 27 
           <provider selected="true" editor-type-id="text-editor">
28 
-            <state relative-caret-position="75">
29 
-              <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
28 
+            <state relative-caret-position="635">
29 
+              <caret line="50" column="69" selection-start-line="50" selection-start-column="69" selection-end-line="50" selection-end-column="69" />
30 30 
             </state>
31 31 
           </provider>
32 32 
         </entry>
 
@@ -45,24 +45,6 @@
45 45 
           <provider selected="true" editor-type-id="text-editor">
46 46 
             <state relative-caret-position="270">
47 47 
               <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
48 
-              <folding>
49 
-                <element signature="e#234#235#0" expanded="true" />
50 
-                <element signature="e#287#288#0" expanded="true" />
51 
-                <element signature="e#359#360#0" expanded="true" />
52 
-                <element signature="e#411#412#0" expanded="true" />
53 
-                <element signature="e#440#441#0" expanded="true" />
54 
-                <element signature="e#466#467#0" expanded="true" />
55 
-                <element signature="e#503#504#0" expanded="true" />
56 
-                <element signature="e#533#534#0" expanded="true" />
57 
-                <element signature="e#578#579#0" expanded="true" />
58 
-                <element signature="e#620#621#0" expanded="true" />
59 
-                <element signature="e#689#690#0" expanded="true" />
60 
-                <element signature="e#751#752#0" expanded="true" />
61 
-                <element signature="e#794#795#0" expanded="true" />
62 
-                <element signature="e#835#836#0" expanded="true" />
63 
-                <element signature="e#902#903#0" expanded="true" />
64 
-                <element signature="e#962#963#0" expanded="true" />
65 
-              </folding>
66 48 
             </state>
67 49 
           </provider>
68 50 
         </entry>
 
@@ -71,25 +53,7 @@
71 53 
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
72 54 
           <provider selected="true" editor-type-id="text-editor">
73 55 
             <state relative-caret-position="268">
74 
-              <caret line="18" column="48" lean-forward="true" selection-start-line="18" selection-start-column="48" selection-end-line="18" selection-end-column="48" />
75 
-              <folding>
76 
-                <element signature="e#534#535#0" expanded="true" />
77 
-                <element signature="e#587#588#0" expanded="true" />
78 
-                <element signature="e#659#660#0" expanded="true" />
79 
-                <element signature="e#711#712#0" expanded="true" />
80 
-                <element signature="e#740#741#0" expanded="true" />
81 
-                <element signature="e#766#767#0" expanded="true" />
82 
-                <element signature="e#803#804#0" expanded="true" />
83 
-                <element signature="e#833#834#0" expanded="true" />
84 
-                <element signature="e#878#879#0" expanded="true" />
85 
-                <element signature="e#920#921#0" expanded="true" />
86 
-                <element signature="e#989#990#0" expanded="true" />
87 
-                <element signature="e#1051#1052#0" expanded="true" />
88 
-                <element signature="e#1094#1095#0" expanded="true" />
89 
-                <element signature="e#1135#1136#0" expanded="true" />
90 
-                <element signature="e#1202#1203#0" expanded="true" />
91 
-                <element signature="e#1262#1263#0" expanded="true" />
92 
-              </folding>
56 
+              <caret line="18" column="48" selection-start-line="18" selection-start-column="48" selection-end-line="18" selection-end-column="48" />
93 57 
             </state>
94 58 
           </provider>
95 59 
         </entry>
 
@@ -97,26 +61,8 @@
97 61 
       <file leaf-file-name="BusinessAccount.java" pinned="false" current-in-tab="false">
98 62 
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
99 63 
           <provider selected="true" editor-type-id="text-editor">
100 
-            <state relative-caret-position="306">
101 
-              <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
102 
-              <folding>
103 
-                <element signature="e#539#540#0" expanded="true" />
104 
-                <element signature="e#592#593#0" expanded="true" />
105 
-                <element signature="e#664#665#0" expanded="true" />
106 
-                <element signature="e#716#717#0" expanded="true" />
107 
-                <element signature="e#745#746#0" expanded="true" />
108 
-                <element signature="e#771#772#0" expanded="true" />
109 
-                <element signature="e#732#733#0" expanded="true" />
110 
-                <element signature="e#762#763#0" expanded="true" />
111 
-                <element signature="e#883#884#0" expanded="true" />
112 
-                <element signature="e#925#926#0" expanded="true" />
113 
-                <element signature="e#939#940#0" expanded="true" />
114 
-                <element signature="e#969#970#0" expanded="true" />
115 
-                <element signature="e#1099#1100#0" expanded="true" />
116 
-                <element signature="e#1140#1141#0" expanded="true" />
117 
-                <element signature="e#1056#1057#0" expanded="true" />
118 
-                <element signature="e#1086#1087#0" expanded="true" />
119 
-              </folding>
64 
+            <state relative-caret-position="211">
65 
+              <caret line="24" selection-start-line="24" selection-end-line="24" />
120 66 
             </state>
121 67 
           </provider>
122 68 
         </entry>
 
@@ -124,8 +70,8 @@
124 70 
       <file leaf-file-name="BusinessAccountTest.java" pinned="false" current-in-tab="false">
125 71 
         <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BusinessAccountTest.java">
126 72 
           <provider selected="true" editor-type-id="text-editor">
127 
-            <state relative-caret-position="150">
128 
-              <caret line="10" column="31" lean-forward="true" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
73 
+            <state relative-caret-position="-304">
74 
+              <caret line="10" column="31" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
129 75 
               <folding>
130 76 
                 <element signature="imports" expanded="true" />
131 77 
               </folding>
 
@@ -137,7 +83,7 @@
137 83 
         <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java">
138 84 
           <provider selected="true" editor-type-id="text-editor">
139 85 
             <state relative-caret-position="345">
140 
-              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
86 
+              <caret line="23" selection-start-line="23" selection-end-line="23" />
141 87 
               <folding>
142 88 
                 <element signature="imports" expanded="true" />
143 89 
               </folding>
 
@@ -149,7 +95,7 @@
149 95 
         <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/SavingsAccountTest.java">
150 96 
           <provider selected="true" editor-type-id="text-editor">
151 97 
             <state relative-caret-position="255">
152 
-              <caret line="17" column="32" lean-forward="true" selection-start-line="17" selection-start-column="32" selection-end-line="17" selection-end-column="32" />
98 
+              <caret line="17" column="32" selection-start-line="17" selection-start-column="32" selection-end-line="17" selection-end-column="32" />
153 99 
               <folding>
154 100 
                 <element signature="imports" expanded="true" />
155 101 
               </folding>
 
@@ -160,8 +106,8 @@
160 106 
       <file leaf-file-name="Console.java" pinned="false" current-in-tab="false">
161 107 
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Console.java">
162 108 
           <provider selected="true" editor-type-id="text-editor">
163 
-            <state relative-caret-position="514">
164 
-              <caret line="36" column="25" lean-forward="true" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" />
109 
+            <state relative-caret-position="540">
110 
+              <caret line="36" column="25" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" />
165 111 
             </state>
166 112 
           </provider>
167 113 
         </entry>
 
@@ -193,6 +139,7 @@
193 139 
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" />
194 140 
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" />
195 141 
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" />
142 
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" />
196 143 
       </list>
197 144 
     </option>
198 145 
   </component>
 
@@ -212,11 +159,10 @@
212 159 
   <component name="NodePackageJsonFileManager">
213 160 
     <packageJsonPaths />
214 161 
   </component>
215 
-  <component name="ProjectFrameBounds" extendedState="6">
216 
-    <option name="x" value="-17" />
162 
+  <component name="ProjectFrameBounds">
217 163 
     <option name="y" value="23" />
218 164 
     <option name="width" value="1280" />
219 
-    <option name="height" value="722" />
165 
+    <option name="height" value="730" />
220 166 
   </component>
221 167 
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
222 168 
     <ConfirmationsSetting value="1" id="Add" />
 
@@ -226,8 +172,6 @@
226 172 
       <foldersAlwaysOnTop value="true" />
227 173 
     </navigator>
228 174 
     <panes>
229 
-      <pane id="Scope" />
230 
-      <pane id="AndroidView" />
231 175 
       <pane id="ProjectPane">
232 176 
         <subPane>
233 177 
           <expand>
 
@@ -287,6 +231,8 @@
287 231 
         </subPane>
288 232 
       </pane>
289 233 
       <pane id="PackagesPane" />
234 
+      <pane id="Scope" />
235 
+      <pane id="AndroidView" />
290 236 
     </panes>
291 237 
   </component>
292 238 
   <component name="PropertiesComponent">
 
@@ -320,7 +266,7 @@
320 266 
       </list>
321 267 
     </option>
322 268 
   </component>
323 
-  <component name="RunManager" selected="Application.BankAccount">
269 
+  <component name="RunManager" selected="Application.MainApplication">
324 270 
     <configuration default="true" type="Applet" factoryName="Applet">
325 271 
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
326 272 
     </configuration>
 
@@ -335,33 +281,21 @@
335 281 
         </pattern>
336 282 
       </extension>
337 283 
     </configuration>
338 
-    <configuration default="true" type="Application" factoryName="Application">
339 
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
340 
-    </configuration>
341 
-    <configuration name="CheckingAccountTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
284 
+    <configuration name="MainApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
285 
+      <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.MainApplication" />
342 286 
       <module name="bankaccountlab" />
287 
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
343 288 
       <extension name="coverage">
344 289 
         <pattern>
345 290 
           <option name="PATTERN" value="com.zipcodewilmington.bankaccountlab.*" />
346 291 
           <option name="ENABLED" value="true" />
347 292 
         </pattern>
348 293 
       </extension>
349 
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
350 
-      <option name="ALTERNATIVE_JRE_PATH" />
351 
-      <option name="PACKAGE_NAME" value="com.zipcodewilmington.bankaccountlab" />
352 
-      <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.CheckingAccountTest" />
353 
-      <option name="METHOD_NAME" />
354 
-      <option name="TEST_OBJECT" value="class" />
355 
-      <option name="VM_PARAMETERS" value="-ea" />
356 
-      <option name="PARAMETERS" />
357 
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
358 
-      <option name="PASS_PARENT_ENVS" value="true" />
359 
-      <option name="TEST_SEARCH_SCOPE">
360 
-        <value defaultName="singleModule" />
361 
-      </option>
362 
-      <patterns />
363 294 
     </configuration>
364 
-    <configuration name="CheckingAccountTest.testDeposit" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
295 
+    <configuration default="true" type="Application" factoryName="Application">
296 
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
297 
+    </configuration>
298 
+    <configuration name="CheckingAccountTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
365 299 
       <module name="bankaccountlab" />
366 300 
       <extension name="coverage">
367 301 
         <pattern>
 
@@ -373,8 +307,8 @@
373 307 
       <option name="ALTERNATIVE_JRE_PATH" />
374 308 
       <option name="PACKAGE_NAME" value="com.zipcodewilmington.bankaccountlab" />
375 309 
       <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.CheckingAccountTest" />
376 
-      <option name="METHOD_NAME" value="testDeposit" />
377 
-      <option name="TEST_OBJECT" value="method" />
310 
+      <option name="METHOD_NAME" />
311 
+      <option name="TEST_OBJECT" value="class" />
378 312 
       <option name="VM_PARAMETERS" value="-ea" />
379 313 
       <option name="PARAMETERS" />
380 314 
       <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
 
@@ -509,19 +443,19 @@
509 443 
       <method />
510 444 
     </configuration>
511 445 
     <list>
512 
-      <item itemvalue="JUnit.CheckingAccountTest.testDeposit" />
513 446 
       <item itemvalue="JUnit.CheckingAccountTest.testDeposit2" />
514 447 
       <item itemvalue="JUnit.CheckingAccountTest" />
515 448 
       <item itemvalue="JUnit.SavingsAccountTest" />
516 449 
       <item itemvalue="Application.BankAccount" />
450 
+      <item itemvalue="Application.MainApplication" />
517 451 
     </list>
518 452 
     <recent_temporary>
519 453 
       <list>
454 
+        <item itemvalue="Application.MainApplication" />
520 455 
         <item itemvalue="Application.BankAccount" />
521 456 
         <item itemvalue="JUnit.SavingsAccountTest" />
522 457 
         <item itemvalue="JUnit.CheckingAccountTest" />
523 458 
         <item itemvalue="JUnit.CheckingAccountTest.testDeposit2" />
524 
-        <item itemvalue="JUnit.CheckingAccountTest.testDeposit" />
525 459 
       </list>
526 460 
     </recent_temporary>
527 461 
   </component>
 
@@ -538,6 +472,7 @@
538 472 
       <workItem from="1528839645339" duration="5064000" />
539 473 
       <workItem from="1529265876755" duration="1341000" />
540 474 
       <workItem from="1529409320058" duration="14641000" />
475 
+      <workItem from="1529933678402" duration="465000" />
541 476 
     </task>
542 477 
     <servers />
543 478 
   </component>
 
@@ -574,41 +509,41 @@
574 509 
     </history-entry>
575 510 
   </component>
576 511 
   <component name="TimeTrackingManager">
577 
-    <option name="totallyTimeSpent" value="21046000" />
512 
+    <option name="totallyTimeSpent" value="21511000" />
578 513 
   </component>
579 514 
   <component name="ToolWindowManager">
580 
-    <frame x="0" y="23" width="1280" height="722" extended-state="6" />
515 
+    <frame x="0" y="23" width="1280" height="730" extended-state="6" />
581 516 
     <editor active="true" />
582 517 
     <layout>
583 518 
       <window_info anchor="right" id="Palette" order="3" />
584 519 
       <window_info anchor="bottom" id="TODO" order="6" />
585 
-      <window_info anchor="bottom" id="Messages" weight="0.3296" />
586 520 
       <window_info anchor="right" id="Palette&#9;" order="3" />
587 521 
       <window_info id="Image Layers" order="2" />
588 522 
       <window_info anchor="right" id="Capture Analysis" order="3" />
589 523 
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" weight="0.3296" />
590 524 
       <window_info anchor="right" id="Maven Projects" order="3" />
591 525 
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
592 
-      <window_info anchor="bottom" id="Version Control" order="7" />
593 526 
       <window_info anchor="bottom" id="Run" order="2" weight="0.3296" />
594 
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.3287037" />
527 
+      <window_info anchor="bottom" id="Version Control" order="7" />
528 
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.328594" />
595 529 
       <window_info id="Capture Tool" order="2" />
596 530 
       <window_info id="Designer" order="2" />
597 
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26171243" />
531 
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2657512" />
598 532 
       <window_info anchor="right" id="Database" order="4" />
599 533 
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
600 534 
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
601 535 
       <window_info id="UI Designer" order="2" />
602 536 
       <window_info anchor="right" id="Theme Preview" order="3" />
603 
-      <window_info id="Favorites" order="2" side_tool="true" />
604 537 
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
605 
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
606 
-      <window_info id="Nl-Palette" order="2" />
538 
+      <window_info id="Favorites" order="2" side_tool="true" />
539 
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.3296" />
607 540 
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
608 541 
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
542 
+      <window_info id="Nl-Palette" order="2" />
543 
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
609 544 
       <window_info anchor="right" id="Properties" order="3" />
610 545 
       <window_info anchor="bottom" id="Message" order="0" />
611 
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
546 
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
612 547 
       <window_info anchor="bottom" id="Find" order="1" />
613 548 
     </layout>
614 549 
   </component>
 
@@ -624,6 +559,85 @@
624 559 
     </breakpoint-manager>
625 560 
   </component>
626 561 
   <component name="editorHistoryManager">
562 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java">
563 
+      <provider selected="true" editor-type-id="text-editor">
564 
+        <state relative-caret-position="750">
565 
+          <caret line="50" column="69" selection-start-line="50" selection-start-column="69" selection-end-line="50" selection-end-column="69" />
566 
+        </state>
567 
+      </provider>
568 
+    </entry>
569 
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java">
570 
+      <provider selected="true" editor-type-id="text-editor">
571 
+        <state relative-caret-position="75">
572 
+          <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
573 
+        </state>
574 
+      </provider>
575 
+    </entry>
576 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
577 
+      <provider selected="true" editor-type-id="text-editor">
578 
+        <state relative-caret-position="30">
579 
+          <caret line="2" column="22" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
580 
+        </state>
581 
+      </provider>
582 
+    </entry>
583 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
584 
+      <provider selected="true" editor-type-id="text-editor">
585 
+        <state relative-caret-position="270">
586 
+          <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
587 
+        </state>
588 
+      </provider>
589 
+    </entry>
590 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
591 
+      <provider selected="true" editor-type-id="text-editor">
592 
+        <state relative-caret-position="270">
593 
+          <caret line="18" column="48" lean-forward="true" selection-start-line="18" selection-start-column="48" selection-end-line="18" selection-end-column="48" />
594 
+        </state>
595 
+      </provider>
596 
+    </entry>
597 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
598 
+      <provider selected="true" editor-type-id="text-editor">
599 
+        <state relative-caret-position="360">
600 
+          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
601 
+        </state>
602 
+      </provider>
603 
+    </entry>
604 
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BusinessAccountTest.java">
605 
+      <provider selected="true" editor-type-id="text-editor">
606 
+        <state relative-caret-position="150">
607 
+          <caret line="10" column="31" lean-forward="true" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
608 
+          <folding>
609 
+            <element signature="imports" expanded="true" />
610 
+          </folding>
611 
+        </state>
612 
+      </provider>
613 
+    </entry>
614 
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java">
615 
+      <provider selected="true" editor-type-id="text-editor">
616 
+        <state relative-caret-position="345">
617 
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
618 
+          <folding>
619 
+            <element signature="imports" expanded="true" />
620 
+          </folding>
621 
+        </state>
622 
+      </provider>
623 
+    </entry>
624 
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/SavingsAccountTest.java">
625 
+      <provider selected="true" editor-type-id="text-editor">
626 
+        <state relative-caret-position="255">
627 
+          <caret line="17" column="32" lean-forward="true" selection-start-line="17" selection-start-column="32" selection-end-line="17" selection-end-column="32" />
628 
+          <folding>
629 
+            <element signature="imports" expanded="true" />
630 
+          </folding>
631 
+        </state>
632 
+      </provider>
633 
+    </entry>
634 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Console.java">
635 
+      <provider selected="true" editor-type-id="text-editor">
636 
+        <state relative-caret-position="540">
637 
+          <caret line="36" column="25" lean-forward="true" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" />
638 
+        </state>
639 
+      </provider>
640 
+    </entry>
627 641 
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
628 642 
       <provider selected="true" editor-type-id="text-editor">
629 643 
         <state relative-caret-position="75">
 
@@ -656,24 +670,6 @@
656 670 
       <provider selected="true" editor-type-id="text-editor">
657 671 
         <state relative-caret-position="60">
658 672 
           <caret line="5" column="16" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />
659 
-          <folding>
660 
-            <element signature="e#234#235#0" expanded="true" />
661 
-            <element signature="e#287#288#0" expanded="true" />
662 
-            <element signature="e#359#360#0" expanded="true" />
663 
-            <element signature="e#411#412#0" expanded="true" />
664 
-            <element signature="e#440#441#0" expanded="true" />
665 
-            <element signature="e#466#467#0" expanded="true" />
666 
-            <element signature="e#503#504#0" expanded="true" />
667 
-            <element signature="e#533#534#0" expanded="true" />
668 
-            <element signature="e#578#579#0" expanded="true" />
669 
-            <element signature="e#620#621#0" expanded="true" />
670 
-            <element signature="e#689#690#0" expanded="true" />
671 
-            <element signature="e#751#752#0" expanded="true" />
672 
-            <element signature="e#794#795#0" expanded="true" />
673 
-            <element signature="e#835#836#0" expanded="true" />
674 
-            <element signature="e#902#903#0" expanded="true" />
675 
-            <element signature="e#962#963#0" expanded="true" />
676 
-          </folding>
677 673 
         </state>
678 674 
       </provider>
679 675 
     </entry>
 
@@ -681,24 +677,6 @@
681 677 
       <provider selected="true" editor-type-id="text-editor">
682 678 
         <state relative-caret-position="60">
683 679 
           <caret line="5" column="16" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />
684 
-          <folding>
685 
-            <element signature="e#534#535#0" expanded="true" />
686 
-            <element signature="e#587#588#0" expanded="true" />
687 
-            <element signature="e#659#660#0" expanded="true" />
688 
-            <element signature="e#711#712#0" expanded="true" />
689 
-            <element signature="e#740#741#0" expanded="true" />
690 
-            <element signature="e#766#767#0" expanded="true" />
691 
-            <element signature="e#803#804#0" expanded="true" />
692 
-            <element signature="e#833#834#0" expanded="true" />
693 
-            <element signature="e#878#879#0" expanded="true" />
694 
-            <element signature="e#920#921#0" expanded="true" />
695 
-            <element signature="e#989#990#0" expanded="true" />
696 
-            <element signature="e#1051#1052#0" expanded="true" />
697 
-            <element signature="e#1094#1095#0" expanded="true" />
698 
-            <element signature="e#1135#1136#0" expanded="true" />
699 
-            <element signature="e#1202#1203#0" expanded="true" />
700 
-            <element signature="e#1262#1263#0" expanded="true" />
701 
-          </folding>
702 680 
         </state>
703 681 
       </provider>
704 682 
     </entry>
 
@@ -723,24 +701,6 @@
723 701 
       <provider selected="true" editor-type-id="text-editor">
724 702 
         <state relative-caret-position="150">
725 703 
           <caret line="11" column="23" lean-forward="true" selection-start-line="11" selection-start-column="23" selection-end-line="11" selection-end-column="23" />
726 
-          <folding>
727 
-            <element signature="e#539#540#0" expanded="true" />
728 
-            <element signature="e#592#593#0" expanded="true" />
729 
-            <element signature="e#664#665#0" expanded="true" />
730 
-            <element signature="e#716#717#0" expanded="true" />
731 
-            <element signature="e#745#746#0" expanded="true" />
732 
-            <element signature="e#771#772#0" expanded="true" />
733 
-            <element signature="e#732#733#0" expanded="true" />
734 
-            <element signature="e#762#763#0" expanded="true" />
735 
-            <element signature="e#883#884#0" expanded="true" />
736 
-            <element signature="e#925#926#0" expanded="true" />
737 
-            <element signature="e#939#940#0" expanded="true" />
738 
-            <element signature="e#969#970#0" expanded="true" />
739 
-            <element signature="e#1099#1100#0" expanded="true" />
740 
-            <element signature="e#1140#1141#0" expanded="true" />
741 
-            <element signature="e#1056#1057#0" expanded="true" />
742 
-            <element signature="e#1086#1087#0" expanded="true" />
743 
-          </folding>
744 704 
         </state>
745 705 
       </provider>
746 706 
     </entry>
 
@@ -769,24 +729,6 @@
769 729 
       <provider selected="true" editor-type-id="text-editor">
770 730 
         <state relative-caret-position="30">
771 731 
           <caret line="2" column="44" selection-start-line="2" selection-start-column="44" selection-end-line="2" selection-end-column="44" />
772 
-          <folding>
773 
-            <element signature="e#234#235#0" expanded="true" />
774 
-            <element signature="e#287#288#0" expanded="true" />
775 
-            <element signature="e#359#360#0" expanded="true" />
776 
-            <element signature="e#411#412#0" expanded="true" />
777 
-            <element signature="e#440#441#0" expanded="true" />
778 
-            <element signature="e#466#467#0" expanded="true" />
779 
-            <element signature="e#503#504#0" expanded="true" />
780 
-            <element signature="e#533#534#0" expanded="true" />
781 
-            <element signature="e#578#579#0" expanded="true" />
782 
-            <element signature="e#620#621#0" expanded="true" />
783 
-            <element signature="e#689#690#0" expanded="true" />
784 
-            <element signature="e#751#752#0" expanded="true" />
785 
-            <element signature="e#794#795#0" expanded="true" />
786 
-            <element signature="e#835#836#0" expanded="true" />
787 
-            <element signature="e#902#903#0" expanded="true" />
788 
-            <element signature="e#962#963#0" expanded="true" />
789 
-          </folding>
790 732 
         </state>
791 733 
       </provider>
792 734 
     </entry>
 
@@ -794,24 +736,6 @@
794 736 
       <provider selected="true" editor-type-id="text-editor">
795 737 
         <state relative-caret-position="45">
796 738 
           <caret line="3" selection-start-line="3" selection-end-line="3" />
797 
-          <folding>
798 
-            <element signature="e#534#535#0" expanded="true" />
799 
-            <element signature="e#587#588#0" expanded="true" />
800 
-            <element signature="e#659#660#0" expanded="true" />
801 
-            <element signature="e#711#712#0" expanded="true" />
802 
-            <element signature="e#740#741#0" expanded="true" />
803 
-            <element signature="e#766#767#0" expanded="true" />
804 
-            <element signature="e#803#804#0" expanded="true" />
805 
-            <element signature="e#833#834#0" expanded="true" />
806 
-            <element signature="e#878#879#0" expanded="true" />
807 
-            <element signature="e#920#921#0" expanded="true" />
808 
-            <element signature="e#989#990#0" expanded="true" />
809 
-            <element signature="e#1051#1052#0" expanded="true" />
810 
-            <element signature="e#1094#1095#0" expanded="true" />
811 
-            <element signature="e#1135#1136#0" expanded="true" />
812 
-            <element signature="e#1202#1203#0" expanded="true" />
813 
-            <element signature="e#1262#1263#0" expanded="true" />
814 
-          </folding>
815 739 
         </state>
816 740 
       </provider>
817 741 
     </entry>
 
@@ -819,24 +743,6 @@
819 743 
       <provider selected="true" editor-type-id="text-editor">
820 744 
         <state relative-caret-position="30">
821 745 
           <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
822 
-          <folding>
823 
-            <element signature="e#539#540#0" expanded="true" />
824 
-            <element signature="e#592#593#0" expanded="true" />
825 
-            <element signature="e#664#665#0" expanded="true" />
826 
-            <element signature="e#716#717#0" expanded="true" />
827 
-            <element signature="e#745#746#0" expanded="true" />
828 
-            <element signature="e#771#772#0" expanded="true" />
829 
-            <element signature="e#732#733#0" expanded="true" />
830 
-            <element signature="e#762#763#0" expanded="true" />
831 
-            <element signature="e#883#884#0" expanded="true" />
832 
-            <element signature="e#925#926#0" expanded="true" />
833 
-            <element signature="e#939#940#0" expanded="true" />
834 
-            <element signature="e#969#970#0" expanded="true" />
835 
-            <element signature="e#1099#1100#0" expanded="true" />
836 
-            <element signature="e#1140#1141#0" expanded="true" />
837 
-            <element signature="e#1056#1057#0" expanded="true" />
838 
-            <element signature="e#1086#1087#0" expanded="true" />
839 
-          </folding>
840 746 
         </state>
841 747 
       </provider>
842 748 
     </entry>
 
@@ -925,20 +831,6 @@
925 831 
     <entry file="file://$PROJECT_DIR$/pom.xml">
926 832 
       <provider selected="true" editor-type-id="text-editor" />
927 833 
     </entry>
928 
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
929 
-      <provider selected="true" editor-type-id="text-editor">
930 
-        <state relative-caret-position="75">
931 
-          <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
932 
-        </state>
933 
-      </provider>
934 
-    </entry>
935 
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
936 
-      <provider selected="true" editor-type-id="text-editor">
937 
-        <state relative-caret-position="30">
938 
-          <caret line="2" column="22" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
939 
-        </state>
940 
-      </provider>
941 
-    </entry>
942 834 
     <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java">
943 835 
       <provider selected="true" editor-type-id="text-editor">
944 836 
         <state relative-caret-position="75">
 
@@ -949,121 +841,81 @@
949 841 
     <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/SavingsAccountTest.java">
950 842 
       <provider selected="true" editor-type-id="text-editor">
951 843 
         <state relative-caret-position="255">
952 
-          <caret line="17" column="32" lean-forward="true" selection-start-line="17" selection-start-column="32" selection-end-line="17" selection-end-column="32" />
844 
+          <caret line="17" column="32" selection-start-line="17" selection-start-column="32" selection-end-line="17" selection-end-column="32" />
953 845 
           <folding>
954 846 
             <element signature="imports" expanded="true" />
955 847 
           </folding>
956 848 
         </state>
957 849 
       </provider>
958 850 
     </entry>
959 
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BusinessAccountTest.java">
851 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
960 852 
       <provider selected="true" editor-type-id="text-editor">
961 
-        <state relative-caret-position="150">
962 
-          <caret line="10" column="31" lean-forward="true" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
853 
+        <state relative-caret-position="270">
854 
+          <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
855 
+        </state>
856 
+      </provider>
857 
+    </entry>
858 
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java">
859 
+      <provider selected="true" editor-type-id="text-editor">
860 
+        <state relative-caret-position="345">
861 
+          <caret line="23" selection-start-line="23" selection-end-line="23" />
963 862 
           <folding>
964 863 
             <element signature="imports" expanded="true" />
965 864 
           </folding>
966 865 
         </state>
967 866 
       </provider>
968 867 
     </entry>
969 
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
868 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Console.java">
970 869 
       <provider selected="true" editor-type-id="text-editor">
971 
-        <state relative-caret-position="270">
972 
-          <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
973 
-          <folding>
974 
-            <element signature="e#234#235#0" expanded="true" />
975 
-            <element signature="e#287#288#0" expanded="true" />
976 
-            <element signature="e#359#360#0" expanded="true" />
977 
-            <element signature="e#411#412#0" expanded="true" />
978 
-            <element signature="e#440#441#0" expanded="true" />
979 
-            <element signature="e#466#467#0" expanded="true" />
980 
-            <element signature="e#503#504#0" expanded="true" />
981 
-            <element signature="e#533#534#0" expanded="true" />
982 
-            <element signature="e#578#579#0" expanded="true" />
983 
-            <element signature="e#620#621#0" expanded="true" />
984 
-            <element signature="e#689#690#0" expanded="true" />
985 
-            <element signature="e#751#752#0" expanded="true" />
986 
-            <element signature="e#794#795#0" expanded="true" />
987 
-            <element signature="e#835#836#0" expanded="true" />
988 
-            <element signature="e#902#903#0" expanded="true" />
989 
-            <element signature="e#962#963#0" expanded="true" />
990 
-          </folding>
870 
+        <state relative-caret-position="540">
871 
+          <caret line="36" column="25" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" />
991 872 
         </state>
992 873 
       </provider>
993 874 
     </entry>
994 
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
875 
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BusinessAccountTest.java">
995 876 
       <provider selected="true" editor-type-id="text-editor">
996 
-        <state relative-caret-position="268">
997 
-          <caret line="18" column="48" lean-forward="true" selection-start-line="18" selection-start-column="48" selection-end-line="18" selection-end-column="48" />
877 
+        <state relative-caret-position="-304">
878 
+          <caret line="10" column="31" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
998 879 
           <folding>
999 
-            <element signature="e#534#535#0" expanded="true" />
1000 
-            <element signature="e#587#588#0" expanded="true" />
1001 
-            <element signature="e#659#660#0" expanded="true" />
1002 
-            <element signature="e#711#712#0" expanded="true" />
1003 
-            <element signature="e#740#741#0" expanded="true" />
1004 
-            <element signature="e#766#767#0" expanded="true" />
1005 
-            <element signature="e#803#804#0" expanded="true" />
1006 
-            <element signature="e#833#834#0" expanded="true" />
1007 
-            <element signature="e#878#879#0" expanded="true" />
1008 
-            <element signature="e#920#921#0" expanded="true" />
1009 
-            <element signature="e#989#990#0" expanded="true" />
1010 
-            <element signature="e#1051#1052#0" expanded="true" />
1011 
-            <element signature="e#1094#1095#0" expanded="true" />
1012 
-            <element signature="e#1135#1136#0" expanded="true" />
1013 
-            <element signature="e#1202#1203#0" expanded="true" />
1014 
-            <element signature="e#1262#1263#0" expanded="true" />
880 
+            <element signature="imports" expanded="true" />
1015 881 
           </folding>
1016 882 
         </state>
1017 883 
       </provider>
1018 884 
     </entry>
1019 885 
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
1020 886 
       <provider selected="true" editor-type-id="text-editor">
1021 
-        <state relative-caret-position="306">
1022 
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
1023 
-          <folding>
1024 
-            <element signature="e#539#540#0" expanded="true" />
1025 
-            <element signature="e#592#593#0" expanded="true" />
1026 
-            <element signature="e#664#665#0" expanded="true" />
1027 
-            <element signature="e#716#717#0" expanded="true" />
1028 
-            <element signature="e#745#746#0" expanded="true" />
1029 
-            <element signature="e#771#772#0" expanded="true" />
1030 
-            <element signature="e#732#733#0" expanded="true" />
1031 
-            <element signature="e#762#763#0" expanded="true" />
1032 
-            <element signature="e#883#884#0" expanded="true" />
1033 
-            <element signature="e#925#926#0" expanded="true" />
1034 
-            <element signature="e#939#940#0" expanded="true" />
1035 
-            <element signature="e#969#970#0" expanded="true" />
1036 
-            <element signature="e#1099#1100#0" expanded="true" />
1037 
-            <element signature="e#1140#1141#0" expanded="true" />
1038 
-            <element signature="e#1056#1057#0" expanded="true" />
1039 
-            <element signature="e#1086#1087#0" expanded="true" />
1040 
-          </folding>
887 
+        <state relative-caret-position="211">
888 
+          <caret line="24" selection-start-line="24" selection-end-line="24" />
1041 889 
         </state>
1042 890 
       </provider>
1043 891 
     </entry>
1044 
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Console.java">
892 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
1045 893 
       <provider selected="true" editor-type-id="text-editor">
1046 
-        <state relative-caret-position="514">
1047 
-          <caret line="36" column="25" lean-forward="true" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" />
894 
+        <state relative-caret-position="268">
895 
+          <caret line="18" column="48" selection-start-line="18" selection-start-column="48" selection-end-line="18" selection-end-column="48" />
1048 896 
         </state>
1049 897 
       </provider>
1050 898 
     </entry>
1051 
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java">
899 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
1052 900 
       <provider selected="true" editor-type-id="text-editor">
1053 
-        <state relative-caret-position="345">
1054 
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
1055 
-          <folding>
1056 
-            <element signature="imports" expanded="true" />
1057 
-          </folding>
901 
+        <state relative-caret-position="30">
902 
+          <caret line="2" column="22" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
1058 903 
         </state>
1059 904 
       </provider>
1060 905 
     </entry>
1061 906 
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java">
1062 907 
       <provider selected="true" editor-type-id="text-editor">
1063 
-        <state relative-caret-position="447">
908 
+        <state relative-caret-position="635">
1064 909 
           <caret line="50" column="69" selection-start-line="50" selection-start-column="69" selection-end-line="50" selection-end-column="69" />
1065 910 
         </state>
1066 911 
       </provider>
1067 912 
     </entry>
913 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
914 
+      <provider selected="true" editor-type-id="text-editor">
915 
+        <state relative-caret-position="180">
916 
+          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
917 
+        </state>
918 
+      </provider>
919 
+    </entry>
1068 920 
   </component>
1069 921 
 </project>

+ 2
- 2
src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java Bestand weergeven 

@@ -48,10 +48,10 @@ public class BankAccount {
48 48 
         String withdrawOrDeposit = Console.stringPrompt("Please choose either withdraw or deposit.");
49 49 
         if (withdrawOrDeposit.equalsIgnoreCase("withdraw")) {
50 50 
             double amountToWithdraw = Console.doublePrompt("How much money would you like to withdraw today?");
51 
-            Console.print("You now have $" + (currentAmount - amountToWithdraw) + " in your bank account");
51 
+            Console.print("You now have $" + ba.withdraw(currentAmount, amountToWithdraw) + " in your bank account");
52 52 
         } else if (withdrawOrDeposit.equalsIgnoreCase("deposit")) {
53 53 
             double amountToDeposit = Console.doublePrompt("How much money would you like to deposit today?");
54 
-            Console.print("You now have $" + (currentAmount + amountToWithdraw) + " in your bank account");
54 
+            Console.print("You now have $" + ba.deposit(currentAmount, amountToDeposit) + " in your bank account");
55 55 
         } else {
56 56 
             Console.print("Please choose an option from the list.");
57 57 
         }