Khalil Malik Saboor před 8 roky
rodič
revize
fce9f4baf4

+ 285
- 214
.idea/workspace.xml Zobrazit soubor

@@ -2,20 +2,16 @@
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/BusinessAccount.java" afterDir="false" />
6
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" afterDir="false" />
7
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/AccountTest.java" afterDir="false" />
8
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" afterDir="false" />
9
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
10
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
5
+      <change afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/SavingsAccountTest.java" afterDir="false" />
11 6
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
12
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
13
-      <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/ATM.java" beforeDir="false" />
14 8
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" afterDir="false" />
15
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" beforeDir="false" />
9
+      <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" />
16 10
       <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" />
17 11
       <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" />
18
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java" beforeDir="false" />
12
+      <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" />
13
+      <change beforePath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/AccountTest.java" beforeDir="false" />
14
+      <change beforePath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" afterDir="false" />
19 15
     </list>
20 16
     <ignored path="$PROJECT_DIR$/out/" />
21 17
     <ignored path="$PROJECT_DIR$/target/" />
@@ -28,48 +24,11 @@
28 24
   </component>
29 25
   <component name="FileEditorManager">
30 26
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
31
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
32
-        <entry file="file://$PROJECT_DIR$/README.md">
33
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
34
-            <state split_layout="SECOND">
35
-              <first_editor relative-caret-position="46">
36
-                <caret line="2" selection-start-line="2" selection-end-line="2" />
37
-              </first_editor>
38
-              <second_editor />
39
-            </state>
40
-          </provider>
41
-        </entry>
42
-      </file>
43
-      <file leaf-file-name="MainApplication.java" pinned="false" current-in-tab="false">
44
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
45
-          <provider selected="true" editor-type-id="text-editor">
46
-            <state relative-caret-position="494">
47
-              <caret line="30" selection-start-line="30" selection-end-line="30" />
48
-            </state>
49
-          </provider>
50
-        </entry>
51
-      </file>
52
-      <file leaf-file-name="ATM.java" pinned="false" current-in-tab="true">
53
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java">
54
-          <provider selected="true" editor-type-id="text-editor">
55
-            <state relative-caret-position="230">
56
-              <caret line="10" column="44" lean-forward="true" selection-start-line="10" selection-start-column="44" selection-end-line="10" selection-end-column="44" />
57
-              <folding>
58
-                <element signature="imports" expanded="true" />
59
-              </folding>
60
-            </state>
61
-          </provider>
62
-        </entry>
63
-      </file>
64 27
       <file leaf-file-name="Account.java" pinned="false" current-in-tab="false">
65 28
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
66 29
           <provider selected="true" editor-type-id="text-editor">
67
-            <state relative-caret-position="483">
68
-              <caret line="25" column="4" selection-start-line="25" selection-start-column="4" selection-end-line="27" selection-end-column="67" />
69
-              <folding>
70
-                <element signature="e#248#249#0" expanded="true" />
71
-                <element signature="e#270#271#0" expanded="true" />
72
-              </folding>
30
+            <state relative-caret-position="224">
31
+              <caret line="17" column="4" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="76" />
73 32
             </state>
74 33
           </provider>
75 34
         </entry>
@@ -77,39 +36,38 @@
77 36
       <file leaf-file-name="CheckingAccount.java" pinned="false" current-in-tab="false">
78 37
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
79 38
           <provider selected="true" editor-type-id="text-editor">
80
-            <state relative-caret-position="345">
81
-              <caret line="19" column="4" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="4" />
39
+            <state relative-caret-position="138">
40
+              <caret line="6" column="5" lean-forward="true" selection-start-line="6" selection-start-column="5" selection-end-line="6" selection-end-column="5" />
82 41
               <folding>
83
-                <element signature="e#166#167#0" expanded="true" />
84
-                <element signature="e#195#196#0" expanded="true" />
42
+                <element signature="e#134#135#0" expanded="true" />
43
+                <element signature="e#164#165#0" expanded="true" />
85 44
               </folding>
86 45
             </state>
87 46
           </provider>
88 47
         </entry>
89 48
       </file>
90
-      <file leaf-file-name="CheckingAccountTest.java" pinned="false" current-in-tab="false">
91
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java">
92
-          <provider selected="true" editor-type-id="text-editor">
93
-            <state relative-caret-position="230">
94
-              <caret line="13" selection-start-line="13" selection-end-line="13" />
95
-            </state>
96
-          </provider>
97
-        </entry>
98
-      </file>
99
-      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
100
-        <entry file="file://$PROJECT_DIR$/pom.xml">
49
+      <file leaf-file-name="SavingsAccount.java" pinned="false" current-in-tab="false">
50
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
101 51
           <provider selected="true" editor-type-id="text-editor">
102
-            <state relative-caret-position="368">
103
-              <caret line="16" column="12" selection-start-line="16" selection-start-column="12" selection-end-line="16" selection-end-column="12" />
52
+            <state relative-caret-position="207">
53
+              <caret line="11" column="76" selection-start-line="11" selection-start-column="76" selection-end-line="11" selection-end-column="76" />
54
+              <folding>
55
+                <element signature="e#133#134#0" expanded="true" />
56
+                <element signature="e#163#164#0" expanded="true" />
57
+              </folding>
104 58
             </state>
105 59
           </provider>
106 60
         </entry>
