Nicholas Maidanos 8 лет назад
Родитель
Сommit
a167a9b621

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

@@ -2,16 +2,12 @@
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 beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
6
-      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
7 5
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
8
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
9
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" 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" />
10 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" />
11 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" />
12 9
       <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" />
13 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" />
14
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java" afterDir="false" />
15 11
     </list>
16 12
     <ignored path="$PROJECT_DIR$/out/" />
17 13
     <ignored path="$PROJECT_DIR$/target/" />
@@ -27,11 +23,10 @@
27 23
       <file leaf-file-name="MainApplication.java" pinned="false" current-in-tab="true">
28 24
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
29 25
           <provider selected="true" editor-type-id="text-editor">
30
-            <state relative-caret-position="419">
31
-              <caret line="35" column="17" selection-start-line="35" selection-start-column="17" selection-end-line="35" selection-end-column="17" />
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" />
32 28
               <folding>
33 29
                 <element signature="imports" expanded="true" />
34
-                <element signature="e#323#340#0" expanded="true" />
35 30
               </folding>
36 31
             </state>
37 32
           </provider>
@@ -40,27 +35,48 @@
40 35
       <file leaf-file-name="Account.java" pinned="false" current-in-tab="false">
41 36
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
42 37
           <provider selected="true" editor-type-id="text-editor">
43
-            <state relative-caret-position="570">
44
-              <caret line="45" column="16" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="16" />
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" />
45 40
               <folding>
46
-                <element signature="method#Account#0;class#Account#0" />
41
+                <element signature="method#withdraw#0;class#Account#0" />
47 42
                 <element signature="method#getDouble#0;class#Account#0" />
48
-                <element signature="e#1865#1866#0" expanded="true" />
49
-                <element signature="e#1886#1887#0" expanded="true" />
50 43
               </folding>
51 44
             </state>
52 45
           </provider>
53 46
         </entry>
54 47
       </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>
55 75
       <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
56 76
         <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
57 77
           <provider selected="true" editor-type-id="text-editor">
58
-            <state relative-caret-position="120">
59
-              <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
60
-              <folding>
61
-                <element signature="e#129#130#0" expanded="true" />
62
-                <element signature="e#165#166#0" expanded="true" />
63
-              </folding>
78
+            <state relative-caret-position="90">
79
+              <caret line="8" selection-start-line="8" selection-end-line="8" />
64 80
             </state>
65 81
           </provider>
66 82
         </entry>
@@ -68,8 +84,8 @@
68 84
       <file leaf-file-name="BankAccountTest.java" pinned="false" current-in-tab="false">
69 85
         <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java">
70 86
           <provider selected="true" editor-type-id="text-editor">
71
-            <state relative-caret-position="-169">
72
-              <caret column="36" lean-forward="true" selection-start-column="36" selection-end-column="36" />
87
+            <state>
88
+              <caret column="36" selection-start-column="36" selection-end-column="36" />
73 89
               <folding>
74 90
                 <element signature="imports" expanded="true" />
75 91
               </folding>
@@ -99,14 +115,14 @@
99 115
         <option value="$PROJECT_DIR$/README.md" />
100 116
         <option value="$PROJECT_DIR$/src/main/java/Account.java" />
101 117
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" />
102
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java" />
103
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" />
104
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" />
105 118
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountWithdrawTest.java" />
106 119
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" />
107 120
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java" />
108 121
         <option value="$PROJECT_DIR$/src/main/java/Main.java" />
109 122
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" />
123
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java" />
124
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" />
125
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" />
110 126
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" />
111 127
       </list>
112 128
     </option>
@@ -132,8 +148,6 @@
132 148
       <foldersAlwaysOnTop value="true" />
133 149
     </navigator>
134 150
     <panes>
135
-      <pane id="PackagesPane" />
136
-      <pane id="Scope" />
137 151
       <pane id="AndroidView" />
138 152
       <pane id="ProjectPane">
139 153
         <subPane>
@@ -193,6 +207,8 @@
193 207
           <select />
194 208
         </subPane>
195 209
       </pane>
210
+      <pane id="PackagesPane" />
211
+      <pane id="Scope" />
196 212
     </panes>
197 213
   </component>
198 214
   <component name="PropertiesComponent">
@@ -447,7 +463,8 @@
447 463
       <updated>1515620835041</updated>
448 464
       <workItem from="1528305280827" duration="1753000" />
