Nicholas Maidanos 8 лет назад
Родитель
Сommit
2d66939557
2 измененных файлов: 199 добавлений и 102 удалений
  1. 188
    102
      .idea/workspace.xml
  2. 11
    0
      src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java

+ 188
- 102
.idea/workspace.xml Просмотреть файл

@@ -3,11 +3,7 @@
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="268ab437-e0d5-4447-8401-9f321aad6d50" name="Default" comment="">
5 5
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
-      <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" />
7
-      <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" />
8
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" afterDir="false" />
9 6
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" afterDir="false" />
10
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" afterDir="false" />
11 7
     </list>
12 8
     <ignored path="$PROJECT_DIR$/out/" />
13 9
     <ignored path="$PROJECT_DIR$/target/" />
@@ -23,10 +19,11 @@
23 19
       <file leaf-file-name="MainApplication.java" pinned="false" current-in-tab="true">
24 20
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
25 21
           <provider selected="true" editor-type-id="text-editor">
26
-            <state relative-caret-position="425">
27
-              <caret line="29" column="48" lean-forward="true" selection-start-line="29" selection-start-column="48" selection-end-line="29" selection-end-column="48" />
22
+            <state relative-caret-position="447">
23
+              <caret line="41" column="41" lean-forward="true" selection-start-line="41" selection-start-column="41" selection-end-line="41" selection-end-column="41" />
28 24
               <folding>
29 25
                 <element signature="imports" expanded="true" />
26
+                <element signature="e#323#340#0" expanded="true" />
30 27
               </folding>
31 28
             </state>
32 29
           </provider>
@@ -35,8 +32,8 @@
35 32
       <file leaf-file-name="Account.java" pinned="false" current-in-tab="false">
36 33
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
37 34
           <provider selected="true" editor-type-id="text-editor">
38
-            <state relative-caret-position="465">
39
-              <caret line="31" column="5" lean-forward="true" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
35
+            <state relative-caret-position="150">
36
+              <caret line="10" column="33" lean-forward="true" selection-start-line="10" selection-start-column="33" selection-end-line="10" selection-end-column="33" />
40 37
               <folding>
41 38
                 <element signature="method#withdraw#0;class#Account#0" />
42 39
                 <element signature="method#getDouble#0;class#Account#0" />
@@ -45,54 +42,6 @@
45 42
           </provider>
46 43
         </entry>
47 44
       </file>
48
-      <file leaf-file-name="BusinessAccount.java" pinned="false" current-in-tab="false">
49
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
50
-          <provider selected="true" editor-type-id="text-editor">
51
-            <state relative-caret-position="60">
52
-              <caret line="5" column="24" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
53
-            </state>
54
-          </provider>
55
-        </entry>
56
-      </file>
57
-      <file leaf-file-name="CheckingAccount.java" pinned="false" current-in-tab="false">
58
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
59
-          <provider selected="true" editor-type-id="text-editor">
60
-            <state relative-caret-position="165">
61
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
62
-            </state>
63
-          </provider>
64
-        </entry>
65
-      </file>
66
-      <file leaf-file-name="SavingsAccount.java" pinned="false" current-in-tab="false">
67
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
68
-          <provider selected="true" editor-type-id="text-editor">
69
-            <state relative-caret-position="60">
70
-              <caret line="6" column="5" lean-forward="true" selection-start-line="6" selection-start-column="5" selection-end-line="6" selection-end-column="5" />
71
-            </state>
72
-          </provider>
73
-        </entry>
74
-      </file>
75
-      <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
76
-        <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
77
-          <provider selected="true" editor-type-id="text-editor">
78
-            <state relative-caret-position="90">
79
-              <caret line="8" selection-start-line="8" selection-end-line="8" />
80
-            </state>
81
-          </provider>
82
-        </entry>
83
-      </file>
84
-      <file leaf-file-name="BankAccountTest.java" pinned="false" current-in-tab="false">
85
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java">
86
-          <provider selected="true" editor-type-id="text-editor">
87
-            <state>
88
-              <caret column="36" selection-start-column="36" selection-end-column="36" />
89
-              <folding>
90
-                <element signature="imports" expanded="true" />
91
-              </folding>
92
-            </state>
93
-          </provider>
94
-        </entry>
95
-      </file>
96 45
     </leaf>