107 61
       </file>
108
-      <file leaf-file-name="SavingsAccount.java" pinned="false" current-in-tab="false">
109
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
62
+      <file leaf-file-name="BusinessAccount.java" pinned="false" current-in-tab="true">
63
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
110 64
           <provider selected="true" editor-type-id="text-editor">
111
-            <state relative-caret-position="46">
112
-              <caret line="2" column="43" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
65
+            <state relative-caret-position="184">
66
+              <caret line="10" column="5" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
67
+              <folding>
68
+                <element signature="e#135#136#0" expanded="true" />
69
+                <element signature="e#165#166#0" expanded="true" />
70
+              </folding>
113 71
             </state>
114 72
           </provider>
115 73
         </entry>
@@ -134,13 +92,15 @@
134 92
         <option value="$PROJECT_DIR$/README.md" />
135 93
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Savings.java" />
136 94
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/AccountTest.java" />
137
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" />
138
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" />
139 95
         <option value="$PROJECT_DIR$/pom.xml" />
140
-        <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" />
141
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" />
142 96
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java" />
97
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" />
98
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java" />
143 99
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" />
100
+        <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" />
101
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" />
102
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" />
103
+        <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/SavingsAccountTest.java" />
144 104
       </list>
145 105
     </option>
146 106
   </component>
@@ -160,7 +120,7 @@
160 120
   <component name="NodePackageJsonFileManager">
161 121
     <packageJsonPaths />
162 122
   </component>
163
-  <component name="ProjectFrameBounds" fullScreen="true">
123
+  <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
164 124
     <option name="width" value="1280" />
165 125
     <option name="height" value="800" />
166 126
   </component>
@@ -170,6 +130,8 @@
170 130
       <foldersAlwaysOnTop value="true" />
171 131
     </navigator>
172 132
     <panes>
133
+      <pane id="Scope" />
134
+      <pane id="AndroidView" />
173 135
       <pane id="ProjectPane">
174 136
         <subPane>
175 137
           <expand>
@@ -229,9 +191,7 @@
229 191
         </subPane>
230 192
       </pane>
231 193
       <pane id="Course" />
232
-      <pane id="Scope" />
233 194
       <pane id="PackagesPane" />
234
-      <pane id="AndroidView" />
235 195
     </panes>
236 196
   </component>
237 197
   <component name="PropertiesComponent">
@@ -244,7 +204,7 @@
244 204
     <property name="project.structure.last.edited" value="Modules" />
245 205
     <property name="project.structure.proportion" value="0.0" />
246 206
     <property name="project.structure.side.proportion" value="0.2" />
247
-    <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" />
207
+    <property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors" />
248 208
   </component>
249 209
   <component name="RecentsManager">
250 210
     <key name="CreateTestDialog.RecentsKey">
@@ -266,7 +226,7 @@
266 226
       </list>
267 227
     </option>
268 228
   </component>
269
-  <component name="RunManager" selected="JUnit.CheckingAccountTest.getBalance">
229
+  <component name="RunManager" selected="JUnit.SavingsAccountTest.deposit">
270 230
     <configuration default="true" type="Applet" factoryName="Applet">
271 231
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
272 232
     </configuration>
@@ -307,6 +267,75 @@
307 267
       </option>
308 268
       <patterns />
309 269
     </configuration>
270
+    <configuration name="CheckingAccountTest.withdraw" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
271
+      <module name="bankaccountlab" />
272
+      <extension name="coverage">
273
+        <pattern>
274
+          <option name="PATTERN" value="com.zipcodewilmington.bankaccountlab.*" />
275
+          <option name="ENABLED" value="true" />
276
+        </pattern>
277
+      </extension>
278
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
279
+      <option name="ALTERNATIVE_JRE_PATH" />
280
+      <option name="PACKAGE_NAME" value="com.zipcodewilmington.bankaccountlab" />
281
+      <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.CheckingAccountTest" />
282
+      <option name="METHOD_NAME" value="withdraw" />
283
+      <option name="TEST_OBJECT" value="method" />
284
+      <option name="VM_PARAMETERS" value="-ea" />
285
+      <option name="PARAMETERS" />
286
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
287
+      <option name="PASS_PARENT_ENVS" value="true" />
288
+      <option name="TEST_SEARCH_SCOPE">
289
+        <value defaultName="singleModule" />
290
+      </option>
291
+      <patterns />
292
+    </configuration>
293
+    <configuration name="SavingsAccountTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
294
+      <module name="bankaccountlab" />
295
+      <extension name="coverage">
296
+        <pattern>
297
+          <option name="PATTERN" value="com.zipcodewilmington.bankaccountlab.*" />
298
+          <option name="ENABLED" value="true" />
299
+        </pattern>
300
+      </extension>
301
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
302
+      <option name="ALTERNATIVE_JRE_PATH" />
303
+      <option name="PACKAGE_NAME" value="com.zipcodewilmington.bankaccountlab" />
304
+      <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.SavingsAccountTest" />
305
+      <option name="METHOD_NAME" />
306
+      <option name="TEST_OBJECT" value="class" />
307
+      <option name="VM_PARAMETERS" value="-ea" />
308
+      <option name="PARAMETERS" />
309
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
310
+      <option name="PASS_PARENT_ENVS" value="true" />
311
+      <option name="TEST_SEARCH_SCOPE">
312
+        <value defaultName="singleModule" />
313
+      </option>
314
+      <patterns />
315
+    </configuration>
316
+    <configuration name="SavingsAccountTest.deposit" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
317
+      <module name="bankaccountlab" />
318
+      <extension name="coverage">
319
+        <pattern>
320
+          <option name="PATTERN" value="com.zipcodewilmington.bankaccountlab.*" />
321
+          <option name="ENABLED" value="true" />
322
+        </pattern>
323
+      </extension>
324
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
325
+      <option name="ALTERNATIVE_JRE_PATH" />
326
+      <option name="PACKAGE_NAME" value="com.zipcodewilmington.bankaccountlab" />
327
+      <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.SavingsAccountTest" />
328
+      <option name="METHOD_NAME" value="deposit" />
329
+      <option name="TEST_OBJECT" value="method" />
330
+      <option name="VM_PARAMETERS" value="-ea" />
331
+      <option name="PARAMETERS" />
332
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
333
+      <option name="PASS_PARENT_ENVS" value="true" />
334
+      <option name="TEST_SEARCH_SCOPE">
335
+        <value defaultName="singleModule" />
336
+      </option>
337
+      <patterns />
338
+    </configuration>
310 339
     <configuration default="true" type="JUnit" factoryName="JUnit">
