瀏覽代碼

update 1.0

Tennessee Gibbs 8 年之前
父節點
當前提交
c2dd3c2c56
共有 2 個文件被更改,包括 82 次插入438 次删除
  1. 66
    424
      .idea/workspace.xml
  2. 16
    14
      src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java

+ 66
- 424
.idea/workspace.xml 查看文件

@@ -1,22 +1,9 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4
-    <list default="true" id="6200422f-5b3e-443d-b0e2-52ca10c875b0" name="Default" comment="">
5
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java" afterDir="false" />
6
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java" afterDir="false" />
7
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" afterDir="false" />
8
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" afterDir="false" />
9
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java" afterDir="false" />
10
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BusinessAccountTest.java" afterDir="false" />
11
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" afterDir="false" />
12
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/SavingsAccountTest.java" afterDir="false" />
13
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
14
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
4
+    <list default="true" id="c069a53c-b7b9-417d-bb75-b6db20b2670d" name="Default" comment="">
15 5
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
16
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
17
-      <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" />
18
-      <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" />
19
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/Account.java" afterDir="false" />
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" />
20 7
     </list>
21 8
     <ignored path="$PROJECT_DIR$/target/" />
22 9
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -27,30 +14,22 @@
27 14
     <option name="LAST_RESOLUTION" value="IGNORE" />
28 15
   </component>
29 16
   <component name="FileEditorManager">
30
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
17
+    <leaf>
31 18
       <file leaf-file-name="Account.java" pinned="false" current-in-tab="false">
32 19
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
33 20
           <provider selected="true" editor-type-id="text-editor">
34
-            <state relative-caret-position="240">
35
-              <caret line="16" column="42" lean-forward="true" selection-start-line="16" selection-start-column="42" selection-end-line="16" selection-end-column="42" />
36
-              <folding>
37
-                <element signature="e#184#185#0" expanded="true" />
38
-                <element signature="e#222#223#0" expanded="true" />
39
-              </folding>
21
+            <state relative-caret-position="75">
22
+              <caret line="5" column="22" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
40 23
             </state>
41 24
           </provider>
42 25
         </entry>
43 26
       </file>
44
-      <file leaf-file-name="ATM.java" pinned="false" current-in-tab="false">
27
+      <file leaf-file-name="ATM.java" pinned="false" current-in-tab="true">
45 28
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java">
46 29
           <provider selected="true" editor-type-id="text-editor">
47
-            <state relative-caret-position="390">
48
-              <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
30
+            <state relative-caret-position="175">
31
+              <caret line="30" column="5" lean-forward="true" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
49 32
               <folding>
50
-                <element signature="imports" expanded="true" />
51
-                <element signature="e#205#214#0" expanded="true" />
52
-                <element signature="e#294#295#0" expanded="true" />
53
-                <element signature="e#331#332#0" expanded="true" />
54 33
                 <element signature="e#562#563#0" expanded="true" />
55 34
                 <element signature="e#600#601#0" expanded="true" />
56 35
                 <element signature="e#663#664#0" expanded="true" />
@@ -60,123 +39,51 @@
60 39
           </provider>
61 40
         </entry>
62 41
       </file>
63
-      <file leaf-file-name="MainApplication.java" pinned="false" current-in-tab="false">
64
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
42
+      <file leaf-file-name="BusinessAccount.java" pinned="false" current-in-tab="false">
43
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
65 44
           <provider selected="true" editor-type-id="text-editor">
66
-            <state relative-caret-position="210">
67
-              <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
68
-              <folding>
69
-                <element signature="e#199#200#0" expanded="true" />
70
-                <element signature="e#238#239#0" expanded="true" />
71
-              </folding>
45
+            <state relative-caret-position="30">
46
+              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
72 47
             </state>
73 48
           </provider>
74 49
         </entry>
75 50
       </file>
76
-      <file leaf-file-name="CheckingAccountTest.java" pinned="false" current-in-tab="true">
77
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java">
51
+      <file leaf-file-name="CheckingAccount.java" pinned="false" current-in-tab="false">
52
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
78 53
           <provider selected="true" editor-type-id="text-editor">