449 465
       <workItem from="1528308399488" duration="1165000" />
450
-      <workItem from="1528331841664" duration="7592000" />
466
+      <workItem from="1528331841664" duration="8015000" />
467
+      <workItem from="1528372341716" duration="537000" />
451 468
     </task>
452 469
     <servers />
453 470
   </component>
@@ -478,15 +495,15 @@
478 495
     </history-entry>
479 496
   </component>
480 497
   <component name="TimeTrackingManager">
481
-    <option name="totallyTimeSpent" value="10510000" />
498
+    <option name="totallyTimeSpent" value="11470000" />
482 499
   </component>
483 500
   <component name="ToolWindowManager">
484
-    <frame x="0" y="0" width="1280" height="800" extended-state="0" />
501
+    <frame x="0" y="0" width="1920" height="1080" extended-state="0" />
485 502
     <editor active="true" />
486 503
     <layout>
487 504
       <window_info anchor="right" id="Palette" order="3" />
488 505
       <window_info anchor="bottom" id="TODO" order="6" />
489
-      <window_info anchor="bottom" id="Messages" weight="0.32965517" />
506
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.32935324" />
490 507
       <window_info anchor="right" id="Palette&#9;" order="3" />
491 508
       <window_info id="Image Layers" order="2" />
492 509
       <window_info anchor="right" id="Capture Analysis" order="3" />
@@ -494,11 +511,11 @@
494 511
       <window_info anchor="right" id="Maven Projects" order="3" />
495 512
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
496 513
       <window_info anchor="bottom" id="Version Control" order="7" />
497
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.32965517" />
498
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.2537931" />
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" />
499 516
       <window_info id="Capture Tool" order="2" />
500 517
       <window_info id="Designer" order="2" />
501
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.226979" />
518
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22736955" />
502 519
       <window_info anchor="right" id="Database" order="4" />
503 520
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
504 521
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -506,13 +523,13 @@
506 523
       <window_info anchor="right" id="Theme Preview" order="3" />
507 524
       <window_info id="Favorites" order="2" side_tool="true" />
508 525
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
509
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
510
-      <window_info id="Nl-Palette" order="2" />
511 526
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
512 527
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
528
+      <window_info id="Nl-Palette" order="2" />
529
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
513 530
       <window_info anchor="right" id="Properties" order="3" />
514 531
       <window_info anchor="bottom" id="Message" order="0" />
515
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
532
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
516 533
       <window_info anchor="bottom" id="Find" order="1" />
517 534
     </layout>
518 535
   </component>
@@ -524,26 +541,54 @@
524 541
   </component>
525 542
   <component name="XDebuggerManager">
526 543
     <breakpoint-manager>
527
-      <breakpoints>
528
-        <line-breakpoint type="java-field">
529
-          <url>file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java</url>
530
-          <line>24</line>
531
-          <properties field="balance" class="com.zipcodewilmington.bankaccountlab.Account" />
532
-          <option name="temporary" value="true" />
533
-          <option name="timeStamp" value="4" />
534
-        </line-breakpoint>
535
-      </breakpoints>
536 544
       <option name="time" value="6" />
537 545
     </breakpoint-manager>
538 546
   </component>
539 547
   <component name="editorHistoryManager">
540 548
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
541 549
       <provider selected="true" editor-type-id="text-editor">
550
+        <state relative-caret-position="360">
551
+          <caret line="29" column="73" selection-start-line="29" selection-start-column="73" selection-end-line="29" selection-end-column="73" />
552
+          <folding>
553
+            <element signature="imports" expanded="true" />
554
+          </folding>
555
+        </state>
556
+      </provider>
557
+    </entry>
558
+    <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
559
+      <provider selected="true" editor-type-id="text-editor">
560
+        <state relative-caret-position="90">
561
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
562
+        </state>
563
+      </provider>
564
+    </entry>
565
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java">
566
+      <provider selected="true" editor-type-id="text-editor">
567
+        <state>
568
+          <caret column="36" lean-forward="true" selection-start-column="36" selection-end-column="36" />
569
+          <folding>
570
+            <element signature="imports" expanded="true" />
571
+          </folding>
572
+        </state>
573
+      </provider>
574
+    </entry>
575
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
576
+      <provider selected="true" editor-type-id="text-editor">
577
+        <state relative-caret-position="570">
578
+          <caret line="45" column="16" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="16" />
579
+          <folding>
580
+            <element signature="method#withdraw#0;class#Account#0" />
581
+            <element signature="method#getDouble#0;class#Account#0" />
582
+          </folding>
583
+        </state>
584
+      </provider>
585
+    </entry>
586
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
587
+      <provider selected="true" editor-type-id="text-editor">
542 588
         <state relative-caret-position="75">