311 340
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
312 341
       <option name="ALTERNATIVE_JRE_PATH" />
@@ -419,10 +448,16 @@
419 448
     <list>
420 449
       <item itemvalue="Application.MainApplication" />
421 450
       <item itemvalue="JUnit.CheckingAccountTest.getBalance" />
451
+      <item itemvalue="JUnit.SavingsAccountTest.deposit" />
452
+      <item itemvalue="JUnit.CheckingAccountTest.withdraw" />
453
+      <item itemvalue="JUnit.SavingsAccountTest" />
422 454
     </list>
423 455
     <recent_temporary>
424 456
       <list>
457
+        <item itemvalue="JUnit.SavingsAccountTest.deposit" />
458
+        <item itemvalue="JUnit.CheckingAccountTest.withdraw" />
425 459
         <item itemvalue="JUnit.CheckingAccountTest.getBalance" />
460
+        <item itemvalue="JUnit.SavingsAccountTest" />
426 461
         <item itemvalue="Application.MainApplication" />
427 462
       </list>
428 463
     </recent_temporary>
@@ -443,44 +478,74 @@
443 478
       <workItem from="1529425068221" duration="329000" />
444 479
       <workItem from="1529542283850" duration="591000" />
445 480
       <workItem from="1529576787325" duration="7212000" />
446
-      <workItem from="1529772073836" duration="9254000" />
481
+      <workItem from="1529772073836" duration="9925000" />
482
+      <workItem from="1529801805554" duration="4607000" />
483
+      <workItem from="1529852252803" duration="6792000" />
447 484
     </task>
448 485
     <servers />
449 486
   </component>
450 487
   <component name="TestHistory">
451
-    <history-entry file="CheckingAccountTest_getBalance - 2018.06.23 at 16h 03m 28s.xml">
488
+    <history-entry file="SavingsAccountTest - 2018.06.25 at 00h 51m 49s.xml">
489
+      <configuration name="SavingsAccountTest" configurationId="JUnit" />
490
+    </history-entry>
491
+    <history-entry file="SavingsAccountTest - 2018.06.25 at 00h 56m 52s.xml">
492
+      <configuration name="SavingsAccountTest" configurationId="JUnit" />
493
+    </history-entry>
494
+    <history-entry file="SavingsAccountTest - 2018.06.25 at 00h 57m 07s.xml">
495
+      <configuration name="SavingsAccountTest" configurationId="JUnit" />
496
+    </history-entry>
497
+    <history-entry file="SavingsAccountTest - 2018.06.25 at 00h 57m 18s.xml">
498
+      <configuration name="SavingsAccountTest" configurationId="JUnit" />
499
+    </history-entry>
500
+    <history-entry file="SavingsAccountTest - 2018.06.25 at 00h 57m 33s.xml">
501
+      <configuration name="SavingsAccountTest" configurationId="JUnit" />
502
+    </history-entry>
503
+    <history-entry file="CheckingAccountTest_withdraw - 2018.06.25 at 00h 58m 07s.xml">
504
+      <configuration name="CheckingAccountTest.withdraw" configurationId="JUnit" />
505
+    </history-entry>
506
+    <history-entry file="CheckingAccountTest_getBalance - 2018.06.25 at 00h 58m 20s.xml">
452 507
       <configuration name="CheckingAccountTest.getBalance" configurationId="JUnit" />
453 508
     </history-entry>
509
+    <history-entry file="CheckingAccountTest_withdraw - 2018.06.25 at 01h 03m 03s.xml">
510
+      <configuration name="CheckingAccountTest.withdraw" configurationId="JUnit" />
511
+    </history-entry>
512
+    <history-entry file="SavingsAccountTest_deposit - 2018.06.25 at 01h 04m 59s.xml">
513
+      <configuration name="SavingsAccountTest.deposit" configurationId="JUnit" />
514
+    </history-entry>
515
+    <history-entry file="SavingsAccountTest_deposit - 2018.06.25 at 01h 07m 52s.xml">
516
+      <configuration name="SavingsAccountTest.deposit" configurationId="JUnit" />
517
+    </history-entry>
454 518
   </component>