79
-            <state relative-caret-position="300">
80
-              <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
81
-              <folding>
82
-                <element signature="imports" expanded="true" />
83
-                <element signature="e#273#274#0" expanded="true" />
84
-                <element signature="e#319#320#0" expanded="true" />
85
-              </folding>
54
+            <state relative-caret-position="30">
55
+              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
86 56
             </state>
87 57
           </provider>
88 58
         </entry>
89 59
       </file>
90
-      <file leaf-file-name="SavingsAccount.java" pinned="false" current-in-tab="false">
91
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
92
-          <provider selected="true" editor-type-id="text-editor">
93
-            <state relative-caret-position="105">
94
-              <caret line="7" lean-forward="true" selection-start-line="1" selection-end-line="7" />
95
-              <folding>
96
-                <element signature="e#135#136#0" expanded="true" />
97
-                <element signature="e#167#168#0" expanded="true" />
98
-              </folding>
99
-            </state>
100
-          </provider>
101
-        </entry>
102
-      </file>
103
-      <file leaf-file-name="SavingsAccountTest.java" pinned="false" current-in-tab="false">
104
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/SavingsAccountTest.java">
105
-          <provider selected="true" editor-type-id="text-editor">
106
-            <state relative-caret-position="329">
107
-              <caret line="43" column="47" lean-forward="true" selection-start-line="43" selection-start-column="47" selection-end-line="43" selection-end-column="47" />
108
-              <folding>
109
-                <element signature="imports" expanded="true" />
110
-                <element signature="e#215#216#0" expanded="true" />
111
-                <element signature="e#260#261#0" expanded="true" />
112
-              </folding>
113
-            </state>
114
-          </provider>
115
-        </entry>
116
-      </file>
117
-      <file leaf-file-name="ATMTest.java" pinned="false" current-in-tab="false">
118
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java">
60
+      <file leaf-file-name="MainApplication.java" pinned="false" current-in-tab="false">
61
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
119 62
           <provider selected="true" editor-type-id="text-editor">
120
-            <state relative-caret-position="180">
121
-              <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
122
-              <folding>
123
-                <element signature="imports" expanded="true" />
124
-              </folding>
63
+            <state relative-caret-position="90">
64
+              <caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
125 65
             </state>
126 66
           </provider>
127 67
         </entry>
128 68
       </file>
129
-      <file leaf-file-name="BusinessAccountTest.java" pinned="false" current-in-tab="false">
130
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BusinessAccountTest.java">
69
+      <file leaf-file-name="SavingsAccount.java" pinned="false" current-in-tab="false">
70
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
131 71
           <provider selected="true" editor-type-id="text-editor">
132
-            <state relative-caret-position="270">
133
-              <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
134
-              <folding>
135
-                <element signature="imports" expanded="true" />
136
-              </folding>
72
+            <state relative-caret-position="30">
73
+              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
137 74
             </state>
138 75
           </provider>
139 76
         </entry>
140 77
       </file>
141 78
     </leaf>
142 79
   </component>
143
-  <component name="FileTemplateManagerImpl">
144
-    <option name="RECENT_TEMPLATES">
145
-      <list>
146
-        <option value="Class" />
147
-        <option value="JUnit4 Test Class" />
148
-      </list>
149
-    </option>
150
-  </component>
151
-  <component name="FindInProjectRecents">
152
-    <replaceStrings>
153
-      <replace />
154
-    </replaceStrings>
155
-    <dirStrings>
156
-      <dir>$PROJECT_DIR$/src/test/java</dir>
157
-      <dir>$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab</dir>
158
-    </dirStrings>
159
-  </component>
160 80
   <component name="Git.Settings">
161 81
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
162 82
   </component>
163 83
   <component name="IdeDocumentHistory">
164 84
     <option name="CHANGED_PATHS">
165 85
       <list>
166
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" />
167
-        <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java" />
168
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java" />
169
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" />
170
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" />
171
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Atm.java" />
172
-        <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/AtmTest.java" />
173 86
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java" />
174
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" />
175
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" />
176
-        <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java" />
177
-        <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BusinessAccountTest.java" />
178
-        <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" />
179
-        <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/SavingsAccountTest.java" />
180 87
       </list>
181 88
     </option>
182 89
   </component>
@@ -186,20 +93,12 @@
186 93
     <detection-done>true</detection-done>
187 94
     <sorting>DEFINITION_ORDER</sorting>
188 95
   </component>
