Khalil Malik Saboor 8 gadus atpakaļ
vecāks
revīzija
7a6e332be0

+ 1
- 1
.idea/compiler.xml Parādīt failu

@@ -10,7 +10,7 @@
10 10
       </profile>
11 11
     </annotationProcessing>
12 12
     <bytecodeTargetLevel target="1.8">
13
-      <module name="bankaccountlab" target="1.5" />
13
+      <module name="bankaccountlab" target="1.8" />
14 14
     </bytecodeTargetLevel>
15 15
   </component>
16 16
 </project>

+ 0
- 61
.idea/misc.xml Parādīt failu

@@ -64,65 +64,4 @@
64 64
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
65 65
     <output url="file://$PROJECT_DIR$/out" />
66 66
   </component>
67
-  <component name="masterDetails">
68
-    <states>
69
-      <state key="GlobalLibrariesConfigurable.UI">
70
-        <settings>
71
-          <splitter-proportions>
72
-            <option name="proportions">
73
-              <list>
74
-                <option value="0.2" />
75
-              </list>
76
-            </option>
77
-          </splitter-proportions>
78
-        </settings>
79
-      </state>
80
-      <state key="JdkListConfigurable.UI">
81
-        <settings>
82
-          <last-edited>1.8</last-edited>
83
-          <splitter-proportions>
84
-            <option name="proportions">
85
-              <list>
86
-                <option value="0.2" />
87
-              </list>
88
-            </option>
89
-          </splitter-proportions>
90
-        </settings>
91
-      </state>
92
-      <state key="ProjectJDKs.UI">
93
-        <settings>
94
-          <last-edited>1.8</last-edited>
95
-          <splitter-proportions>
96
-            <option name="proportions">
97
-              <list>
98
-                <option value="0.2" />
99
-              </list>
100
-            </option>
101
-          </splitter-proportions>
102
-        </settings>
103
-      </state>
104
-      <state key="ProjectLibrariesConfigurable.UI">
105
-        <settings>
106
-          <splitter-proportions>
107
-            <option name="proportions">
108
-              <list>
109
-                <option value="0.2" />
110
-              </list>
111
-            </option>
112
-          </splitter-proportions>
113
-        </settings>
114
-      </state>
115
-      <state key="ScopeChooserConfigurable.UI">
116
-        <settings>
117
-          <splitter-proportions>
118
-            <option name="proportions">
119
-              <list>
120
-                <option value="0.2" />
121
-              </list>
122
-            </option>
123
-          </splitter-proportions>
124
-        </settings>
125
-      </state>
126
-    </states>
127
-  </component>
128 67
 </project>

+ 367
- 49
.idea/workspace.xml Parādīt failu

@@ -2,14 +2,20 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="268ab437-e0d5-4447-8401-9f321aad6d50" name="Default" comment="">
5
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
6
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" />
7
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java" afterDir="false" />
8
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" afterDir="false" />
9
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" afterDir="false" />
5
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java" afterDir="false" />
6
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" afterDir="false" />
7
+      <change afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/AccountTest.java" afterDir="false" />
8
+      <change afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" afterDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
10
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
10 11
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
11 12
       <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
13
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java" afterDir="false" />
14
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" afterDir="false" />
15
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" beforeDir="false" />
16
+      <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 17
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" afterDir="false" />
18
+      <change beforePath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java" beforeDir="false" />
13 19
     </list>
14 20
     <ignored path="$PROJECT_DIR$/out/" />
15 21
     <ignored path="$PROJECT_DIR$/target/" />
@@ -37,17 +43,20 @@
37 43
       <file leaf-file-name="MainApplication.java" pinned="false" current-in-tab="false">
38 44
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
39 45
           <provider selected="true" editor-type-id="text-editor">
40
-            <state relative-caret-position="161">
41
-              <caret line="7" selection-start-line="7" selection-end-line="7" />
46
+            <state relative-caret-position="494">
47
+              <caret line="30" selection-start-line="30" selection-end-line="30" />
42 48
             </state>
