Chad преди 8 години
родител
ревизия
15e66c0655
променени са 2 файла, в които са добавени 93 реда и са изтрити 113 реда
  1. 88
    109
      .idea/workspace.xml
  2. 5
    4
      src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java

+ 88
- 109
.idea/workspace.xml Целия файл

@@ -2,9 +2,8 @@
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/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
5 6
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java" afterDir="false" />
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" />
7
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java" afterDir="false" />
8 7
     </list>
9 8
     <ignored path="$PROJECT_DIR$/out/" />
10 9
     <ignored path="$PROJECT_DIR$/target/" />
@@ -22,14 +21,8 @@
22 21
           <file leaf-file-name="ATM.java" pinned="false" current-in-tab="true">
23 22
             <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java">
24 23
               <provider selected="true" editor-type-id="text-editor">
25
-                <state relative-caret-position="192">
26
-                  <caret line="107" column="27" selection-start-line="107" selection-start-column="27" selection-end-line="107" selection-end-column="27" />
27
-                  <folding>
28
-                    <element signature="e#219#220#0" expanded="true" />
29
-                    <element signature="e#250#251#0" expanded="true" />
30
-                    <element signature="e#305#306#0" expanded="true" />
31
-                    <element signature="e#345#346#0" expanded="true" />
32
-                  </folding>
24
+                <state relative-caret-position="248">
25
+                  <caret line="115" column="24" lean-forward="true" selection-start-line="115" selection-start-column="24" selection-end-line="115" selection-end-column="24" />
33 26
                 </state>
34 27
               </provider>
35 28
             </entry>
@@ -37,8 +30,11 @@
37 30
           <file leaf-file-name="ATMTest.java" pinned="false" current-in-tab="false">
38 31
             <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java">
39 32
               <provider selected="true" editor-type-id="text-editor">
40
-                <state relative-caret-position="30">
33
+                <state relative-caret-position="90">
41 34
                   <caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
35
+                  <folding>
36
+                    <element signature="imports" expanded="true" />
37
+                  </folding>
42 38
                 </state>
43 39
               </provider>
44 40
             </entry>
@@ -55,12 +51,8 @@
55 51
           <file leaf-file-name="Console.java" pinned="false" current-in-tab="false">
56 52
             <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Console.java">
57 53
               <provider selected="true" editor-type-id="text-editor">
58
-                <state relative-caret-position="240">
54
+                <state relative-caret-position="210">
59 55
                   <caret line="18" column="56" selection-start-line="18" selection-start-column="56" selection-end-line="18" selection-end-column="56" />
60
-                  <folding>
61
-                    <element signature="e#205#206#0" expanded="true" />
62
-                    <element signature="e#252#253#0" expanded="true" />
63
-                  </folding>
64 56
                 </state>
65 57
               </provider>
66 58
             </entry>
@@ -68,22 +60,8 @@
68 60
           <file leaf-file-name="BankAccount.java" pinned="false" current-in-tab="false">
69 61
             <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java">
70 62
               <provider selected="true" editor-type-id="text-editor">
71
-                <state relative-caret-position="214">
72
-                  <caret line="15" column="68" lean-forward="true" selection-start-line="15" selection-start-column="68" selection-end-line="15" selection-end-column="68" />
73
-                  <folding>
74
-                    <element signature="e#235#236#0" expanded="true" />
75
-                    <element signature="e#271#272#0" expanded="true" />
76
-                    <element signature="e#329#330#0" expanded="true" />
77
-                    <element signature="e#379#380#0" expanded="true" />
78
-                    <element signature="e#415#416#0" expanded="true" />
79
-                    <element signature="e#447#448#0" expanded="true" />
80
-                    <element signature="e#497#498#0" expanded="true" />
81
-                    <element signature="e#539#540#0" expanded="true" />
82
-                    <element signature="e#188#189#0" expanded="true" />
83
-                    <element signature="e#225#226#0" expanded="true" />
84
-                    <element signature="e#285#286#0" expanded="true" />
85
-                    <element signature="e#337#338#0" expanded="true" />
86
-                  </folding>
63
+                <state relative-caret-position="225">
64
+                  <caret line="15" column="68" selection-start-line="15" selection-start-column="68" selection-end-line="15" selection-end-column="68" />
87 65
                 </state>
88 66
               </provider>
89 67
             </entry>
@@ -104,11 +82,11 @@
104 82
         </leaf>
105 83
       </split-first>
106 84
       <split-second>
107
-        <leaf>
85
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
108 86
           <file leaf-file-name="ATMTest.java" pinned="false" current-in-tab="true">
109 87
             <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java">