455 519
   <component name="TimeTrackingManager">
456
-    <option name="totallyTimeSpent" value="18839000" />
520
+    <option name="totallyTimeSpent" value="30909000" />
457 521
   </component>
458 522
   <component name="ToolWindowManager">
459
-    <frame x="0" y="0" width="1280" height="800" extended-state="0" />
523
+    <frame x="0" y="0" width="1280" height="800" extended-state="6" />
524
+    <editor active="true" />
460 525
     <layout>
461 526
       <window_info anchor="right" id="Palette" order="3" />
462 527
       <window_info anchor="bottom" id="TODO" order="6" />
463
-      <window_info anchor="bottom" id="Messages" weight="0.32965517" />
528
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.32965517" />
464 529
       <window_info anchor="right" id="Palette&#9;" order="3" />
465 530
       <window_info id="Image Layers" order="2" />
466 531
       <window_info anchor="right" id="Capture Analysis" order="3" />
467 532
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
468 533
       <window_info anchor="right" id="Maven Projects" order="3" />
469 534
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
470
-      <window_info anchor="bottom" id="Run" order="2" weight="0.32965517" />
471 535
       <window_info anchor="bottom" id="Version Control" order="7" />
536
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3475862" />
472 537
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.34068966" />
473 538
       <window_info id="Capture Tool" order="2" />
474 539
       <window_info id="Designer" order="2" />
475
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27382874" />
540
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2819063" />
476 541
       <window_info anchor="right" id="Database" order="4" />
477 542
       <window_info id="Learn" order="3" />
478 543
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
479 544
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
480 545
       <window_info id="UI Designer" order="2" />
481 546
       <window_info anchor="right" id="Theme Preview" order="3" />
482
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
483 547
       <window_info id="Favorites" order="2" side_tool="true" />
548
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
484 549
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
485 550
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
486 551
       <window_info id="Nl-Palette" order="2" />
@@ -506,13 +571,13 @@
506 571
       <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
507 572
       <window_info anchor="bottom" id="Messages" order="0" weight="0.32965517" />
508 573
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
574
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27382874" />
509 575
       <window_info id="Favorites" order="6" side_tool="true" />
510 576
       <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
511 577
       <window_info anchor="bottom" id="Version Control" order="10" />
512 578
       <window_info id="Nl-Palette" order="7" />
513 579
       <window_info anchor="right" id="Maven Projects" order="6" />
514
-      <window_info anchor="bottom" id="Find" order="2" />
515
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27382874" />
580
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
516 581
       <window_info id="Learn" order="8" />
517 582
       <window_info anchor="right" id="Database" order="9" />
518 583
       <window_info anchor="bottom" id="Message" order="1" />
@@ -520,7 +585,7 @@
520 585
       <window_info anchor="right" id="Palette&#9;" order="7" />
521 586
       <window_info anchor="right" id="Theme Preview" order="8" />
522 587
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
523
-      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
588
+      <window_info anchor="bottom" id="Find" order="2" />
524 589
       <window_info anchor="bottom" id="Debug" order="4" weight="0.4" />
525 590
     </layout-to-restore>
526 591
   </component>
@@ -532,10 +597,17 @@
532 597
   </component>
533 598
   <component name="XDebuggerManager">
534 599
     <breakpoint-manager>
535
-      <option name="time" value="1" />
600
+      <option name="time" value="3" />
536 601
     </breakpoint-manager>
537 602
   </component>
538 603
   <component name="editorHistoryManager">
604
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/SavingsAccountTest.java">
605
+      <provider selected="true" editor-type-id="text-editor">
606
+        <state relative-caret-position="207">
607
+          <caret line="12" column="31" lean-forward="true" selection-start-line="12" selection-start-column="31" selection-end-line="12" selection-end-column="31" />
608
+        </state>
609
+      </provider>
610
+    </entry>
539 611
     <entry file="file://$PROJECT_DIR$/README.md">
540 612
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
541 613
         <state split_layout="SECOND">
@@ -548,71 +620,57 @@
548 620
     </entry>
549 621
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
550 622
       <provider selected="true" editor-type-id="text-editor">
551
-        <state relative-caret-position="161">
552
-          <caret line="7" selection-start-line="7" selection-end-line="7" />
623
+        <state relative-caret-position="690">
624
+          <caret line="30" selection-start-line="30" selection-end-line="30" />
553 625
         </state>
554 626
       </provider>
555 627
     </entry>
556 628
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java">
557 629
       <provider selected="true" editor-type-id="text-editor">
558
-        <state relative-caret-position="115">
559
-          <caret line="5" selection-start-line="5" selection-end-line="5" />
630
+        <state relative-caret-position="299">
631
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
560 632
           <folding>
561 633
             <element signature="imports" expanded="true" />
562 634
           </folding>
563 635
         </state>
564 636
       </provider>
565 637
     </entry>
566
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
567
-      <provider selected="true" editor-type-id="text-editor">
568
-        <state relative-caret-position="115">
569
-          <caret line="5" column="26" lean-forward="true" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" />
570
-          <folding>
571
-            <element signature="e#248#249#0" expanded="true" />
572
-            <element signature="e#270#271#0" expanded="true" />
573
-          </folding>
574
-        </state>
575
-      </provider>
576
-    </entry>
577 638
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
578 639
       <provider selected="true" editor-type-id="text-editor">