189
-  <component name="MavenImportPreferences">
190
-    <option name="importingSettings">
191
-      <MavenImportingSettings>
192
-        <option name="importAutomatically" value="true" />
193
-      </MavenImportingSettings>
194
-    </option>
195
-  </component>
196 96
   <component name="NodePackageJsonFileManager">
197 97
     <packageJsonPaths />
198 98
   </component>
199 99
   <component name="ProjectFrameBounds">
200
-    <option name="x" value="405" />
201 100
     <option name="y" value="23" />
202
-    <option name="width" value="1035" />
101
+    <option name="width" value="1440" />
203 102
     <option name="height" value="821" />
204 103
   </component>
205 104
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -209,7 +108,7 @@
209 108
     </navigator>
210 109
     <panes>
211 110
       <pane id="PackagesPane" />
212
-      <pane id="Scope" />
111
+      <pane id="AndroidView" />
213 112
       <pane id="ProjectPane">
214 113
         <subPane>
215 114
           <expand>
@@ -268,30 +167,16 @@
268 167
           <select />
269 168
         </subPane>
270 169
       </pane>
271
-      <pane id="AndroidView" />
170
+      <pane id="Scope" />
272 171
     </panes>
273 172
   </component>
274 173
   <component name="PropertiesComponent">
275 174
     <property name="WebServerToolWindowFactoryState" value="false" />
276 175
     <property name="aspect.path.notification.shown" value="true" />
277
-    <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit4" />
278
-    <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit4" value="" />
279
-    <property name="com.intellij.testIntegration.createTest.CreateTestDialog.includeInheritedMembers" value="true" />
280 176
     <property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
281 177
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
282 178
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
283 179
   </component>
284
-  <component name="RecentsManager">
285
-    <key name="CreateTestDialog.RecentsKey">
286
-      <recent name="com.zipcodewilmington.bankaccountlab" />
287
-    </key>
288
-    <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
289
-      <recent name="com.zipcodewilmington.bankaccountlab" />
290
-    </key>
291
-    <key name="CreateTestDialog.Recents.Supers">
292
-      <recent name="" />
293
-    </key>
294
-  </component>
295 180
   <component name="RunDashboard">
296 181
     <option name="ruleStates">
297 182
       <list>
@@ -304,7 +189,7 @@
304 189
       </list>
305 190
     </option>
306 191
   </component>
307
-  <component name="RunManager" selected="JUnit.com.zipcodewilmington.bankaccountlab in bankaccountlab">
192
+  <component name="RunManager" selected="JUnit.All in bankaccountlab">
308 193
     <configuration name="MainApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
309 194
       <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.MainApplication" />
310 195
       <module name="bankaccountlab" />
@@ -319,66 +204,14 @@
319 204
     <configuration default="true" type="Application" factoryName="Application">
320 205
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
321 206
     </configuration>
322
-    <configuration name="ATMTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
207
+    <configuration name="All in bankaccountlab" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
323 208
       <module name="bankaccountlab" />
324
-      <extension name="coverage">
325
-        <pattern>
326
-          <option name="PATTERN" value="com.zipcodewilmington.bankaccountlab.*" />
327
-          <option name="ENABLED" value="true" />
328
-        </pattern>
329
-      </extension>
330 209
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
331 210
       <option name="ALTERNATIVE_JRE_PATH" />