543 589
           <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
544 590
           <folding>
545 591
             <element signature="imports" expanded="true" />
546
-            <element signature="e#323#340#0" expanded="true" />
547 592
           </folding>
548 593
         </state>
549 594
       </provider>
@@ -553,10 +598,8 @@
553 598
         <state relative-caret-position="120">
554 599
           <caret line="8" column="32" lean-forward="true" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
555 600
           <folding>
556
-            <element signature="method#Account#0;class#Account#0" />
601
+            <element signature="method#withdraw#0;class#Account#0" />
557 602
             <element signature="method#getDouble#0;class#Account#0" />
558
-            <element signature="e#1865#1866#0" expanded="true" />
559
-            <element signature="e#1886#1887#0" expanded="true" />
560 603
           </folding>
561 604
         </state>
562 605
       </provider>
@@ -673,56 +716,40 @@
673 716
       <provider selected="true" editor-type-id="text-editor" />
674 717
     </entry>
675 718
     <entry file="file://$PROJECT_DIR$/src/main/java/Account.java" />
719
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountWithdrawTest.java" />
720
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" />
676 721
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
677 722
       <provider selected="true" editor-type-id="text-editor">
678
-        <state relative-caret-position="90">
679
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
723
+        <state relative-caret-position="60">
724
+          <caret line="5" column="24" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
680 725
         </state>
681 726
       </provider>
682 727
     </entry>
683 728
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
684 729
       <provider selected="true" editor-type-id="text-editor">
685
-        <state relative-caret-position="90">
686
-          <caret line="8" column="28" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
687
-        </state>
688
-      </provider>
689
-    </entry>
690
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountWithdrawTest.java">
691
-      <provider selected="true" editor-type-id="text-editor">
692
-        <state relative-caret-position="15">
693
-          <caret line="1" selection-start-line="1" selection-end-line="1" />
694
-        </state>
695
-      </provider>
696
-    </entry>
697
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java">
698
-      <provider selected="true" editor-type-id="text-editor">
699
-        <state relative-caret-position="30">
700
-          <caret line="2" selection-start-line="2" selection-end-line="2" />
730
+        <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" />
701 732
         </state>
702 733
       </provider>
703 734
     </entry>
704 735
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
705 736
       <provider selected="true" editor-type-id="text-editor">
706
-        <state relative-caret-position="120">
707
-          <caret line="10" column="5" lean-forward="true" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
737
+        <state relative-caret-position="165">
738
+          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
708 739
         </state>
709 740
       </provider>
710 741
     </entry>
711 742
     <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
712 743
       <provider selected="true" editor-type-id="text-editor">
713
-        <state relative-caret-position="120">
714
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
715
-          <folding>
716
-            <element signature="e#129#130#0" expanded="true" />
717
-            <element signature="e#165#166#0" expanded="true" />
718
-          </folding>
744
+        <state relative-caret-position="90">
745
+          <caret line="8" selection-start-line="8" selection-end-line="8" />
719 746
         </state>
720 747
       </provider>
721 748
     </entry>
722 749
     <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java">
723 750
       <provider selected="true" editor-type-id="text-editor">
724
-        <state relative-caret-position="-169">
725
-          <caret column="36" lean-forward="true" selection-start-column="36" selection-end-column="36" />
751
+        <state>
752
+          <caret column="36" selection-start-column="36" selection-end-column="36" />
726 753
           <folding>
727 754
             <element signature="imports" expanded="true" />
728 755
           </folding>
@@ -731,24 +758,21 @@
731 758
     </entry>
732 759
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
733 760
       <provider selected="true" editor-type-id="text-editor">
734
-        <state relative-caret-position="570">
735
-          <caret line="45" column="16" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="16" />
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" />
736 763
           <folding>
737
-            <element signature="method#Account#0;class#Account#0" />
764
+            <element signature="method#withdraw#0;class#Account#0" />
738 765
             <element signature="method#getDouble#0;class#Account#0" />