110 88
               <provider selected="true" editor-type-id="text-editor">
111
-                <state relative-caret-position="139">
89
+                <state relative-caret-position="465">
112 90
                   <caret line="31" selection-start-line="31" selection-end-line="31" />
113 91
                   <folding>
114 92
                     <element signature="imports" expanded="true" />
@@ -166,8 +144,8 @@
166 144
     <packageJsonPaths />
167 145
   </component>
168 146
   <component name="ProjectFrameBounds">
169
-    <option name="x" value="-121" />
170
-    <option name="y" value="-938" />
147
+    <option name="x" value="-67" />
148
+    <option name="y" value="-902" />
171 149
     <option name="width" value="1717" />
172 150
     <option name="height" value="849" />
173 151
   </component>
@@ -179,6 +157,9 @@
179 157
       <foldersAlwaysOnTop value="true" />
180 158
     </navigator>
181 159
     <panes>
160
+      <pane id="Scope" />
161
+      <pane id="AndroidView" />
162
+      <pane id="PackagesPane" />
182 163
       <pane id="ProjectPane">
183 164
         <subPane>
184 165
           <expand>
@@ -237,9 +218,6 @@
237 218
           <select />
238 219
         </subPane>
239 220
       </pane>
240
-      <pane id="PackagesPane" />
241
-      <pane id="AndroidView" />
242
-      <pane id="Scope" />
243 221
     </panes>
244 222
   </component>
245 223
   <component name="PropertiesComponent">
@@ -434,7 +412,8 @@
434 412
       <option name="number" value="Default" />
435 413
       <option name="presentableId" value="Default" />
436 414
       <updated>1515620835041</updated>
437
-      <workItem from="1529100105765" duration="20347000" />
415
+      <workItem from="1529100105765" duration="21672000" />
416
+      <workItem from="1529184595044" duration="889000" />
438 417
     </task>
439 418
     <servers />
440 419
   </component>
@@ -465,41 +444,40 @@
465 444
     </history-entry>
466 445
   </component>
467 446
   <component name="TimeTrackingManager">
468
-    <option name="totallyTimeSpent" value="20347000" />
447
+    <option name="totallyTimeSpent" value="22561000" />
469 448
   </component>
470 449
   <component name="ToolWindowManager">
471
-    <frame x="-121" y="-938" width="1717" height="849" extended-state="0" />
472
-    <editor active="true" />
450
+    <frame x="-67" y="-902" width="1717" height="849" extended-state="0" />
473 451
     <layout>
474 452
       <window_info anchor="right" id="Palette" order="3" />
475 453
       <window_info anchor="bottom" id="TODO" order="6" />
476
-      <window_info anchor="bottom" id="Messages" sideWeight="0.4997088" weight="0.32903227" />
454
+      <window_info anchor="bottom" id="Messages" order="7" sideWeight="0.4997088" weight="0.32903227" />
477 455
       <window_info anchor="right" id="Palette&#9;" order="3" />
478 456
       <window_info id="Image Layers" order="2" />
479 457
       <window_info anchor="right" id="Capture Analysis" order="3" />
480 458
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5002912" side_tool="true" weight="0.32903227" />
481 459
       <window_info anchor="right" id="Maven Projects" order="3" />
482
-      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
483
-      <window_info anchor="bottom" id="Run" order="2" weight="0.32903227" />
460
+      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
484 461
       <window_info anchor="bottom" id="Version Control" order="7" />
462
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.32903227" />
485 463
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.27225807" />
486 464
       <window_info id="Capture Tool" order="2" />
487 465
       <window_info id="Designer" order="2" />
488 466
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.14560279" />
489
-      <window_info anchor="right" id="Database" />
467
+      <window_info anchor="right" id="Database" order="4" />
490 468
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
491 469
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
492 470
       <window_info id="UI Designer" order="2" />
493 471
       <window_info anchor="right" id="Theme Preview" order="3" />
494
-      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.4" />
495 472
       <window_info id="Favorites" order="2" side_tool="true" />
496
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
473
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
497 474
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
498
-      <window_info id="Nl-Palette" order="2" />
499 475
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
476
+      <window_info id="Nl-Palette" order="2" />
477
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
500 478
       <window_info anchor="right" id="Properties" order="3" />
501 479
       <window_info anchor="bottom" id="Message" order="0" />
502
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
480
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
503 481
       <window_info anchor="bottom" id="Find" order="1" />
504 482
     </layout>
505 483
   </component>
@@ -511,17 +489,59 @@
511 489
   </component>
512 490
   <component name="XDebuggerManager">
513 491
     <breakpoint-manager>