97 46
   </component>
98 47
   <component name="FileTemplateManagerImpl">
@@ -119,10 +68,10 @@
119 68
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" />
120 69
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java" />
121 70
         <option value="$PROJECT_DIR$/src/main/java/Main.java" />
122
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" />
123 71
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java" />
124 72
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" />
125 73
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" />
74
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" />
126 75
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" />
127 76
       </list>
128 77
     </option>
@@ -137,8 +86,10 @@
137 86
     <packageJsonPaths />
138 87
   </component>
139 88
   <component name="ProjectFrameBounds" fullScreen="true">
140
-    <option name="width" value="1280" />
141
-    <option name="height" value="800" />
89
+    <option name="x" value="354" />
90
+    <option name="y" value="162" />
91
+    <option name="width" value="1179" />
92
+    <option name="height" value="644" />
142 93
   </component>
143 94
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
144 95
     <ConfirmationsSetting value="1" id="Add" />
@@ -149,6 +100,7 @@
149 100
     </navigator>
150 101
     <panes>
151 102
       <pane id="AndroidView" />
103
+      <pane id="PackagesPane" />
152 104
       <pane id="ProjectPane">
153 105
         <subPane>
154 106
           <expand>
@@ -182,32 +134,10 @@
182 134
               <item name="java" type="462c0819:PsiDirectoryNode" />
183 135
               <item name="bankaccountlab" type="462c0819:PsiDirectoryNode" />
184 136
             </path>
185
-            <path>
186
-              <item name="ZCW-Inheritance-AbstractBankAccount" type="b2602c69:ProjectViewProjectNode" />
187
-              <item name="ZCW-Inheritance-AbstractBankAccount" type="462c0819:PsiDirectoryNode" />
188
-              <item name="src" type="462c0819:PsiDirectoryNode" />
189
-              <item name="test" type="462c0819:PsiDirectoryNode" />
190
-            </path>
191
-            <path>
192
-              <item name="ZCW-Inheritance-AbstractBankAccount" type="b2602c69:ProjectViewProjectNode" />
193
-              <item name="ZCW-Inheritance-AbstractBankAccount" type="462c0819:PsiDirectoryNode" />
194
-              <item name="src" type="462c0819:PsiDirectoryNode" />
195
-              <item name="test" type="462c0819:PsiDirectoryNode" />
196
-              <item name="java" type="462c0819:PsiDirectoryNode" />
197
-            </path>
198
-            <path>
199
-              <item name="ZCW-Inheritance-AbstractBankAccount" type="b2602c69:ProjectViewProjectNode" />
200
-              <item name="ZCW-Inheritance-AbstractBankAccount" type="462c0819:PsiDirectoryNode" />
201
-              <item name="src" type="462c0819:PsiDirectoryNode" />
202
-              <item name="test" type="462c0819:PsiDirectoryNode" />
203
-              <item name="java" type="462c0819:PsiDirectoryNode" />
204
-              <item name="bankaccountlab" type="462c0819:PsiDirectoryNode" />
205
-            </path>
206 137
           </expand>
207 138
           <select />
208 139
         </subPane>
209 140
       </pane>
210
-      <pane id="PackagesPane" />
211 141
       <pane id="Scope" />
212 142
     </panes>
213 143
   </component>
@@ -464,7 +394,10 @@
464 394
       <workItem from="1528305280827" duration="1753000" />
465 395
       <workItem from="1528308399488" duration="1165000" />
466 396
       <workItem from="1528331841664" duration="8015000" />
467
-      <workItem from="1528372341716" duration="537000" />
397
+      <workItem from="1528372341716" duration="1475000" />
398
+      <workItem from="1528389944831" duration="422000" />
399
+      <workItem from="1528476565243" duration="34000" />
400
+      <workItem from="1528476673738" duration="765000" />
468 401
     </task>
469 402
     <servers />
470 403
   </component>
@@ -495,11 +428,10 @@
495 428
     </history-entry>
496 429
   </component>
497 430
   <component name="TimeTrackingManager">