43 49
           </provider>
44 50
         </entry>
45 51
       </file>
46
-      <file leaf-file-name="ATM.java" pinned="false" current-in-tab="false">
52
+      <file leaf-file-name="ATM.java" pinned="false" current-in-tab="true">
47 53
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java">
48 54
           <provider selected="true" editor-type-id="text-editor">
49
-            <state relative-caret-position="115">
50
-              <caret line="5" selection-start-line="5" selection-end-line="5" />
55
+            <state relative-caret-position="230">
56
+              <caret line="10" column="44" lean-forward="true" selection-start-line="10" selection-start-column="44" selection-end-line="10" selection-end-column="44" />
57
+              <folding>
58
+                <element signature="imports" expanded="true" />
59
+              </folding>
51 60
             </state>
52 61
           </provider>
53 62
         </entry>
@@ -55,17 +64,52 @@
55 64
       <file leaf-file-name="Account.java" pinned="false" current-in-tab="false">
56 65
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
57 66
           <provider selected="true" editor-type-id="text-editor">
58
-            <state relative-caret-position="299">
59
-              <caret line="13" column="5" lean-forward="true" selection-start-line="13" selection-start-column="5" selection-end-line="13" selection-end-column="5" />
67
+            <state relative-caret-position="483">
68
+              <caret line="25" column="4" selection-start-line="25" selection-start-column="4" selection-end-line="27" selection-end-column="67" />
69
+              <folding>
70
+                <element signature="e#248#249#0" expanded="true" />
71
+                <element signature="e#270#271#0" expanded="true" />
72
+              </folding>
60 73
             </state>
61 74
           </provider>
62 75
         </entry>
63 76
       </file>
64
-      <file leaf-file-name="CheckingAccount.java" pinned="false" current-in-tab="true">
77
+      <file leaf-file-name="CheckingAccount.java" pinned="false" current-in-tab="false">
65 78
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
66 79
           <provider selected="true" editor-type-id="text-editor">
80
+            <state relative-caret-position="345">
81
+              <caret line="19" column="4" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="4" />
82
+              <folding>
83
+                <element signature="e#166#167#0" expanded="true" />
84
+                <element signature="e#195#196#0" expanded="true" />
85
+              </folding>
86
+            </state>
87
+          </provider>
88
+        </entry>
89
+      </file>
90
+      <file leaf-file-name="CheckingAccountTest.java" pinned="false" current-in-tab="false">
91
+        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java">
92
+          <provider selected="true" editor-type-id="text-editor">
93
+            <state relative-caret-position="230">
94
+              <caret line="13" selection-start-line="13" selection-end-line="13" />
95
+            </state>
96
+          </provider>
97
+        </entry>
98
+      </file>
99
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
100
+        <entry file="file://$PROJECT_DIR$/pom.xml">
101
+          <provider selected="true" editor-type-id="text-editor">
102
+            <state relative-caret-position="368">
103
+              <caret line="16" column="12" selection-start-line="16" selection-start-column="12" selection-end-line="16" selection-end-column="12" />
104
+            </state>
105
+          </provider>
106
+        </entry>
107
+      </file>
108
+      <file leaf-file-name="SavingsAccount.java" pinned="false" current-in-tab="false">
109
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
110
+          <provider selected="true" editor-type-id="text-editor">
67 111
             <state relative-caret-position="46">
68
-              <caret line="2" column="37" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" />
112
+              <caret line="2" column="43" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
69 113
             </state>
70 114
           </provider>
71 115
         </entry>
@@ -75,8 +119,8 @@
75 119
   <component name="FileTemplateManagerImpl">
76 120
     <option name="RECENT_TEMPLATES">
77 121
       <list>
78
-        <option value="JUnit4 Test Class" />
79 122
         <option value="Class" />
123
+        <option value="JUnit4 Test Class" />
80 124
       </list>
81 125
     </option>
82 126
   </component>