579
-        <state relative-caret-position="69">
580
-          <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
640
+        <state relative-caret-position="299">
641
+          <caret line="19" column="4" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="4" />
581 642
           <folding>
582
-            <element signature="e#166#167#0" expanded="true" />
583
-            <element signature="e#195#196#0" expanded="true" />
643
+            <element signature="e#134#135#0" expanded="true" />
644
+            <element signature="e#164#165#0" expanded="true" />
584 645
           </folding>
585 646
         </state>
586 647
       </provider>
587 648
     </entry>
588
-    <entry file="file://$PROJECT_DIR$/README.md">
589
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
590
-        <state split_layout="SECOND">
591
-          <first_editor relative-caret-position="46">
592
-            <caret line="2" selection-start-line="2" selection-end-line="2" />
593
-          </first_editor>
594
-          <second_editor />
649
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java">
650
+      <provider selected="true" editor-type-id="text-editor">
651
+        <state relative-caret-position="230">
652
+          <caret line="13" selection-start-line="13" selection-end-line="13" />
595 653
         </state>
596 654
       </provider>
597 655
     </entry>
598
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
656
+    <entry file="file://$PROJECT_DIR$/pom.xml">
599 657
       <provider selected="true" editor-type-id="text-editor">
600
-        <state relative-caret-position="115">
601
-          <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
658
+        <state relative-caret-position="368">
659
+          <caret line="16" column="12" selection-start-line="16" selection-start-column="12" selection-end-line="16" selection-end-column="12" />
602 660
         </state>
603 661
       </provider>
604 662
     </entry>
605
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java">
663
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
606 664
       <provider selected="true" editor-type-id="text-editor">
607
-        <state relative-caret-position="92">
608
-          <caret line="4" column="3" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
665
+        <state relative-caret-position="46">
666
+          <caret line="2" column="43" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
609 667
         </state>
610 668
       </provider>
611 669
     </entry>
612
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java">
670
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
613 671
       <provider selected="true" editor-type-id="text-editor">
614
-        <state relative-caret-position="161">
615
-          <caret line="7" selection-start-line="7" selection-end-line="7" />
672
+        <state relative-caret-position="138">
673
+          <caret line="6" column="10" selection-start-line="6" selection-start-column="10" selection-end-line="6" selection-end-column="10" />
616 674
         </state>
617 675
       </provider>
618 676
     </entry>
@@ -628,22 +686,36 @@
628 686
     </entry>
629 687
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
630 688
       <provider selected="true" editor-type-id="text-editor">
689
+        <state relative-caret-position="161">
690
+          <caret line="7" selection-start-line="7" selection-end-line="7" />
691
+        </state>
692
+      </provider>
693
+    </entry>
694
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java">
695
+      <provider selected="true" editor-type-id="text-editor">
631 696
         <state relative-caret-position="115">
632
-          <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
697
+          <caret line="5" selection-start-line="5" selection-end-line="5" />
698
+          <folding>
699
+            <element signature="imports" expanded="true" />
700
+          </folding>
633 701
         </state>
634 702
       </provider>
635 703
     </entry>
636
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java">
704
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
637 705
       <provider selected="true" editor-type-id="text-editor">
638
-        <state relative-caret-position="92">
639
-          <caret line="4" column="3" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
706
+        <state relative-caret-position="115">
707
+          <caret line="5" column="26" lean-forward="true" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" />
640 708
         </state>
641 709
       </provider>
642 710
     </entry>
643
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java">
711
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
644 712
       <provider selected="true" editor-type-id="text-editor">
645
-        <state relative-caret-position="161">
646
-          <caret line="7" selection-start-line="7" selection-end-line="7" />
713
+        <state relative-caret-position="69">
714
+          <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
715
+          <folding>
716
+            <element signature="e#134#135#0" expanded="true" />
717
+            <element signature="e#164#165#0" expanded="true" />
718
+          </folding>
647 719
         </state>
648 720
       </provider>
649 721
     </entry>
@@ -664,20 +736,27 @@
664 736
         </state>
665 737
       </provider>
666 738
     </entry>
667
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java">
668
-      <provider selected="true" editor-type-id="text-editor">
669
-        <state relative-caret-position="92">
670
-          <caret line="4" column="3" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
739
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" />
740
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java" />
741
+    <entry file="file://$PROJECT_DIR$/README.md">
742
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
743
+        <state split_layout="SECOND">
744
+          <first_editor relative-caret-position="46">
745
+            <caret line="2" selection-start-line="2" selection-end-line="2" />
746
+          </first_editor>
747
+          <second_editor />
671 748
         </state>
672 749
       </provider>
673 750
     </entry>
674
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java">
751
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
675 752
       <provider selected="true" editor-type-id="text-editor">
676
-        <state relative-caret-position="161">
677
-          <caret line="7" selection-start-line="7" selection-end-line="7" />
753
+        <state relative-caret-position="115">
754
+          <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
678 755
         </state>
679 756
       </provider>
680 757
     </entry>
758
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" />
759
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java" />
681 760
     <entry file="file://$PROJECT_DIR$/README.md">
682 761
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
683 762
         <state split_layout="SECOND">
@@ -695,20 +774,27 @@
695 774
         </state>
696 775
       </provider>
697 776
     </entry>