514
-      <breakpoints>
515
-        <line-breakpoint enabled="true" type="java-line">
516
-          <url>file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java</url>
517
-          <line>29</line>
518
-          <properties />
519
-        </line-breakpoint>
520
-      </breakpoints>
521 492
       <option name="time" value="1" />
522 493
     </breakpoint-manager>
523 494
   </component>
524 495
   <component name="editorHistoryManager">
496
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java">
497
+      <provider selected="true" editor-type-id="text-editor">
498
+        <state relative-caret-position="300">
499
+          <caret line="24" column="25" lean-forward="true" selection-start-line="24" selection-start-column="25" selection-end-line="24" selection-end-column="25" />
500
+        </state>
501
+      </provider>
502
+    </entry>
503
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
504
+      <provider selected="true" editor-type-id="text-editor">
505
+        <state relative-caret-position="150">
506
+          <caret line="10" column="21" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="21" />
507
+        </state>
508
+      </provider>
509
+    </entry>
510
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Console.java">
511
+      <provider selected="true" editor-type-id="text-editor">
512
+        <state relative-caret-position="210">
513
+          <caret line="18" column="56" selection-start-line="18" selection-start-column="56" selection-end-line="18" selection-end-column="56" />
514
+        </state>
515
+      </provider>
516
+    </entry>
517
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java">
518
+      <provider selected="true" editor-type-id="text-editor">
519
+        <state relative-caret-position="225">
520
+          <caret line="15" column="68" lean-forward="true" selection-start-line="15" selection-start-column="68" selection-end-line="15" selection-end-column="68" />
521
+        </state>
522
+      </provider>
523
+    </entry>
524
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
525
+      <provider selected="true" editor-type-id="text-editor">
526
+        <state relative-caret-position="60">
527
+          <caret line="4" column="60" selection-start-line="4" selection-start-column="60" selection-end-line="4" selection-end-column="60" />
528
+          <folding>
529
+            <element signature="e#166#167#0" expanded="true" />
530
+            <element signature="e#214#215#0" expanded="true" />
531
+          </folding>
532
+        </state>
533
+      </provider>
534
+    </entry>
535
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java">
536
+      <provider selected="true" editor-type-id="text-editor">
537
+        <state relative-caret-position="90">
538
+          <caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
539
+          <folding>
540
+            <element signature="imports" expanded="true" />
541
+          </folding>
542
+        </state>
543
+      </provider>
544
+    </entry>
525 545
     <entry file="file://$PROJECT_DIR$/pom.xml">
526 546
       <provider selected="true" editor-type-id="text-editor" />
527 547
     </entry>
@@ -536,20 +556,6 @@
536 556
       <provider selected="true" editor-type-id="text-editor">
537 557
         <state relative-caret-position="75">
538 558
           <caret line="5" column="24" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
539
-          <folding>
540
-            <element signature="e#235#236#0" expanded="true" />
541
-            <element signature="e#271#272#0" expanded="true" />
542
-            <element signature="e#329#330#0" expanded="true" />
543
-            <element signature="e#379#380#0" expanded="true" />
544
-            <element signature="e#415#416#0" expanded="true" />
545
-            <element signature="e#447#448#0" expanded="true" />
546
-            <element signature="e#497#498#0" expanded="true" />
547
-            <element signature="e#539#540#0" expanded="true" />
548
-            <element signature="e#188#189#0" expanded="true" />
549
-            <element signature="e#225#226#0" expanded="true" />
550
-            <element signature="e#285#286#0" expanded="true" />
551
-            <element signature="e#337#338#0" expanded="true" />
552
-          </folding>
553 559
         </state>
554 560
       </provider>
555 561
     </entry>
@@ -597,13 +603,7 @@
597 603
     <entry file="file://$PROJECT_DIR$/pom.xml">
598 604
       <provider selected="true" editor-type-id="text-editor" />
599 605
     </entry>
600
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
601
-      <provider selected="true" editor-type-id="text-editor">
602
-        <state relative-caret-position="30">
603
-          <caret line="2" column="16" selection-start-line="2" selection-start-column="16" selection-end-line="2" selection-end-column="16" />
604
-        </state>
605
-      </provider>
606
-    </entry>
606
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" />
607 607
     <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/SavingsAccountTest.java">
608 608
       <provider selected="true" editor-type-id="text-editor">
609 609
         <state relative-caret-position="30">
@@ -652,33 +652,15 @@
652 652
     </entry>
653 653
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Console.java">
654 654
       <provider selected="true" editor-type-id="text-editor">