@@ -88,11 +132,15 @@
88 132
       <list>
89 133
         <option value="$PROJECT_DIR$/.gitignore" />
90 134
         <option value="$PROJECT_DIR$/README.md" />
91
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java" />
92
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" />
135
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Savings.java" />
93 136
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/AccountTest.java" />
137
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" />
94 138
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" />
139
+        <option value="$PROJECT_DIR$/pom.xml" />
140
+        <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" />
95 141
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" />
142
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java" />
143
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" />
96 144
       </list>
97 145
     </option>
98 146
   </component>
@@ -180,10 +228,10 @@
180 228
           <select />
181 229
         </subPane>
182 230
       </pane>
231
+      <pane id="Course" />
232
+      <pane id="Scope" />
183 233
       <pane id="PackagesPane" />
184 234
       <pane id="AndroidView" />
185
-      <pane id="Scope" />
186
-      <pane id="Course" />
187 235
     </panes>
188 236
   </component>
189 237
   <component name="PropertiesComponent">
@@ -191,8 +239,9 @@
191 239
     <property name="aspect.path.notification.shown" value="true" />
192 240
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit4" />
193 241
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit4" value="" />
242
+    <property name="com.intellij.testIntegration.createTest.CreateTestDialog.includeInheritedMembers" value="true" />
194 243
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
195
-    <property name="project.structure.last.edited" value="Project" />
244
+    <property name="project.structure.last.edited" value="Modules" />
196 245
     <property name="project.structure.proportion" value="0.0" />
197 246
     <property name="project.structure.side.proportion" value="0.2" />
198 247
     <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" />
@@ -217,13 +266,47 @@
217 266
       </list>
218 267
     </option>
219 268
   </component>
220
-  <component name="RunManager">
269
+  <component name="RunManager" selected="JUnit.CheckingAccountTest.getBalance">
221 270
     <configuration default="true" type="Applet" factoryName="Applet">
222 271
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
223 272
     </configuration>
273
+    <configuration name="MainApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
274
+      <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.MainApplication" />
275
+      <module name="bankaccountlab" />
276
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
277
+      <extension name="coverage">
278
+        <pattern>
279
+          <option name="PATTERN" value="com.zipcodewilmington.bankaccountlab.*" />
280
+          <option name="ENABLED" value="true" />
281
+        </pattern>
282
+      </extension>
283
+    </configuration>
224 284
     <configuration default="true" type="Application" factoryName="Application">
225 285
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
226 286
     </configuration>
287
+    <configuration name="CheckingAccountTest.getBalance" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
288
+      <module name="bankaccountlab" />
289
+      <extension name="coverage">
290
+        <pattern>
291
+          <option name="PATTERN" value="com.zipcodewilmington.bankaccountlab.*" />
292
+          <option name="ENABLED" value="true" />
293
+        </pattern>
294
+      </extension>
295
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
296
+      <option name="ALTERNATIVE_JRE_PATH" />
297
+      <option name="PACKAGE_NAME" value="com.zipcodewilmington.bankaccountlab" />
298
+      <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.CheckingAccountTest" />
299
+      <option name="METHOD_NAME" value="getBalance" />
300
+      <option name="TEST_OBJECT" value="method" />
301
+      <option name="VM_PARAMETERS" value="-ea" />
302
+      <option name="PARAMETERS" />
303
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
304
+      <option name="PASS_PARENT_ENVS" value="true" />
305
+      <option name="TEST_SEARCH_SCOPE">
306
+        <value defaultName="singleModule" />
307
+      </option>
308
+      <patterns />
309
+    </configuration>
227 310
     <configuration default="true" type="JUnit" factoryName="JUnit">
228 311
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
229 312
       <option name="ALTERNATIVE_JRE_PATH" />
@@ -333,6 +416,16 @@
333 416
       <setting name="rowsRange" value="" />
334 417
       <method />
335 418
     </configuration>