332
-      <option name="PACKAGE_NAME" value="com.zipcodewilmington.bankaccountlab" />
333
-      <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.ATMTest" />
334
-      <option name="METHOD_NAME" />
335
-      <option name="TEST_OBJECT" value="class" />
336
-      <option name="VM_PARAMETERS" value="-ea" />
337
-      <option name="PARAMETERS" />
338
-      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
339
-      <option name="PASS_PARENT_ENVS" value="true" />
340
-      <option name="TEST_SEARCH_SCOPE">
341
-        <value defaultName="singleModule" />
342
-      </option>
343
-      <patterns />
344
-    </configuration>
345
-    <configuration name="BusinessAccountTest.checkBalance" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
346
-      <module name="bankaccountlab" />
347
-      <extension name="coverage">
348
-        <pattern>
349
-          <option name="PATTERN" value="com.zipcodewilmington.bankaccountlab.*" />
350
-          <option name="ENABLED" value="true" />
351
-        </pattern>
352
-      </extension>
353
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
354
-      <option name="ALTERNATIVE_JRE_PATH" />
355
-      <option name="PACKAGE_NAME" value="com.zipcodewilmington.bankaccountlab" />
356
-      <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.BusinessAccountTest" />
357
-      <option name="METHOD_NAME" value="checkBalance" />
358
-      <option name="TEST_OBJECT" value="method" />
359
-      <option name="VM_PARAMETERS" value="-ea" />
360
-      <option name="PARAMETERS" />
361
-      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
362
-      <option name="PASS_PARENT_ENVS" value="true" />
363
-      <option name="TEST_SEARCH_SCOPE">
364
-        <value defaultName="singleModule" />
365
-      </option>
366
-      <patterns />
367
-    </configuration>
368
-    <configuration name="CheckingAccountTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
369
-      <module name="bankaccountlab" />
370
-      <extension name="coverage">
371
-        <pattern>
372
-          <option name="PATTERN" value="com.zipcodewilmington.bankaccountlab.*" />
373
-          <option name="ENABLED" value="true" />
374
-        </pattern>
375
-      </extension>
376
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
377
-      <option name="ALTERNATIVE_JRE_PATH" />
378
-      <option name="PACKAGE_NAME" value="com.zipcodewilmington.bankaccountlab" />
379
-      <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.CheckingAccountTest" />
211
+      <option name="PACKAGE_NAME" value="" />
212
+      <option name="MAIN_CLASS_NAME" />
380 213
       <option name="METHOD_NAME" />
381
-      <option name="TEST_OBJECT" value="class" />
214
+      <option name="TEST_OBJECT" value="package" />
382 215
       <option name="VM_PARAMETERS" value="-ea" />
383 216
       <option name="PARAMETERS" />
384 217
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
@@ -404,29 +237,6 @@
404 237
       </option>
405 238
       <patterns />
406 239
     </configuration>
407
-    <configuration name="com.zipcodewilmington.bankaccountlab in bankaccountlab" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
408
-      <module name="bankaccountlab" />
409
-      <extension name="coverage">
410
-        <pattern>
411
-          <option name="PATTERN" value="com.zipcodewilmington.bankaccountlab.*" />
412
-          <option name="ENABLED" value="true" />
413
-        </pattern>
414
-      </extension>
415
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
416
-      <option name="ALTERNATIVE_JRE_PATH" />
417
-      <option name="PACKAGE_NAME" value="com.zipcodewilmington.bankaccountlab" />
418
-      <option name="MAIN_CLASS_NAME" />
419
-      <option name="METHOD_NAME" />
420
-      <option name="TEST_OBJECT" value="package" />
421
-      <option name="VM_PARAMETERS" value="-ea" />
422
-      <option name="PARAMETERS" />
423
-      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
424
-      <option name="PASS_PARENT_ENVS" value="true" />
425
-      <option name="TEST_SEARCH_SCOPE">
426
-        <value defaultName="singleModule" />
427
-      </option>
428
-      <patterns />
429
-    </configuration>
430 240
     <configuration default="true" type="TestNG" factoryName="TestNG">
431 241
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
432 242
       <option name="ALTERNATIVE_JRE_PATH" />
@@ -450,19 +260,13 @@
450 260
       <listeners />
451 261
     </configuration>
452 262
     <list>
453
-      <item itemvalue="JUnit.CheckingAccountTest" />
454
-      <item itemvalue="JUnit.com.zipcodewilmington.bankaccountlab in bankaccountlab" />
455
-      <item itemvalue="JUnit.ATMTest" />
456
-      <item itemvalue="JUnit.BusinessAccountTest.checkBalance" />
457 263
       <item itemvalue="Application.MainApplication" />
264
+      <item itemvalue="JUnit.All in bankaccountlab" />
458 265
     </list>
459 266
     <recent_temporary>
460 267
       <list>
461
-        <item itemvalue="JUnit.com.zipcodewilmington.bankaccountlab in bankaccountlab" />
268
+        <item itemvalue="JUnit.All in bankaccountlab" />
462 269
         <item itemvalue="Application.MainApplication" />
463
-        <item itemvalue="JUnit.ATMTest" />
464
-        <item itemvalue="JUnit.BusinessAccountTest.checkBalance" />
465
-        <item itemvalue="JUnit.CheckingAccountTest" />
466 270
       </list>