498
-    <option name="totallyTimeSpent" value="11470000" />
431
+    <option name="totallyTimeSpent" value="13629000" />
499 432
   </component>
500 433
   <component name="ToolWindowManager">
501 434
     <frame x="0" y="0" width="1920" height="1080" extended-state="0" />
502
-    <editor active="true" />
503 435
     <layout>
504 436
       <window_info anchor="right" id="Palette" order="3" />
505 437
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -510,27 +442,27 @@
510 442
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
511 443
       <window_info anchor="right" id="Maven Projects" order="3" />
512 444
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
445
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.32935324" />
513 446
       <window_info anchor="bottom" id="Version Control" order="7" />
514
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32935324" />
515
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.2517413" />
447
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.44179106" />
516 448
       <window_info id="Capture Tool" order="2" />
517 449
       <window_info id="Designer" order="2" />
518
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22736955" />
450
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.23535676" />
519 451
       <window_info anchor="right" id="Database" order="4" />
520 452
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
521 453
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
522 454
       <window_info id="UI Designer" order="2" />
523 455
       <window_info anchor="right" id="Theme Preview" order="3" />
524
-      <window_info id="Favorites" order="2" side_tool="true" />
525 456
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
457
+      <window_info id="Favorites" order="2" side_tool="true" />
526 458
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
527 459
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
460
+      <window_info anchor="bottom" id="Find" order="1" />
528 461
       <window_info id="Nl-Palette" order="2" />
529 462
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
530 463
       <window_info anchor="right" id="Properties" order="3" />
531 464
       <window_info anchor="bottom" id="Message" order="0" />
532 465
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
533
-      <window_info anchor="bottom" id="Find" order="1" />
534 466
     </layout>
535 467
   </component>
536 468
   <component name="TypeScriptGeneratedFilesManager">
@@ -545,12 +477,164 @@
545 477
     </breakpoint-manager>
546 478
   </component>
547 479
   <component name="editorHistoryManager">