419
+    <list>
420
+      <item itemvalue="Application.MainApplication" />
421
+      <item itemvalue="JUnit.CheckingAccountTest.getBalance" />
422
+    </list>
423
+    <recent_temporary>
424
+      <list>
425
+        <item itemvalue="JUnit.CheckingAccountTest.getBalance" />
426
+        <item itemvalue="Application.MainApplication" />
427
+      </list>
428
+    </recent_temporary>
336 429
   </component>
337 430
   <component name="SvnConfiguration">
338 431
     <configuration />
@@ -349,39 +442,45 @@
349 442
       <workItem from="1529356700858" duration="599000" />
350 443
       <workItem from="1529425068221" duration="329000" />
351 444
       <workItem from="1529542283850" duration="591000" />
352
-      <workItem from="1529576787325" duration="4389000" />
445
+      <workItem from="1529576787325" duration="7212000" />
446
+      <workItem from="1529772073836" duration="9254000" />
353 447
     </task>
354 448
     <servers />
355 449
   </component>
450
+  <component name="TestHistory">
451
+    <history-entry file="CheckingAccountTest_getBalance - 2018.06.23 at 16h 03m 28s.xml">
452
+      <configuration name="CheckingAccountTest.getBalance" configurationId="JUnit" />
453
+    </history-entry>
454
+  </component>
356 455
   <component name="TimeTrackingManager">
357
-    <option name="totallyTimeSpent" value="6762000" />
456
+    <option name="totallyTimeSpent" value="18839000" />
358 457
   </component>
359 458
   <component name="ToolWindowManager">
360 459
     <frame x="0" y="0" width="1280" height="800" extended-state="0" />
361
-    <editor active="true" />
362 460
     <layout>
363 461
       <window_info anchor="right" id="Palette" order="3" />
364 462
       <window_info anchor="bottom" id="TODO" order="6" />
463
+      <window_info anchor="bottom" id="Messages" weight="0.32965517" />
365 464
       <window_info anchor="right" id="Palette&#9;" order="3" />
366 465
       <window_info id="Image Layers" order="2" />
367 466
       <window_info anchor="right" id="Capture Analysis" order="3" />
368 467
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
369 468
       <window_info anchor="right" id="Maven Projects" order="3" />
370 469
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
470
+      <window_info anchor="bottom" id="Run" order="2" weight="0.32965517" />
371 471
       <window_info anchor="bottom" id="Version Control" order="7" />
372
-      <window_info anchor="bottom" id="Run" order="2" />
373 472
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.34068966" />
374 473
       <window_info id="Capture Tool" order="2" />
375 474
       <window_info id="Designer" order="2" />
376
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26979" />
475
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27382874" />
377 476
       <window_info anchor="right" id="Database" order="4" />
378 477
       <window_info id="Learn" order="3" />
379 478
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
380 479
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
381 480
       <window_info id="UI Designer" order="2" />
382 481
       <window_info anchor="right" id="Theme Preview" order="3" />
383
-      <window_info id="Favorites" order="2" side_tool="true" />
384 482
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
483
+      <window_info id="Favorites" order="2" side_tool="true" />
385 484
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
386 485
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
387 486
       <window_info id="Nl-Palette" order="2" />
@@ -391,6 +490,39 @@
391 490
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
392 491
       <window_info anchor="bottom" id="Find" order="1" />
393 492
     </layout>