467 271
     </recent_temporary>
468 272
   </component>
@@ -471,39 +275,42 @@
471 275
   </component>
472 276
   <component name="TaskManager">
473 277
     <task active="true" id="Default" summary="Default task">
474
-      <changelist id="6200422f-5b3e-443d-b0e2-52ca10c875b0" name="Default" comment="" />
475
-      <created>1530124594083</created>
278
+      <changelist id="c069a53c-b7b9-417d-bb75-b6db20b2670d" name="Default" comment="" />
279
+      <created>1530145460303</created>
476 280
       <option name="number" value="Default" />
477 281
       <option name="presentableId" value="Default" />
478
-      <updated>1530124594083</updated>
479
-      <workItem from="1530124595553" duration="6186000" />
480
-      <workItem from="1530131530929" duration="1416000" />
481
-      <workItem from="1530132996559" duration="2818000" />
282
+      <updated>1530145460303</updated>
283
+      <workItem from="1530145461818" duration="5321000" />
482 284
     </task>
483 285
     <servers />
484 286
   </component>
287
+  <component name="TestHistory">
288
+    <history-entry file="All_in_bankaccountlab - 2018.06.27 at 21h 45m 10s.xml">
289
+      <configuration name="All in bankaccountlab" configurationId="JUnit" />
290
+    </history-entry>
291
+  </component>
485 292
   <component name="TimeTrackingManager">
486
-    <option name="totallyTimeSpent" value="10420000" />
293
+    <option name="totallyTimeSpent" value="5321000" />
487 294
   </component>
488 295
   <component name="ToolWindowManager">
489
-    <frame x="451" y="23" width="1035" height="821" extended-state="0" />
296
+    <frame x="0" y="23" width="1440" height="821" extended-state="0" />
490 297
     <editor active="true" />
491 298
     <layout>
492 299
       <window_info anchor="right" id="Palette" order="5" />
493 300
       <window_info anchor="bottom" id="TODO" order="11" />
494
-      <window_info active="true" anchor="bottom" id="Messages" order="4" visible="true" weight="0.3301105" />
301
+      <window_info anchor="bottom" id="Messages" order="4" weight="0.32872927" />
495 302
       <window_info anchor="right" id="Palette&#9;" order="1" />
496 303
       <window_info id="Image Layers" order="4" />
497 304
       <window_info anchor="right" id="Capture Analysis" order="0" />
498 305
       <window_info anchor="bottom" id="Event Log" order="2" side_tool="true" />
499 306
       <window_info anchor="right" id="Maven Projects" order="4" />
500 307
       <window_info anchor="bottom" id="Database Changes" order="0" show_stripe_button="false" />
501
-      <window_info anchor="bottom" id="Run" order="7" />
308
+      <window_info anchor="bottom" id="Run" order="7" weight="0.45303866" />
502 309
       <window_info anchor="bottom" id="Version Control" order="3" />
503 310
       <window_info anchor="bottom" id="Terminal" order="1" />
504 311
       <window_info id="Capture Tool" order="2" />
505 312
       <window_info id="Designer" order="0" />
506
-      <window_info content_ui="combo" id="Project" order="5" visible="true" weight="0.22356495" />
313
+      <window_info content_ui="combo" id="Project" order="5" visible="true" weight="0.24964234" />
507 314
       <window_info anchor="right" id="Database" order="3" />
508 315
       <window_info id="Structure" order="6" side_tool="true" weight="0.25" />
509 316
       <window_info anchor="right" id="Ant Build" order="7" weight="0.25" />
@@ -511,12 +318,12 @@
511 318
       <window_info anchor="right" id="Theme Preview" order="2" />
512 319
       <window_info anchor="bottom" id="Debug" order="8" weight="0.4" />
513 320
       <window_info id="Favorites" order="3" side_tool="true" />
514
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="8" weight="0.25" />
515
-      <window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
321
+      <window_info anchor="bottom" id="Find" order="6" />
516 322
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="6" type="SLIDING" weight="0.4" />
323
+      <window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
324
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="8" weight="0.25" />
517 325
       <window_info anchor="bottom" id="Message" order="5" />
518 326
       <window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
519
-      <window_info anchor="bottom" id="Find" order="6" />
520 327
     </layout>