698
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java">
699
-      <provider selected="true" editor-type-id="text-editor">
700
-        <state relative-caret-position="92">
701
-          <caret line="4" column="3" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
777
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" />
778
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java" />
779
+    <entry file="file://$PROJECT_DIR$/README.md">
780
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
781
+        <state split_layout="SECOND">
782
+          <first_editor relative-caret-position="46">
783
+            <caret line="2" selection-start-line="2" selection-end-line="2" />
784
+          </first_editor>
785
+          <second_editor />
702 786
         </state>
703 787
       </provider>
704 788
     </entry>
705
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java">
789
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
706 790
       <provider selected="true" editor-type-id="text-editor">
707
-        <state relative-caret-position="161">
708
-          <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
791
+        <state relative-caret-position="115">
792
+          <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
709 793
         </state>
710 794
       </provider>
711 795
     </entry>
796
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" />
797
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java" />
712 798
     <entry file="file://$PROJECT_DIR$/README.md">
713 799
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
714 800
         <state split_layout="SECOND">
@@ -729,20 +815,8 @@
729 815
         </state>
730 816
       </provider>
731 817
     </entry>
732
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java">
733
-      <provider selected="true" editor-type-id="text-editor">
734
-        <state relative-caret-position="115">
735
-          <caret line="5" column="24" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
736
-        </state>
737
-      </provider>
738
-    </entry>
739
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java">
740
-      <provider selected="true" editor-type-id="text-editor">
741
-        <state relative-caret-position="115">
742
-          <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
743
-        </state>
744
-      </provider>
745
-    </entry>
818
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" />
819
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java" />
746 820
     <entry file="file://$PROJECT_DIR$/.gitignore">
747 821
       <provider selected="true" editor-type-id="text-editor">
748 822
         <state relative-caret-position="138">
@@ -767,34 +841,8 @@
767 841
         </state>
768 842
       </provider>
769 843
     </entry>
770
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java">
771
-      <provider selected="true" editor-type-id="text-editor">
772
-        <state relative-caret-position="92">
773
-          <caret line="4" column="3" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
774
-        </state>
775
-      </provider>
776
-    </entry>
777
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java">
778
-      <provider selected="true" editor-type-id="text-editor">
779
-        <state relative-caret-position="115">
780
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
781
-        </state>
782
-      </provider>
783
-    </entry>
784
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
785
-      <provider selected="true" editor-type-id="text-editor">
786
-        <state relative-caret-position="46">
787
-          <caret line="2" column="28" selection-start-line="2" selection-start-column="28" selection-end-line="2" selection-end-column="28" />
788
-        </state>
789
-      </provider>
790
-    </entry>
791
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/AccountTest.java">
792
-      <provider selected="true" editor-type-id="text-editor">
793
-        <state relative-caret-position="207">
794
-          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
795
-        </state>
796
-      </provider>
797
-    </entry>
844
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" />
845
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java" />
798 846
     <entry file="file://$PROJECT_DIR$/README.md">
799 847
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
800 848
         <state split_layout="SECOND">
@@ -805,13 +853,6 @@
805 853
         </state>
806 854
       </provider>
807 855
     </entry>
808
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
809
-      <provider selected="true" editor-type-id="text-editor">
810
-        <state relative-caret-position="46">
811
-          <caret line="2" column="43" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
812
-        </state>
813
-      </provider>
814
-    </entry>
815 856
     <entry file="file://$PROJECT_DIR$/pom.xml">
816 857
       <provider selected="true" editor-type-id="text-editor">
817 858
         <state relative-caret-position="368">
@@ -819,48 +860,78 @@
819 860
         </state>
820 861
       </provider>
821 862
     </entry>
822
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java">
863
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/AccountTest.java" />
864
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java">
823 865
       <provider selected="true" editor-type-id="text-editor">
824
-        <state relative-caret-position="230">
825
-          <caret line="13" selection-start-line="13" selection-end-line="13" />
866
+        <state relative-caret-position="299">
867
+          <caret line="13" column="4" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />
868
+          <folding>
869
+            <element signature="imports" expanded="true" />
870
+          </folding>
826 871
         </state>
827 872
       </provider>
828 873
     </entry>
829 874
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
830 875
       <provider selected="true" editor-type-id="text-editor">
831
-        <state relative-caret-position="345">
832
-          <caret line="19" column="4" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="4" />
876
+        <state relative-caret-position="138">
877
+          <caret line="6" column="5" lean-forward="true" selection-start-line="6" selection-start-column="5" selection-end-line="6" selection-end-column="5" />
878
+          <folding>
879
+            <element signature="e#134#135#0" expanded="true" />
880
+            <element signature="e#164#165#0" expanded="true" />
881
+          </folding>
882
+        </state>
883
+      </provider>
884
+    </entry>
885
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
886
+      <provider selected="true" editor-type-id="text-editor">
887
+        <state relative-caret-position="-267">
888
+          <caret line="8" column="20" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
833 889
           <folding>
834
-            <element signature="e#166#167#0" expanded="true" />
835
-            <element signature="e#195#196#0" expanded="true" />
890
+            <element signature="e#1388#1389#0" expanded="true" />
891
+            <element signature="e#1472#1473#0" expanded="true" />
836 892
           </folding>
837 893
         </state>
838 894
       </provider>
839 895
     </entry>