493
+    <layout-to-restore>
494
+      <window_info id="Designer" order="2" />
495
+      <window_info anchor="right" id="Palette" order="3" />
496
+      <window_info id="Image Layers" order="3" />
497
+      <window_info anchor="bottom" id="Run" order="3" visible="true" weight="0.32965517" />
498
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
499
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
500
+      <window_info id="UI Designer" order="4" />
501
+      <window_info anchor="right" id="Properties" order="4" />
502
+      <window_info anchor="bottom" id="Terminal" order="8" weight="0.34068966" />
503
+      <window_info id="Capture Tool" order="5" />
504
+      <window_info anchor="right" id="Capture Analysis" order="5" />
505
+      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
506
+      <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
507
+      <window_info anchor="bottom" id="Messages" order="0" weight="0.32965517" />
508
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
509
+      <window_info id="Favorites" order="6" side_tool="true" />
510
+      <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
511
+      <window_info anchor="bottom" id="Version Control" order="10" />
512
+      <window_info id="Nl-Palette" order="7" />
513
+      <window_info anchor="right" id="Maven Projects" order="6" />
514
+      <window_info anchor="bottom" id="Find" order="2" />
515
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27382874" />
516
+      <window_info id="Learn" order="8" />
517
+      <window_info anchor="right" id="Database" order="9" />
518
+      <window_info anchor="bottom" id="Message" order="1" />
519
+      <window_info anchor="bottom" id="TODO" order="7" />
520
+      <window_info anchor="right" id="Palette&#9;" order="7" />
521
+      <window_info anchor="right" id="Theme Preview" order="8" />
522
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
523
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
524
+      <window_info anchor="bottom" id="Debug" order="4" weight="0.4" />
525
+    </layout-to-restore>
394 526
   </component>
395 527
   <component name="TypeScriptGeneratedFilesManager">
396 528
     <option name="version" value="1" />
@@ -398,6 +530,11 @@
398 530
   <component name="VcsContentAnnotationSettings">
399 531
     <option name="myLimit" value="2678400000" />
400 532
   </component>
533
+  <component name="XDebuggerManager">
534
+    <breakpoint-manager>
535
+      <option name="time" value="1" />
536
+    </breakpoint-manager>
537
+  </component>
401 538
   <component name="editorHistoryManager">
402 539
     <entry file="file://$PROJECT_DIR$/README.md">
403 540
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
@@ -411,6 +548,55 @@
411 548
     </entry>
412 549
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
413 550
       <provider selected="true" editor-type-id="text-editor">
551
+        <state relative-caret-position="161">
552
+          <caret line="7" selection-start-line="7" selection-end-line="7" />
553
+        </state>
554
+      </provider>
555
+    </entry>
556
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java">
557
+      <provider selected="true" editor-type-id="text-editor">
558
+        <state relative-caret-position="115">
559
+          <caret line="5" selection-start-line="5" selection-end-line="5" />
560
+          <folding>
561
+            <element signature="imports" expanded="true" />
562
+          </folding>
563
+        </state>
564
+      </provider>
565
+    </entry>
566
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
567
+      <provider selected="true" editor-type-id="text-editor">
568
+        <state relative-caret-position="115">
569
+          <caret line="5" column="26" lean-forward="true" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" />
570
+          <folding>
571
+            <element signature="e#248#249#0" expanded="true" />
572
+            <element signature="e#270#271#0" expanded="true" />
573
+          </folding>
574
+        </state>
575
+      </provider>
576
+    </entry>
577
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
578
+      <provider selected="true" editor-type-id="text-editor">
579
+        <state relative-caret-position="69">
580
+          <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
581
+          <folding>
582
+            <element signature="e#166#167#0" expanded="true" />
583
+            <element signature="e#195#196#0" expanded="true" />
584
+          </folding>
585
+        </state>
586
+      </provider>
587
+    </entry>
588
+    <entry file="file://$PROJECT_DIR$/README.md">
589
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
590
+        <state split_layout="SECOND">
591
+          <first_editor relative-caret-position="46">
592
+            <caret line="2" selection-start-line="2" selection-end-line="2" />
593
+          </first_editor>
594
+          <second_editor />
595
+        </state>
596
+      </provider>
597
+    </entry>
598
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
599
+      <provider selected="true" editor-type-id="text-editor">
414 600
         <state relative-caret-position="115">
415 601
           <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
416 602
         </state>
@@ -574,9 +760,6 @@
574 760
         </state>
575 761
       </provider>
576 762
     </entry>