480
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
481
+      <provider selected="true" editor-type-id="text-editor">
482
+        <state relative-caret-position="165">
483
+          <caret line="13" selection-start-line="13" selection-end-line="13" />
484
+        </state>
485
+      </provider>
486
+    </entry>
487
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
488
+      <provider selected="true" editor-type-id="text-editor">
489
+        <state relative-caret-position="60">
490
+          <caret line="6" column="5" selection-start-line="6" selection-start-column="5" selection-end-line="6" selection-end-column="5" />
491
+        </state>
492
+      </provider>
493
+    </entry>
494
+    <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
495
+      <provider selected="true" editor-type-id="text-editor">
496
+        <state relative-caret-position="90">
497
+          <caret line="8" selection-start-line="8" selection-end-line="8" />
498
+        </state>
499
+      </provider>
500
+    </entry>
501
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java">
502
+      <provider selected="true" editor-type-id="text-editor">
503
+        <state>
504
+          <caret column="36" selection-start-column="36" selection-end-column="36" />
505
+          <folding>
506
+            <element signature="imports" expanded="true" />
507
+          </folding>
508
+        </state>
509
+      </provider>
510
+    </entry>
511
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
512
+      <provider selected="true" editor-type-id="text-editor">
513
+        <state relative-caret-position="120">
514
+          <caret line="13" selection-start-line="13" selection-end-line="13" />
515
+          <folding>
516
+            <element signature="imports" expanded="true" />
517
+            <element signature="e#323#340#0" expanded="true" />
518
+          </folding>
519
+        </state>
520
+      </provider>
521
+    </entry>
522
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
523
+      <provider selected="true" editor-type-id="text-editor">
524
+        <state relative-caret-position="420">
525
+          <caret line="28" selection-start-line="28" selection-end-line="28" />
526
+          <folding>
527
+            <element signature="method#withdraw#0;class#Account#0" />
528
+            <element signature="method#getDouble#0;class#Account#0" />
529
+          </folding>
530
+        </state>
531
+      </provider>
532
+    </entry>
533
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
534
+      <provider selected="true" editor-type-id="text-editor">
535
+        <state relative-caret-position="60">
536
+          <caret line="5" column="24" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
537
+        </state>
538
+      </provider>
539
+    </entry>
540
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
541
+      <provider selected="true" editor-type-id="text-editor">
542
+        <state relative-caret-position="165">
543
+          <caret line="13" selection-start-line="13" selection-end-line="13" />
544
+        </state>
545
+      </provider>
546
+    </entry>
547
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
548
+      <provider selected="true" editor-type-id="text-editor">
549
+        <state relative-caret-position="60">
550
+          <caret line="6" column="5" selection-start-line="6" selection-start-column="5" selection-end-line="6" selection-end-column="5" />
551
+        </state>
552
+      </provider>
553
+    </entry>
554
+    <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
555
+      <provider selected="true" editor-type-id="text-editor">
556
+        <state relative-caret-position="90">
557
+          <caret line="8" selection-start-line="8" selection-end-line="8" />
558
+        </state>
559
+      </provider>
560
+    </entry>
561
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java">
562
+      <provider selected="true" editor-type-id="text-editor">
563
+        <state>
564
+          <caret column="36" selection-start-column="36" selection-end-column="36" />
565
+          <folding>
566
+            <element signature="imports" expanded="true" />
567
+          </folding>
568
+        </state>
569
+      </provider>
570
+    </entry>
571
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
572
+      <provider selected="true" editor-type-id="text-editor">
573
+        <state relative-caret-position="195">
574
+          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
575
+          <folding>
576
+            <element signature="imports" expanded="true" />
577
+            <element signature="e#323#340#0" expanded="true" />
578
+          </folding>
579
+        </state>
580
+      </provider>
581
+    </entry>
582
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
583
+      <provider selected="true" editor-type-id="text-editor">
584
+        <state relative-caret-position="420">
585
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
586
+          <folding>
587
+            <element signature="method#withdraw#0;class#Account#0" />
588
+            <element signature="method#getDouble#0;class#Account#0" />
589
+          </folding>
590
+        </state>
591
+      </provider>
592
+    </entry>
593
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
594
+      <provider selected="true" editor-type-id="text-editor">
595
+        <state relative-caret-position="60">
596
+          <caret line="5" column="24" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
597
+        </state>
598
+      </provider>
599
+    </entry>
600
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
601
+      <provider selected="true" editor-type-id="text-editor">
602
+        <state relative-caret-position="165">
603
+          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
604
+        </state>
605
+      </provider>
606
+    </entry>
607
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
608
+      <provider selected="true" editor-type-id="text-editor">
609
+        <state relative-caret-position="60">
610
+          <caret line="6" column="5" lean-forward="true" selection-start-line="6" selection-start-column="5" selection-end-line="6" selection-end-column="5" />
611
+        </state>
612
+      </provider>
613
+    </entry>
614
+    <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
615
+      <provider selected="true" editor-type-id="text-editor">
616
+        <state relative-caret-position="90">
617
+          <caret line="8" selection-start-line="8" selection-end-line="8" />
618
+        </state>
619
+      </provider>
620
+    </entry>
621
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java">
622
+      <provider selected="true" editor-type-id="text-editor">
623
+        <state>
624
+          <caret column="36" selection-start-column="36" selection-end-column="36" />
625
+          <folding>
626
+            <element signature="imports" expanded="true" />
627
+          </folding>
628
+        </state>
629
+      </provider>
630
+    </entry>
548 631
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
549 632
       <provider selected="true" editor-type-id="text-editor">
550 633
         <state relative-caret-position="360">
551 634
           <caret line="29" column="73" selection-start-line="29" selection-start-column="73" selection-end-line="29" selection-end-column="73" />
552 635
           <folding>
553 636
             <element signature="imports" expanded="true" />
637
+            <element signature="e#323#340#0" expanded="true" />
554 638
           </folding>
555 639
         </state>
556 640
       </provider>
@@ -589,6 +673,7 @@
589 673
           <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
590 674
           <folding>
591 675
             <element signature="imports" expanded="true" />
676
+            <element signature="e#323#340#0" expanded="true" />
592 677
           </folding>
593 678
         </state>
594 679
       </provider>
@@ -728,21 +813,14 @@
728 813
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
729 814
       <provider selected="true" editor-type-id="text-editor">
730 815
         <state relative-caret-position="60">
