Commit

.idea/workspace.xml

@@ -2,20 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="268ab437-e0d5-4447-8401-9f321aad6d50" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Atm.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/TestAtm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" beforeDir="false" />
       <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" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -31,8 +19,8 @@
       <file leaf-file-name="Account.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="270">
-              <caret line="22" column="33" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+            <state relative-caret-position="285">
+              <caret line="32" column="4" selection-start-line="32" selection-start-column="4" selection-end-line="35" selection-end-column="5" />
             </state>
           </provider>
         </entry>
@@ -58,8 +46,8 @@
       <file leaf-file-name="MainApplication.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="209">
-              <caret line="111" column="76" selection-start-line="111" selection-start-column="76" selection-end-line="111" selection-end-column="76" />
+            <state relative-caret-position="334">
+              <caret line="57" column="512" selection-start-line="57" selection-start-column="512" selection-end-line="57" selection-end-column="512" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -142,10 +130,10 @@
   <component name="NodePackageJsonFileManager">
     <packageJsonPaths />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds">
     <option name="y" value="22" />
-    <option name="width" value="882" />
-    <option name="height" value="702" />
+    <option name="width" value="1280" />
+    <option name="height" value="695" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
@@ -187,35 +175,23 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.TestAtm.testGetBalance">
+  <component name="RunManager" selected="Application.MainApplication">
     <configuration default="true" type="Applet" factoryName="Applet">
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
     </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    </configuration>
-    <configuration name="BankAccountTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MainApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.MainApplication" />
       <module name="bankaccountlab" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <extension name="coverage">
         <pattern>
           <option name="PATTERN" value="com.zipcodewilmington.bankaccountlab.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="com.zipcodewilmington.bankaccountlab" />
-      <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.BankAccountTest" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <patterns />
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     </configuration>
     <configuration name="CheckingAccountTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="bankaccountlab" />
@@ -388,19 +364,19 @@
       <method />
     </configuration>
     <list>
-      <item itemvalue="JUnit.BankAccountTest" />
       <item itemvalue="JUnit.CheckingAccountTest" />
       <item itemvalue="JUnit.CheckingAccountTest.test_Get_Balance" />
       <item itemvalue="JUnit.CheckingAccountTest.testPay_WriteCheck" />
       <item itemvalue="JUnit.TestAtm.testGetBalance" />
+      <item itemvalue="Application.MainApplication" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Application.MainApplication" />
         <item itemvalue="JUnit.TestAtm.testGetBalance" />
         <item itemvalue="JUnit.CheckingAccountTest.testPay_WriteCheck" />
         <item itemvalue="JUnit.CheckingAccountTest" />
         <item itemvalue="JUnit.CheckingAccountTest.test_Get_Balance" />
-        <item itemvalue="JUnit.BankAccountTest" />
       </list>
     </recent_temporary>
   </component>
@@ -424,7 +400,8 @@
       <workItem from="1529932838635" duration="1051000" />
       <workItem from="1530052687470" duration="3570000" />
       <workItem from="1530104705459" duration="11034000" />
-      <workItem from="1530147701778" duration="3518000" />
+      <workItem from="1530147701778" duration="3578000" />
+      <workItem from="1530226930930" duration="4552000" />
     </task>
     <servers />
   </component>
@@ -461,14 +438,15 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="39467000" />
+    <option name="totallyTimeSpent" value="44079000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="22" width="1280" height="705" extended-state="6" />
+    <frame x="0" y="22" width="1280" height="695" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.32683486" />
       <window_info anchor="right" id="Palette&#9;" order="9" />
       <window_info id="Image Layers" order="7" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
@@ -476,7 +454,7 @@
       <window_info anchor="right" id="Maven Projects" order="5" />
       <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="9" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.32324842" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.32110092" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.32901135" />
       <window_info id="Capture Tool" order="4" />
       <window_info id="Designer" order="2" />
@@ -488,7 +466,6 @@
       <window_info anchor="right" id="Theme Preview" order="7" />
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Messages" order="11" weight="0.3280255" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
       <window_info id="Nl-Palette" order="6" />