577
-    <entry file="file://$PROJECT_DIR$/pom.xml">
578
-      <provider selected="true" editor-type-id="text-editor" />
579
-    </entry>
580 763
     <entry file="file://$PROJECT_DIR$/.gitignore">
581 764
       <provider selected="true" editor-type-id="text-editor">
582 765
         <state relative-caret-position="138">
@@ -593,8 +776,22 @@
593 776
     </entry>
594 777
     <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java">
595 778
       <provider selected="true" editor-type-id="text-editor">
596
-        <state relative-caret-position="161">
597
-          <caret line="7" selection-start-line="7" selection-end-line="7" />
779
+        <state relative-caret-position="115">
780
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
781
+        </state>
782
+      </provider>
783
+    </entry>
784
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
785
+      <provider selected="true" editor-type-id="text-editor">
786
+        <state relative-caret-position="46">
787
+          <caret line="2" column="28" selection-start-line="2" selection-start-column="28" selection-end-line="2" selection-end-column="28" />
788
+        </state>
789
+      </provider>
790
+    </entry>
791
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/AccountTest.java">
792
+      <provider selected="true" editor-type-id="text-editor">
793
+        <state relative-caret-position="207">
794
+          <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
598 795
         </state>
599 796
       </provider>
600 797
     </entry>
@@ -608,43 +805,164 @@
608 805
         </state>
609 806
       </provider>
610 807
     </entry>
611
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/AccountTest.java">
808
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
612 809
       <provider selected="true" editor-type-id="text-editor">
613
-        <state relative-caret-position="207">
614
-          <caret line="9" column="20" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="20" />
615
-          <folding>
616
-            <element signature="imports" expanded="true" />
617
-          </folding>
810
+        <state relative-caret-position="46">
811
+          <caret line="2" column="43" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
618 812
         </state>
619 813
       </provider>
620 814
     </entry>
621
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
815
+    <entry file="file://$PROJECT_DIR$/pom.xml">
622 816
       <provider selected="true" editor-type-id="text-editor">
623
-        <state relative-caret-position="161">
624
-          <caret line="7" selection-start-line="7" selection-end-line="7" />
817
+        <state relative-caret-position="368">
818
+          <caret line="16" column="12" selection-start-line="16" selection-start-column="12" selection-end-line="16" selection-end-column="12" />
625 819
         </state>
626 820
       </provider>
627 821
     </entry>
628
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java">
822
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java">
629 823
       <provider selected="true" editor-type-id="text-editor">
630
-        <state relative-caret-position="115">
631
-          <caret line="5" selection-start-line="5" selection-end-line="5" />
824
+        <state relative-caret-position="230">
825
+          <caret line="13" selection-start-line="13" selection-end-line="13" />
826
+        </state>
827
+      </provider>
828
+    </entry>
829
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
830
+      <provider selected="true" editor-type-id="text-editor">
831
+        <state relative-caret-position="345">
832
+          <caret line="19" column="4" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="4" />
833
+          <folding>
834
+            <element signature="e#166#167#0" expanded="true" />
835
+            <element signature="e#195#196#0" expanded="true" />
836
+          </folding>
632 837
         </state>
633 838
       </provider>
634 839
     </entry>
635 840
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
636 841
       <provider selected="true" editor-type-id="text-editor">
637
-        <state relative-caret-position="299">
638
-          <caret line="13" column="5" lean-forward="true" selection-start-line="13" selection-start-column="5" selection-end-line="13" selection-end-column="5" />
842
+        <state relative-caret-position="483">
843
+          <caret line="25" column="4" selection-start-line="25" selection-start-column="4" selection-end-line="27" selection-end-column="67" />
844
+          <folding>
845
+            <element signature="e#248#249#0" expanded="true" />
846
+            <element signature="e#270#271#0" expanded="true" />
847
+          </folding>
639 848
         </state>
640 849
       </provider>
641 850
     </entry>
642
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java">
851
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
643 852
       <provider selected="true" editor-type-id="text-editor">