655
-        <state relative-caret-position="240">
655
+        <state relative-caret-position="210">
656 656
           <caret line="18" column="56" selection-start-line="18" selection-start-column="56" selection-end-line="18" selection-end-column="56" />
657
-          <folding>
658
-            <element signature="e#205#206#0" expanded="true" />
659
-            <element signature="e#252#253#0" expanded="true" />
660
-          </folding>
661 657
         </state>
662 658
       </provider>
663 659
     </entry>
664 660
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java">
665 661
       <provider selected="true" editor-type-id="text-editor">
666
-        <state relative-caret-position="214">
667
-          <caret line="15" column="68" lean-forward="true" selection-start-line="15" selection-start-column="68" selection-end-line="15" selection-end-column="68" />
668
-          <folding>
669
-            <element signature="e#235#236#0" expanded="true" />
670
-            <element signature="e#271#272#0" expanded="true" />
671
-            <element signature="e#329#330#0" expanded="true" />
672
-            <element signature="e#379#380#0" expanded="true" />
673
-            <element signature="e#415#416#0" expanded="true" />
674
-            <element signature="e#447#448#0" expanded="true" />
675
-            <element signature="e#497#498#0" expanded="true" />
676
-            <element signature="e#539#540#0" expanded="true" />
677
-            <element signature="e#188#189#0" expanded="true" />
678
-            <element signature="e#225#226#0" expanded="true" />
679
-            <element signature="e#285#286#0" expanded="true" />
680
-            <element signature="e#337#338#0" expanded="true" />
681
-          </folding>
662
+        <state relative-caret-position="225">
663
+          <caret line="15" column="68" selection-start-line="15" selection-start-column="68" selection-end-line="15" selection-end-column="68" />
682 664
         </state>
683 665
       </provider>
684 666
     </entry>
@@ -695,8 +677,11 @@
695 677
     </entry>
696 678
     <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java">
697 679
       <provider selected="true" editor-type-id="text-editor">
698
-        <state relative-caret-position="30">
680
+        <state relative-caret-position="90">
699 681
           <caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
682
+          <folding>
683
+            <element signature="imports" expanded="true" />
684
+          </folding>
700 685
         </state>
701 686
       </provider>
702 687
     </entry>
@@ -709,14 +694,8 @@
709 694
     </entry>
710 695
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java">
711 696
       <provider selected="true" editor-type-id="text-editor">
712
-        <state relative-caret-position="192">
713
-          <caret line="107" column="27" selection-start-line="107" selection-start-column="27" selection-end-line="107" selection-end-column="27" />
714
-          <folding>
715
-            <element signature="e#219#220#0" expanded="true" />
716
-            <element signature="e#250#251#0" expanded="true" />
717
-            <element signature="e#305#306#0" expanded="true" />
718
-            <element signature="e#345#346#0" expanded="true" />
719
-          </folding>
697
+        <state relative-caret-position="248">
698
+          <caret line="115" column="24" lean-forward="true" selection-start-line="115" selection-start-column="24" selection-end-line="115" selection-end-column="24" />
720 699
         </state>
721 700
       </provider>
722 701
     </entry>

+ 5
- 4
src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java Целия файл

@@ -101,22 +101,23 @@ public class ATM {
101 101
 
102 102
     public void createAccounts() {
103 103
 
104
-        for (BankAccount account : accounts) {
104
+        for (int i=0; i<accounts.length; i++) {
105 105
 
106 106
             switch (console.getIntInput("What kind of account would you like to open?\n1.Business\n2.Checking\n3.Savings\n")) {
107 107
                 case (1):
108
-                    account = new BusinessAccount(console.getDoubleInput("How much would you like to deposit?"), console.getStringInput("What is your name?"));
108
+                    accounts[i] = new BusinessAccount(console.getDoubleInput("How much would you like to deposit?"), console.getStringInput("What is your name?"));
109 109
                     break;
110 110
                 case (2):
111
-                    account = new CheckingAccount(console.getDoubleInput("How much would you like to deposit?"), console.getStringInput("What is your name?"));
111
+                    accounts[i] = new CheckingAccount(console.getDoubleInput("How much would you like to deposit?"), console.getStringInput("What is your name?"));
112 112
                     break;
113 113
                 case (3):
114
-                    account = new SavingsAccount(console.getDoubleInput("How much would you like to deposit?"), console.getStringInput("What is your name?"));
114
+                    accounts[i] = new SavingsAccount(console.getDoubleInput("How much would you like to deposit?"), console.getStringInput("What is your name?"));
115 115
                     break;
116 116
                 default:
117 117
                     console.println("Please enter the number associated with your choice");
118 118
             }
119 119
         }
120
+
120 121
     }
121 122
 
122 123