739
-            <element signature="e#1865#1866#0" expanded="true" />
740
-            <element signature="e#1886#1887#0" expanded="true" />
741 766
           </folding>
742 767
         </state>
743 768
       </provider>
744 769
     </entry>
745 770
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
746 771
       <provider selected="true" editor-type-id="text-editor">
747
-        <state relative-caret-position="419">
748
-          <caret line="35" column="17" selection-start-line="35" selection-start-column="17" selection-end-line="35" selection-end-column="17" />
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" />
749 774
           <folding>
750 775
             <element signature="imports" expanded="true" />
751
-            <element signature="e#323#340#0" expanded="true" />
752 776
           </folding>
753 777
         </state>
754 778
       </provider>

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

@@ -4,29 +4,31 @@ import java.util.Scanner;
4 4
 
5 5
 public abstract class Account {
6 6
 
7
+    protected double balance;
8
+    protected String message;
9
+    protected String name;
10
+
7 11
     public void DO(String input){
8 12
         double amount = 0.0;
9 13
         if(input.equalsIgnoreCase("deposit")){
10 14
             amount = getDouble("Enter the amount you would like to Deposit: ");
11 15
             this.deposit(amount);
12
-            this.lastTranaction = amount + " Dollars has just been deposited in your Account";
16
+            this.message = amount + " Dollars has just been deposited in your Account";
13 17
         } else if(input.equalsIgnoreCase("withdraw")){
14 18
             amount = getDouble("Enter the amount you would like to withdraw from your Account: ");
15 19
             if(this.withdraw(amount)){
16
-                this.lastTranaction = amount + " Dollars has just been deposited in your Account";
20
+                this.message = amount + " Dollars has just been withdrew from your Account";
17 21
             } else {
18
-                this.lastTranaction = "Insufficient funds";
22
+                this.message = "Insufficient funds";
19 23
             }
20
-        } else if(input.equalsIgnoreCase("balance")){
21
-            this.lastTranaction = "Current Balance = " + this.checkBalance();
22 24
         }
25
+//        else if(input.equalsIgnoreCase("balance")){
26
+//            this.message = "Current Balance = " + this.checkBalance();
27
+//        }
23 28
     }
24 29
 
25
-    protected double balance;
26
-    protected String lastTranaction ;
27
-
28
-    public Account(double balance) {
29
-
30
+    public Account(String name, double balance) {
31
+        this.name = name;
30 32
         this.balance =  balance;
31 33
     }
32 34
 
@@ -60,7 +62,7 @@ public abstract class Account {
60 62
     }
61 63
 
62 64
     public String lastMessage(){
63
-        return this.lastTranaction;
65
+        return this.message;
64 66
     }
65 67
 
66 68
 }

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

@@ -3,6 +3,6 @@ package com.zipcodewilmington.bankaccountlab;
3 3
 public class BusinessAccount extends Account {
4 4
 
5 5
     public BusinessAccount(double amount){
6
-        super(amount);
6
+        super( "Business",amount);
7 7
     }
8 8
 }

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

@@ -3,7 +3,7 @@ package com.zipcodewilmington.bankaccountlab;
3 3
 public class CheckingAccount extends Account {
4 4
 
5 5
     public CheckingAccount (double amount){
6
-        super(amount);
6
+        super("Checkings",amount);
7 7
     }
8 8
 
9 9
     public void CheckingAccount (){

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

@@ -25,9 +25,8 @@ public class MainApplication {
25 25
         while(looping){
26 26
 
27 27
             if(this.selectedAccount != null){
28
-                String className = this.selectedAccount.getClass().getName();
29
-                System.out.println(className + " Selected - " + this.selectedAccount.checkBalance());
30
-                String transaction = getInput("Please Enter a Transation: ");
28
+                System.out.println(this.selectedAccount.name + " Selected - " + this.selectedAccount.checkBalance());
29
+                String transaction = getInput("Please Enter a Transaction: ");
31 30
                 if(!transaction.equals("back")){
32 31
                     this.selectedAccount.DO(transaction);
33 32
                     System.out.println(this.selectedAccount.lastMessage());

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

@@ -3,7 +3,7 @@ package com.zipcodewilmington.bankaccountlab;
3 3
 public class SavingsAccount extends Account {
4 4
 
5 5
     public SavingsAccount(double amount){
6
-        super(amount);
6
+        super("Savings", amount);
7 7
     }
8 8
 
9 9
     public SavingsAccount(){