644
-        <state relative-caret-position="46">
645
-          <caret line="2" column="37" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" />
853
+        <state relative-caret-position="494">
854
+          <caret line="30" selection-start-line="30" selection-end-line="30" />
646 855
         </state>
647 856
       </provider>
648 857
     </entry>
858
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java">
859
+      <provider selected="true" editor-type-id="text-editor">
860
+        <state relative-caret-position="230">
861
+          <caret line="10" column="44" lean-forward="true" selection-start-line="10" selection-start-column="44" selection-end-line="10" selection-end-column="44" />
862
+          <folding>
863
+            <element signature="imports" expanded="true" />
864
+          </folding>
865
+        </state>
866
+      </provider>
867
+    </entry>
868
+  </component>
869
+  <component name="masterDetails">
870
+    <states>
871
+      <state key="ArtifactsStructureConfigurable.UI">
872
+        <settings>
873
+          <artifact-editor />
874
+          <splitter-proportions>
875
+            <option name="proportions">
876
+              <list>
877
+                <option value="0.2" />
878
+              </list>
879
+            </option>
880
+          </splitter-proportions>
881
+        </settings>
882
+      </state>
883
+      <state key="FacetStructureConfigurable.UI">
884
+        <settings>
885
+          <last-edited>No facets are configured</last-edited>
886
+          <splitter-proportions>
887
+            <option name="proportions">
888
+              <list>
889
+                <option value="0.2" />
890
+              </list>
891
+            </option>
892
+          </splitter-proportions>
893
+        </settings>
894
+      </state>
895
+      <state key="GlobalLibrariesConfigurable.UI">
896
+        <settings>
897
+          <splitter-proportions>
898
+            <option name="proportions">
899
+              <list>
900
+                <option value="0.2" />
901
+              </list>
902
+            </option>
903
+          </splitter-proportions>
904
+        </settings>
905
+      </state>
906
+      <state key="JdkListConfigurable.UI">
907
+        <settings>
908
+          <last-edited>1.8</last-edited>
909
+          <splitter-proportions>
910
+            <option name="proportions">
911
+              <list>
912
+                <option value="0.2" />
913
+              </list>
914
+            </option>
915
+          </splitter-proportions>
916
+        </settings>
917
+      </state>
918
+      <state key="ModuleStructureConfigurable.UI">
919
+        <settings>
920
+          <last-edited>bankaccountlab</last-edited>
921
+          <splitter-proportions>
922
+            <option name="proportions">
923
+              <list>
924
+                <option value="0.2" />
925
+                <option value="0.6" />
926
+              </list>
927
+            </option>
928
+          </splitter-proportions>
929
+        </settings>
930
+      </state>
931
+      <state key="ProjectJDKs.UI">
932
+        <settings>
933
+          <last-edited>1.8</last-edited>
934
+          <splitter-proportions>
935
+            <option name="proportions">
936
+              <list>
937
+                <option value="0.2" />
938
+              </list>
939
+            </option>
940
+          </splitter-proportions>
941
+        </settings>
942
+      </state>
943
+      <state key="ProjectLibrariesConfigurable.UI">
944
+        <settings>
945
+          <last-edited>Maven: junit:junit:4.12</last-edited>
946
+          <splitter-proportions>
947
+            <option name="proportions">
948
+              <list>
949
+                <option value="0.2" />
950
+              </list>
951
+            </option>
952
+          </splitter-proportions>
953
+        </settings>
954
+      </state>
955
+      <state key="ScopeChooserConfigurable.UI">
956
+        <settings>
957
+          <splitter-proportions>
958
+            <option name="proportions">
959
+              <list>
960
+                <option value="0.2" />
961
+              </list>
962
+            </option>
963
+          </splitter-proportions>
964
+        </settings>
965
+      </state>
966
+    </states>
649 967
   </component>
650 968
 </project>

+ 12
- 1
pom.xml Parādīt failu

@@ -3,7 +3,18 @@
3 3
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5 5
     <modelVersion>4.0.0</modelVersion>