521 328
   </component>
522 329
   <component name="TypeScriptGeneratedFilesManager">
@@ -526,134 +333,46 @@
526 333
     <option name="myLimit" value="2678400000" />
527 334
   </component>
528 335
   <component name="editorHistoryManager">
529
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
530
-      <provider selected="true" editor-type-id="text-editor">
531
-        <state relative-caret-position="165">
532
-          <caret line="13" column="18" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
533
-          <folding>
534
-            <element signature="e#184#185#0" expanded="true" />
535
-            <element signature="e#222#223#0" expanded="true" />
536
-          </folding>
537
-        </state>
538
-      </provider>
539
-    </entry>
540
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
541
-      <provider selected="true" editor-type-id="text-editor">
542
-        <state relative-caret-position="105">
543
-          <caret line="7" selection-start-line="7" selection-end-line="7" />
544
-          <folding>
545
-            <element signature="e#199#200#0" expanded="true" />
546
-            <element signature="e#238#239#0" expanded="true" />
547
-          </folding>
548
-        </state>
549
-      </provider>
550
-    </entry>
551
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java">
552
-      <provider selected="true" editor-type-id="text-editor">
553
-        <state relative-caret-position="225">
554
-          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
555
-          <folding>
556
-            <element signature="imports" expanded="true" />
557
-          </folding>
558
-        </state>
559
-      </provider>
560
-    </entry>
561
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java">
562
-      <provider selected="true" editor-type-id="text-editor">
563
-        <state relative-caret-position="645">
564
-          <caret line="47" column="5" lean-forward="true" selection-start-line="47" selection-start-column="5" selection-end-line="47" selection-end-column="5" />
565
-          <folding>
566
-            <element signature="imports" expanded="true" />
567
-            <element signature="e#205#214#0" expanded="true" />
568
-            <element signature="e#294#295#0" expanded="true" />
569
-            <element signature="e#331#332#0" expanded="true" />
570
-            <element signature="e#562#563#0" expanded="true" />
571
-            <element signature="e#600#601#0" expanded="true" />
572
-            <element signature="e#663#664#0" expanded="true" />
573
-            <element signature="e#717#718#0" expanded="true" />
574
-          </folding>
575
-        </state>
576
-      </provider>
577
-    </entry>
578
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
336
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
579 337
       <provider selected="true" editor-type-id="text-editor">
580
-        <state relative-caret-position="165">
581
-          <caret line="13" column="18" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
582
-          <folding>
583
-            <element signature="e#184#185#0" expanded="true" />
584
-            <element signature="e#222#223#0" expanded="true" />
585
-          </folding>
338
+        <state relative-caret-position="30">
339
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
586 340
         </state>
587 341
       </provider>
588 342
     </entry>
589 343
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
590 344
       <provider selected="true" editor-type-id="text-editor">
591
-        <state relative-caret-position="225">
592
-          <caret line="15" column="16" selection-start-line="15" selection-start-column="16" selection-end-line="15" selection-end-column="16" />
593
-        </state>
594
-      </provider>
595
-    </entry>
596
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java">
597
-      <provider selected="true" editor-type-id="text-editor">
598
-        <state relative-caret-position="150">
599
-          <caret line="14" column="14" lean-forward="true" selection-start-line="13" selection-start-column="6" selection-end-line="16" selection-end-column="47" />
600
-          <folding>
601
-            <element signature="imports" expanded="true" />
602
-          </folding>
603
-        </state>
604
-      </provider>
605
-    </entry>
606
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java">
607
-      <provider selected="true" editor-type-id="text-editor">
608
-        <state relative-caret-position="255">
609
-          <caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
610
-          <folding>
611
-            <element signature="imports" expanded="true" />
612
-            <element signature="e#205#214#0" expanded="true" />
613
-            <element signature="e#294#295#0" expanded="true" />
614
-            <element signature="e#331#332#0" expanded="true" />
615
-            <element signature="e#562#563#0" expanded="true" />
616
-            <element signature="e#600#601#0" expanded="true" />
617
-            <element signature="e#663#664#0" expanded="true" />
618
-            <element signature="e#717#718#0" expanded="true" />
619
-          </folding>
345
+        <state relative-caret-position="90">
346
+          <caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
620 347
         </state>