@@ -704,13 +681,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="113" selection-start-line="4" selection-start-column="113" selection-end-line="4" selection-end-column="113" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="60">
@@ -729,24 +699,31 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Atm.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" selection-start-line="3" selection-end-line="3" />
+        <state relative-caret-position="285">
+          <caret line="32" column="4" selection-start-line="32" selection-start-column="4" selection-end-line="35" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="113" selection-start-line="4" selection-start-column="113" selection-end-line="4" selection-end-column="113" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Atm.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="22" column="33" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        <state relative-caret-position="45">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="209">
-          <caret line="111" column="76" selection-start-line="111" selection-start-column="76" selection-end-line="111" selection-end-column="76" />
+        <state relative-caret-position="334">
+          <caret line="57" column="512" selection-start-line="57" selection-start-column="512" selection-end-line="57" selection-end-column="512" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>

src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java

@@ -11,11 +11,11 @@ import java.util.Scanner;
 
 public class MainApplication {
 
-    private String name;
-    private String email;
-    private String address;
-    private int pin;
-    private boolean runCommandCenter;
+    private static String name;
+    private static String email;
+    private static String address;
+    private static int pin;
+    private boolean runCommandCenter = true;
     private CheckingAccount checkingAccount;
     private BusinessAccount businessAccount;
     private SavingsAccount savingsAccount;
@@ -25,36 +25,37 @@ public class MainApplication {
 
     Atm atm = new Atm();
 
-    public void main(String[] vv) {
+    public static void main(String[] vv) {
+        new MainApplication(name, email, address, pin).commandCenter();
 
-        while(runCommandCenter){
-            commandCenter();
-        }
 
         System.out.println("Baller ATM only...");
         MainApplication mainApplication = new MainApplication(name, email, address, pin);
-
     }
 
 
     public MainApplication(String name, String email, String address, int pin) {
 
-        long accountNumber = Math.round(Math.random() * 999999999);
-        double balance = 00000.00;
 
-        createBusinessAccount(name, email, address, pin, accountNumber, balance);
-        createSavingsAccount(name, email, address, pin, accountNumber, balance);
-        createCheckingAccount(name, email, address, pin, accountNumber, balance);
+            long accountNumber = Math.round(Math.random() * 999999999);
+            double balance = 00000.00;
 
+            createBusinessAccount(name, email, address, pin, accountNumber, balance);
+            createSavingsAccount(name, email, address, pin, accountNumber, balance);
+            createCheckingAccount(name, email, address, pin, accountNumber, balance);
 
+        while(runCommandCenter){
+            commandCenter();
+        }
     }
 
     public void commandCenter(){
+        System.out.println("Your Checking Account balance is: " + checkingAccount.getBalance() +"\nYour Savings Account Balance is: " +savingsAccount.getBalance()+"\nYour Business Account balance is: "+businessAccount.getBalance());
 
         Scanner scanner = new Scanner(System.in);
 
         System.out.println("Choose a command");
-        System.out.println("'1' - Get the balance of your Checking Account \n'2' - Get the balance of your Savings Account \n'3' - Get balance of your Business Account\n'4' - Deposit money to your Checking Account\n'5' - Deposit money to your Savings Account\n'6' - Deposit money to your Business Account\n'7' - Withdraw money from your Checking Account\n'8' - Withdraw money from your Savings Account\n'9' - Withdraw money from your Business Account\n'10' - Change the pin of your accounts\n'11' - Transfer funds between accounts");
+        System.out.println("'1' - Get the balance of your Checking Account \n'2' - Get the balance of your Savings Account \n'3' - Get balance of your Business Account\n'4' - Deposit money to your Checking Account\n'5' - Deposit money to your Savings Account\n'6' - Deposit money to your Business Account\n'7' - Withdraw money from your Checking Account\n'8' - Withdraw money from your Savings Account\n'9' - Withdraw money from your Business Account\n'10' - Change the pin of your accounts\n'11' - Turn ATM off.");
         int userInput = scanner.nextInt();
 
         switch(userInput){
@@ -109,7 +110,12 @@ public class MainApplication {
             case 10:
                 System.out.println("Enter a new pin number.");
                 atm.changePin(businessAccount, scanner.nextInt());
-                //might have to change all of the pin number individually...
+                //might have to change all of the pin numbers individually...
+                break;
+
+            case 11:
+                System.out.println("Peace");
+                runCommandCenter = false;
 
         }