6
-
6
+    <build>
7
+        <plugins>
8
+            <plugin>
9
+                <groupId>org.apache.maven.plugins</groupId>
10
+                <artifactId>maven-compiler-plugin</artifactId>
11
+                <configuration>
12
+                    <source>1.8</source>
13
+                    <target>1.8</target>
14
+                </configuration>
15
+            </plugin>
16
+        </plugins>
17
+    </build>
7 18
     <groupId>com.zipcodewilmington</groupId>
8 19
     <artifactId>bankaccountlab</artifactId>
9 20
     <version>1.0-SNAPSHOT</version>

+ 10
- 1
src/main/java/com/zipcodewilmington/bankaccountlab/ATM.java Parādīt failu

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

+ 8
- 10
src/main/java/com/zipcodewilmington/bankaccountlab/Account.java Parādīt failu

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

+ 0
- 7
src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java Parādīt failu

@@ -1,7 +0,0 @@
1
-package com.zipcodewilmington.bankaccountlab;
2
-
3
-/**
4
- * Created by leon on 1/10/18.
5
- */
6
-public class BankAccount {
7
-}

+ 4
- 0
src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java Parādīt failu

@@ -0,0 +1,4 @@
1
+package com.zipcodewilmington.bankaccountlab;
2
+
3
+public class BusinessAccount {
4
+}

+ 18
- 3
src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java Parādīt failu

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

+ 28
- 2
src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java Parādīt failu

@@ -1,10 +1,36 @@
1 1
 package com.zipcodewilmington.bankaccountlab;
2
-
2
+import java.util.Scanner;
3 3
 /**
4 4
  * Created by leon on 1/10/18.
5 5
  */
6 6
 public class MainApplication {
7
-    static void main(String [] arg){
8 7
 
8
+    public static void main(String []args){
9
+
10
+        boolean loop = false;
11
+
12
+
13
+        System.out.println("What type of account do you want to access?");
14
+        System.out.println("Type 1 for Checking Account");
15
+        System.out.println(" 2 for Savings");
16
+        System.out.println(" 3 for Business");
17
+        Scanner sc = new Scanner(System.in);
18
+            int options = sc.nextInt();
19
+        while (!loop){
20
+         switch (options){
21
+             case 1:
22
+                 ATM.run();
23
+                 break;
24
+             case 2:
25
+                 ATM.run();
26
+                 break;
27
+             case 3:
28
+                 ATM.run();
29
+                 break;
30
+             case 4:
31
+
32
+                 break;
33
+          }
34
+        }
9 35
     }
10 36
 }

+ 5
- 0
src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java Parādīt failu

@@ -0,0 +1,5 @@
1
+package com.zipcodewilmington.bankaccountlab;
2
+
3
+public class SavingsAccount extends Account{
4
+
5
+}

+ 13
- 0
src/test/java/com/zipcodewilmington/bankaccountlab/AccountTest.java Parādīt failu

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

+ 0
- 7
src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java Parādīt failu

@@ -1,7 +0,0 @@
1
-package com.zipcodewilmington.bankaccountlab;
2
-
3
-/**
4
- * Created by leon on 1/10/18.
5
- */
6
-public class BankAccountTest {
7
-}

+ 21
- 0
src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java Parādīt failu

@@ -0,0 +1,21 @@
1
+package com.zipcodewilmington.bankaccountlab;
2
+
3
+import org.junit.Assert;
4
+import org.junit.Test;
5
+
6
+import static org.junit.Assert.*;
7
+
8
+public class CheckingAccountTest {
9
+    CheckingAccount ca = new CheckingAccount();
10
+    @Test
11
+    public void getBalance() {
12
+        //given
13
+        int balance = 500;
14
+
15
+        ca.setBalance(balance);
16
+
17
+        int expected = balance;
18
+        int actual = ca.getBalance();
19
+        Assert.assertEquals(expected,actual);
20
+    }
21
+}