621 348
       </provider>
622 349
     </entry>
623
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/Account.java">
350
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
624 351
       <provider selected="true" editor-type-id="text-editor">
625
-        <state relative-caret-position="105">
626
-          <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
352
+        <state relative-caret-position="30">
353
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
627 354
         </state>
628 355
       </provider>
629 356
     </entry>
630 357
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
631 358
       <provider selected="true" editor-type-id="text-editor">
632
-        <state relative-caret-position="105">
633
-          <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
634
-          <folding>
635
-            <element signature="e#137#138#0" expanded="true" />
636
-            <element signature="e#169#170#0" expanded="true" />
637
-          </folding>
359
+        <state relative-caret-position="30">
360
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
638 361
         </state>
639 362
       </provider>
640 363
     </entry>
641
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
364
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
642 365
       <provider selected="true" editor-type-id="text-editor">
643
-        <state relative-caret-position="30">
644
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
366
+        <state relative-caret-position="75">
367
+          <caret line="5" column="22" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
645 368
         </state>
646 369
       </provider>
647 370
     </entry>
648 371
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java">
649 372
       <provider selected="true" editor-type-id="text-editor">
650
-        <state relative-caret-position="390">
651
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
373
+        <state relative-caret-position="175">
374
+          <caret line="30" column="5" lean-forward="true" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
652 375
           <folding>
653
-            <element signature="imports" expanded="true" />
654
-            <element signature="e#205#214#0" expanded="true" />
655
-            <element signature="e#294#295#0" expanded="true" />
656
-            <element signature="e#331#332#0" expanded="true" />
657 376
             <element signature="e#562#563#0" expanded="true" />
658 377
             <element signature="e#600#601#0" expanded="true" />
659 378
             <element signature="e#663#664#0" expanded="true" />
@@ -662,83 +381,6 @@
662 381
         </state>
663 382
       </provider>
664 383
     </entry>
665
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
666
-      <provider selected="true" editor-type-id="text-editor">
667
-        <state relative-caret-position="240">
668
-          <caret line="16" column="42" lean-forward="true" selection-start-line="16" selection-start-column="42" selection-end-line="16" selection-end-column="42" />
669
-          <folding>
670
-            <element signature="e#184#185#0" expanded="true" />
671
-            <element signature="e#222#223#0" expanded="true" />
672
-          </folding>
673
-        </state>
674
-      </provider>
675
-    </entry>
676
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
677
-      <provider selected="true" editor-type-id="text-editor">
678
-        <state relative-caret-position="210">
679
-          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
680
-          <folding>
681
-            <element signature="e#199#200#0" expanded="true" />
682
-            <element signature="e#238#239#0" expanded="true" />
683
-          </folding>
684
-        </state>
685
-      </provider>
686
-    </entry>
687
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/ATMTest.java">
688
-      <provider selected="true" editor-type-id="text-editor">
689
-        <state relative-caret-position="180">
690
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
691
-          <folding>
692
-            <element signature="imports" expanded="true" />
693
-          </folding>
694
-        </state>
695
-      </provider>
696
-    </entry>
697
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BusinessAccountTest.java">
698
-      <provider selected="true" editor-type-id="text-editor">
699
-        <state relative-caret-position="270">
700
-          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
701
-          <folding>
702
-            <element signature="imports" expanded="true" />
703
-          </folding>
704
-        </state>
705
-      </provider>
706
-    </entry>
707
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
708
-      <provider selected="true" editor-type-id="text-editor">
709
-        <state relative-caret-position="105">
710
-          <caret line="7" lean-forward="true" selection-start-line="1" selection-end-line="7" />
711
-          <folding>
712
-            <element signature="e#135#136#0" expanded="true" />
713
-            <element signature="e#167#168#0" expanded="true" />
714
-          </folding>
715
-        </state>
716
-      </provider>
717
-    </entry>
718
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/SavingsAccountTest.java">
719
-      <provider selected="true" editor-type-id="text-editor">
720
-        <state relative-caret-position="329">
721
-          <caret line="43" column="47" lean-forward="true" selection-start-line="43" selection-start-column="47" selection-end-line="43" selection-end-column="47" />
722
-          <folding>
723
-            <element signature="imports" expanded="true" />
724
-            <element signature="e#215#216#0" expanded="true" />
725
-            <element signature="e#260#261#0" expanded="true" />
726
-          </folding>
727
-        </state>
728
-      </provider>
729
-    </entry>
730
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java">
731
-      <provider selected="true" editor-type-id="text-editor">
732
-        <state relative-caret-position="300">
733
-          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
734
-          <folding>
735
-            <element signature="imports" expanded="true" />
736
-            <element signature="e#273#274#0" expanded="true" />
737
-            <element signature="e#319#320#0" expanded="true" />
738
-          </folding>
739
-        </state>
740
-      </provider>
741
-    </entry>
742 384
   </component>