731
-          <caret line="6" column="5" lean-forward="true" selection-start-line="6" selection-start-column="5" selection-end-line="6" selection-end-column="5" />
816
+          <caret line="6" column="5" selection-start-line="6" selection-start-column="5" selection-end-line="6" selection-end-column="5" />
732 817
         </state>
733 818
       </provider>
734 819
     </entry>
735 820
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
736 821
       <provider selected="true" editor-type-id="text-editor">
737 822
         <state relative-caret-position="165">
738
-          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
739
-        </state>
740
-      </provider>
741
-    </entry>
742
-    <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
743
-      <provider selected="true" editor-type-id="text-editor">
744
-        <state relative-caret-position="90">
745
-          <caret line="8" selection-start-line="8" selection-end-line="8" />
823
+          <caret line="13" selection-start-line="13" selection-end-line="13" />
746 824
         </state>
747 825
       </provider>
748 826
     </entry>
@@ -756,10 +834,17 @@
756 834
         </state>
757 835
       </provider>
758 836
     </entry>
837
+    <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
838
+      <provider selected="true" editor-type-id="text-editor">
839
+        <state relative-caret-position="90">
840
+          <caret line="8" selection-start-line="8" selection-end-line="8" />
841
+        </state>
842
+      </provider>
843
+    </entry>
759 844
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
760 845
       <provider selected="true" editor-type-id="text-editor">
761
-        <state relative-caret-position="465">
762
-          <caret line="31" column="5" lean-forward="true" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
846
+        <state relative-caret-position="150">
847
+          <caret line="10" column="33" lean-forward="true" selection-start-line="10" selection-start-column="33" selection-end-line="10" selection-end-column="33" />
763 848
           <folding>
764 849
             <element signature="method#withdraw#0;class#Account#0" />
765 850
             <element signature="method#getDouble#0;class#Account#0" />
@@ -769,10 +854,11 @@
769 854
     </entry>
770 855
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
771 856
       <provider selected="true" editor-type-id="text-editor">
772
-        <state relative-caret-position="425">
773
-          <caret line="29" column="48" lean-forward="true" selection-start-line="29" selection-start-column="48" selection-end-line="29" selection-end-column="48" />
857
+        <state relative-caret-position="447">
858
+          <caret line="41" column="41" lean-forward="true" selection-start-line="41" selection-start-column="41" selection-end-line="41" selection-end-column="41" />
774 859
           <folding>
775 860
             <element signature="imports" expanded="true" />
861
+            <element signature="e#323#340#0" expanded="true" />
776 862
           </folding>
777 863
         </state>
778 864
       </provider>

+ 11
- 0
src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java Просмотреть файл

@@ -25,6 +25,7 @@ public class MainApplication {
25 25
         while(looping){
26 26
 
27 27
             if(this.selectedAccount != null){
28
+                System.out.println("Select Withdraw, Deposit , Check Balance or Back");
28 29
                 System.out.println(this.selectedAccount.name + " Selected - " + this.selectedAccount.checkBalance());
29 30
                 String transaction = getInput("Please Enter a Transaction: ");
30 31
                 if(!transaction.equals("back")){
@@ -37,8 +38,11 @@ public class MainApplication {
37 38
             } else{
38 39
                 accountAmounts();
39 40
                 String account = getInput("Please Select a Account: ");
41
+
40 42
                 this.setAccount(account);
41 43
             }
44
+
45
+
42 46
         }
43 47
 
44 48
     }
@@ -61,11 +65,18 @@ public class MainApplication {
61 65
 
62 66
     public void accountAmounts(){
63 67
         double balance = 0.00;
68
+        double total   = 0.00;
64 69
         String accountName = null;
70
+        System.out.println("Please Select a account: ");
71
+        System.out.println("-----------------");
65 72
         for (Map.Entry<String,Account> account: this.accounts.entrySet()){
66 73
             balance = account.getValue().checkBalance();
67 74
             System.out.println(account.getKey() + " - " + balance);
75
+            total += balance;
68 76
         }
77
+        System.out.println("-----------------");
78
+        System.out.println("Total - " + total);
79
+        System.out.println("-----------------");
69 80
     }
70 81
 
71 82
 }