840 896
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
841 897
       <provider selected="true" editor-type-id="text-editor">
842
-        <state relative-caret-position="483">
843
-          <caret line="25" column="4" selection-start-line="25" selection-start-column="4" selection-end-line="27" selection-end-column="67" />
898
+        <state relative-caret-position="224">
899
+          <caret line="17" column="4" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="76" />
900
+        </state>
901
+      </provider>
902
+    </entry>
903
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
904
+      <provider selected="true" editor-type-id="text-editor">
905
+        <state relative-caret-position="207">
906
+          <caret line="11" column="76" selection-start-line="11" selection-start-column="76" selection-end-line="11" selection-end-column="76" />
844 907
           <folding>
845
-            <element signature="e#248#249#0" expanded="true" />
846
-            <element signature="e#270#271#0" expanded="true" />
908
+            <element signature="e#133#134#0" expanded="true" />
909
+            <element signature="e#163#164#0" expanded="true" />
847 910
           </folding>
848 911
         </state>
849 912
       </provider>
850 913
     </entry>
851
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
914
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/SavingsAccountTest.java">
852 915
       <provider selected="true" editor-type-id="text-editor">
853
-        <state relative-caret-position="494">
854
-          <caret line="30" selection-start-line="30" selection-end-line="30" />
916
+        <state relative-caret-position="276">
917
+          <caret line="15" column="41" selection-start-line="15" selection-start-column="41" selection-end-line="15" selection-end-column="41" />
855 918
         </state>
856 919
       </provider>
857 920
     </entry>
858
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java">
921
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java">
859 922
       <provider selected="true" editor-type-id="text-editor">
860
-        <state relative-caret-position="230">
861
-          <caret line="10" column="44" lean-forward="true" selection-start-line="10" selection-start-column="44" selection-end-line="10" selection-end-column="44" />
923
+        <state relative-caret-position="222">
924
+          <caret line="18" column="23" lean-forward="true" selection-start-line="18" selection-start-column="23" selection-end-line="18" selection-end-column="23" />
925
+        </state>
926
+      </provider>
927
+    </entry>
928
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
929
+      <provider selected="true" editor-type-id="text-editor">
930
+        <state relative-caret-position="184">
931
+          <caret line="10" column="5" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
862 932
           <folding>
863
-            <element signature="imports" expanded="true" />
933
+            <element signature="e#135#136#0" expanded="true" />
934
+            <element signature="e#165#166#0" expanded="true" />
864 935
           </folding>
865 936
         </state>
866 937
       </provider>

+ 0
- 14
src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java Zobrazit soubor

@@ -1,14 +0,0 @@
1
-package com.zipcodewilmington.bankaccountlab;
2
-import java.util.ArrayList;
3
-import java.util.List;
4
-public class ATM {
5
-
6
-
7
-    public static void run(){
8
-        ArrayList<Object> userAccounts = new ArrayList<>();
9
-    userAccounts.add(new CheckingAccount());
10
-    userAccounts.add(new SavingsAccount());
11
-    userAccounts.add(new BusinessAccount());
12
-    }
13
-
14
-}

+ 8
- 16
src/main/java/com/zipcodewilmington/bankaccountlab/Account.java Zobrazit soubor

@@ -2,29 +2,21 @@ package com.zipcodewilmington.bankaccountlab;
2 2
 