743 385
   <component name="masterDetails">
744 386
     <states>

+ 16
- 14
src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java 查看文件

@@ -35,7 +35,7 @@ public class ATM {
35 35
 
36 36
         int counter = 1;
37 37
         for (Account account:this.accounts) {
38
-            sb.append(String.format("%5d. %15s %.2f \n", counter, account.getClass().getSimpleName(), account.getBalance()));
38
+            sb.append(String.format("\n" + "Tennessee's ATM your balance is: " + "\n" + "%5d. %15s %.2f \n" , counter, account.getClass().getSimpleName(), account.getBalance()));
39 39
             counter++;
40 40
         }
41 41
         System.out.println(sb.toString());
@@ -51,40 +51,42 @@ public class ATM {
51 51
         while(true){
52 52
             if(this.selectedAccount == null){
53 53
                 this.display();
54
-                input = getInput("Please Select a Account: ");
54
+                input = getInput("\n" + "Please Select an Account:  Checking, Savings, Business or Exit? ");
55 55
 
56
-                if(input.equalsIgnoreCase("Checkings")){
56
+                if(input.equalsIgnoreCase("Checking")){
57 57
                     this.selectedAccount = this.accounts.get(0);
58 58
                 } else if(input.equalsIgnoreCase("Savings")){
59 59
                     this.selectedAccount = this.accounts.get(1);
60 60
                 } else if(input.equalsIgnoreCase("Business")){
61 61
                     this.selectedAccount = this.accounts.get(2);
62
-                } if(input.equalsIgnoreCase("Exit")){
63
-                    System.out.println("Thank you for using my ATM");
62
+                } else if(input.equalsIgnoreCase("Exit")){
63
+                    System.out.println("Thank you for using Tennessee's ATM");
64 64
                     break;
65 65
                 }
66 66
             } else {
67
-                System.out.println("You are selected into your " + this.selectedAccount.getClass().getSimpleName() + "\n");
68
-                System.out.println(this.selectedAccount.getBalance());
69
-                input = getInput("Please Enter Withdraw, Deposit or Check Balance");
67
+                System.out.println("Ok, what else would you like to do in your " + this.selectedAccount.getClass().getSimpleName() + "?" + "\n");
68
+                System.out.println("Your balance is -> $" + this.selectedAccount.getBalance());
69
+                input = getInput("Would you like to Withdraw, Deposit, Check Balance or Exit?");
70 70
 
71 71
                 if(input.equalsIgnoreCase("Withdraw")){
72 72
 
73
-                    input = getInput("Enter a amount to Withdraw");
73
+                    input = getInput("Please enter an amount to Withdraw");
74 74
                     this.selectedAccount.withdraw(Double.parseDouble(input));
75 75
 
76 76
                 } else if(input.equalsIgnoreCase("Deposit")){
77 77
 
78
-                    input = getInput("Enter a amount to Deposit");
78
+                    input = getInput("Please enter an amount to Deposit");
79 79
                     this.selectedAccount.deposit(Double.parseDouble(input));
80 80
 
81
-                } else if(input.equalsIgnoreCase("Check Balance")){
81
+                } else if(input.equalsIgnoreCase("Check Balance")) {
82 82
 
83
-                    System.out.println(this.selectedAccount.getBalance());
84
-
85
-                } else if(input.equalsIgnoreCase("exit")){
83
+                    System.out.println( this.selectedAccount.getBalance() );
84
+                } if(input.equalsIgnoreCase("exit")){
85
+                    System.out.println("Thank you for using Tennessee's ATM");
86 86
 
87 87
                     this.selectedAccount = null;
88
+                    break;
89
+
88 90
                 }
89 91
             }
90 92