3 3
 public abstract class Account{
4 4
     //Field
5
-    private int balance = 500;
5
+    protected int balance;
6 6
 
7 7
     //Cons
8
+    public Account(int balance) {
8 9
 
9
-    public Account() {
10
-        balance = 500;
10
+        this.balance = balance;
11 11
     }
12
-    //Methods
13
-    /*
14
-    deposit
15
-    withdraw
16
-     */
17 12
 
18
-    public int getBalance() {
19
-        return balance;
13
+    public int getBalance() { return balance; }
14
+    public void setBalance(int balance) {
15
+        this.balance = balance;
20 16
     }
21 17
 
22
-    public void setBalance(int amount) {
23
-        balance = amount;
24
-    }
25
-
26
-    public void deposit(int amount) { balance = balance + amount; }
18
+    public void deposit(int deposit) { setBalance(getBalance() + deposit); }
27 19
 
28
-    public void withdraw(int amount){ balance = balance - amount; }
20
+    public void withdraw(int withdraw){ setBalance(getBalance()-withdraw);}
29 21
 
30 22
 }

+ 9
- 1
src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java Zobrazit soubor

@@ -1,4 +1,12 @@
1 1
 package com.zipcodewilmington.bankaccountlab;
2 2
 
3
-public class BusinessAccount {
3
+public class BusinessAccount extends Account {
4
+
5
+    public BusinessAccount(int balance) {
6
+        super(balance);
7
+    }
8
+    public int getBalance() { return balance; }
9
+    public void setBalance(int balance) {
10
+        this.balance = balance;
11
+    }
4 12
 }

+ 5
- 16
src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java Zobrazit soubor

@@ -1,23 +1,12 @@
1 1
 package com.zipcodewilmington.bankaccountlab;
2 2
 
3 3
 public class CheckingAccount extends Account{
4
-    //Field
5
-    private int balance = 500;
6 4
 
7
-    //Cons
8
-
9
-    public CheckingAccount() {
10
-        balance = 500;
11
-    }
12
-    public int getBalance() {
13
-        return balance;
5
+    public CheckingAccount(int balance) {
6
+        super(balance);
14 7
     }
15
-
16
-    public void setBalance(int amount) {
17
-        balance = amount;
8
+    public int getBalance() { return balance; }
9
+    public void setBalance(int balance) {
10
+        this.balance = balance;
18 11
     }
19
-
20
-    public void deposit(int amount) { balance = balance + amount; }
21
-
22
-    public void withdraw(int amount){ balance = balance - amount; }
23 12
 }

+ 24
- 11
src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java Zobrazit soubor

@@ -4,33 +4,46 @@ import java.util.Scanner;
4 4
  * Created by leon on 1/10/18.
5 5
  */
6 6
 public class MainApplication {
7
+    static BusinessAccount businessAccount = new BusinessAccount(20000);
8
+    static CheckingAccount checkingAccount = new CheckingAccount(500);
9
+    static SavingsAccount savingsAccount = new SavingsAccount(2000);
7 10
 
8 11
     public static void main(String []args){
9
-
10
-        boolean loop = false;
11
-
12
-
13 12
         System.out.println("What type of account do you want to access?");
14 13
         System.out.println("Type 1 for Checking Account");
15 14
         System.out.println(" 2 for Savings");
16 15
         System.out.println(" 3 for Business");
17 16
         Scanner sc = new Scanner(System.in);
18
-            int options = sc.nextInt();
19
-        while (!loop){
20
-         switch (options){
17
+            int access = sc.nextInt();
18
+        while (access != 0){
19
+         switch (access){
21 20
              case 1:
22
-                 ATM.run();
21
+                checking();
23 22
                  break;
24 23
              case 2:
25
-                 ATM.run();
24
+                saving();
26 25
                  break;
27 26
              case 3:
28
-                 ATM.run();
27
+                business();
29 28
                  break;
30 29
              case 4:
31
-
32 30
                  break;
33 31
           }
32
+            System.out.println("Thanks! Would you like to access another account? \n (1)Checking \n (2)Savings \n (3)Business \n (4)Exit ");
33
+            access = sc.nextInt();
34
+            if (access == 4){
35
+                access = 0;
36
+            }
34 37
         }
35 38
     }
39
+
40
+    private static void checking() {
41
+        System.out.println("Your balance for checking is "+ checkingAccount.getBalance());
42
+    }
43
+    private static void saving() {
44
+        System.out.println("Your balance for saving is "+ savingsAccount.getBalance());
45
+    }
46
+    private static void business() {
47
+        System.out.println("Your balance for business is "+ businessAccount.getBalance());
48
+    }
36 49
 }

+ 8
- 0
src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java Zobrazit soubor

@@ -2,4 +2,12 @@ package com.zipcodewilmington.bankaccountlab;
2 2
 
3 3
 public class SavingsAccount extends Account{
4 4
 
5
+    public SavingsAccount(int balance) {
6
+        super(balance);
7
+    }
8
+    public int getBalance() { return balance; }
9
+    public void setBalance(int balance) {
10
+        this.balance = balance;
11
+    }
12
+    public void deposit(int deposit) { setBalance(getBalance() + deposit); }
5 13
 }

+ 0
- 13
src/test/java/com/zipcodewilmington/bankaccountlab/AccountTest.java Zobrazit soubor

@@ -1,13 +0,0 @@
1
-package com.zipcodewilmington.bankaccountlab;
2
-
3
-import org.junit.Test;
4
-
5
-import static org.junit.Assert.*;
6
-
7
-public class AccountTest {
8
-
9
-    @Test
10
-    public void getsetBalance() {
11
-
12
-    }
13
-}

+ 10
- 3
src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java Zobrazit soubor

@@ -6,16 +6,23 @@ import org.junit.Test;
6 6
 import static org.junit.Assert.*;
7 7
 
8 8
 public class CheckingAccountTest {
9
-    CheckingAccount ca = new CheckingAccount();
9
+    CheckingAccount ca = new CheckingAccount(500);
10 10
     @Test
11 11
     public void getBalance() {
12 12
         //given
13
+        int expected = 500;
14
+        int actual = ca.getBalance();
15
+        Assert.assertEquals(expected,actual);
16
+    }
17
+    @Test
18
+    public void withdraw(){
13 19
         int balance = 500;
14 20
 
15 21
         ca.setBalance(balance);
16
-
17
-        int expected = balance;
22
+        ca.withdraw(500);
23
+        int expected = 0;
18 24
         int actual = ca.getBalance();
19 25
         Assert.assertEquals(expected,actual);
20 26
     }
27
+
21 28
 }

+ 18
- 0
src/test/java/com/zipcodewilmington/bankaccountlab/SavingsAccountTest.java Zobrazit soubor

@@ -0,0 +1,18 @@
1
+package com.zipcodewilmington.bankaccountlab;
2
+
3
+import org.junit.Assert;
4
+import org.junit.Test;
5
+
6
+import static org.junit.Assert.*;
7
+
8
+public class SavingsAccountTest {
9
+SavingsAccount sa = new SavingsAccount(1000);
10
+    @Test
11
+    public void deposit() {
12
+        sa.deposit(500);
13
+        int expected = 1500;
14
+        int actual = sa.getBalance();
15
+
16
+        Assert.assertEquals(expected,actual);
17
+        }
18
+    }