Skip to content

Commit 51faf39

Browse files
jasquierjasquier
authored
Merge pull request #3 from jasquier/jasquier
restructured pacakges for easier understanding
2 parents 64355a5 + 976be08 commit 51faf39

26 files changed

+75
-62
lines changed

Diff for: ‎src/main/java/squier/john/reusingClasses/ATM.java renamed to ‎src/main/java/squier/john/reusingClasses/ATM/ATM.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package squier.john.reusingClasses;
1+
package squier.john.reusingClasses.ATM;
22

33
import java.util.ArrayList;
44

@@ -7,22 +7,22 @@
77
*/
88
public class ATM {
99

10-
private ArrayList<Account> accounts;
10+
private ArrayList<ATM.Account> accounts;
1111

1212
public ATM() {
13-
accounts = new ArrayList<Account>();
13+
accounts = new ArrayList<ATM.Account>();
1414
}
1515

16-
public ATM(ArrayList<Account> accounts) {
16+
public ATM(ArrayList<ATM.Account> accounts) {
1717
this.accounts = accounts;
1818
}
1919

20-
public ArrayList<Account> getAccounts() { return accounts; }
20+
public ArrayList<ATM.Account> getAccounts() { return accounts; }
2121

2222
public String displayAccountNamesAndBalances() {
2323
StringBuilder stringBuilder = new StringBuilder(500);
2424

25-
for ( Account a : accounts ) {
25+
for ( ATM.Account a : accounts ) {
2626
stringBuilder.append("Name: ");
2727
stringBuilder.append(a.getAccountHoldersName());
2828
stringBuilder.append(" Balance: ");
@@ -32,15 +32,15 @@ public String displayAccountNamesAndBalances() {
3232
return stringBuilder.toString();
3333
}
3434

35-
public void addAccountToAccounts(Account account) {
35+
public void addAccountToAccounts(ATM.Account account) {
3636
accounts.add(account);
3737
return;
3838
}
3939

4040
public void removeAccountWithNameAndBalance(String accountHoldersName, Double balance) {
41-
Account toRemove = null;
41+
ATM.Account toRemove = null;
4242

43-
for ( Account a : accounts ) {
43+
for ( ATM.Account a : accounts ) {
4444
if ( a.getAccountHoldersName().equalsIgnoreCase(accountHoldersName)
4545
&& a.getBalance().equals(balance) ) {
4646
toRemove = a;

Diff for: ‎src/main/java/squier/john/reusingClasses/ATMMain.java renamed to ‎src/main/java/squier/john/reusingClasses/ATM/ATMMain.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package squier.john.reusingClasses;
1+
package squier.john.reusingClasses.ATM;
22

33
import java.util.ArrayList;
44

@@ -9,17 +9,17 @@ public class ATMMain {
99
public static void main(String[] args) {
1010

1111
// Create some accounts
12-
Account savings = new SavingsAccount(BankAccountType.SAVINGS, 100.0, "Alice", 1.0,
12+
ATM.Account savings = new SavingsAccount(BankAccountType.SAVINGS, 100.0, "Alice", 1.0,
1313
BankAccountStatus.OPEN, OverdraftProtection.ENABLED);
1414

15-
Account checking = new CheckingAccount(BankAccountType.CHECKING, 50.0, "Bob", 0.0,
15+
ATM.Account checking = new CheckingAccount(BankAccountType.CHECKING, 50.0, "Bob", 0.0,
1616
BankAccountStatus.OPEN, OverdraftProtection.ENABLED);
1717

18-
Account investment = new InvestmentAccount(BankAccountType.INVESTMENT, 10000.0, "Eve", 10.0,
18+
ATM.Account investment = new InvestmentAccount(BankAccountType.INVESTMENT, 10000.0, "Eve", 10.0,
1919
BankAccountStatus.OPEN, OverdraftProtection.ENABLED);
2020

2121
// Put em in an array list
22-
ArrayList<Account> accounts = new ArrayList<>();
22+
ArrayList<ATM.Account> accounts = new ArrayList<>();
2323
accounts.add(savings);
2424
accounts.add(checking);
2525
accounts.add(investment);
@@ -31,7 +31,7 @@ public static void main(String[] args) {
3131
System.out.println(atm.displayAccountNamesAndBalances());
3232

3333
// Add a new account to the atm
34-
Account newAccount = new InvestmentAccount(BankAccountType.INVESTMENT, 0.0, "Steve", 10.0,
34+
ATM.Account newAccount = new InvestmentAccount(BankAccountType.INVESTMENT, 0.0, "Steve", 10.0,
3535
BankAccountStatus.OPEN, OverdraftProtection.ENABLED);
3636

3737
atm.addAccountToAccounts(newAccount);

Diff for: ‎src/main/java/squier/john/reusingClasses/Account.java renamed to ‎src/main/java/squier/john/reusingClasses/ATM/Account.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package squier.john.reusingClasses;
1+
package squier.john.reusingClasses.ATM;
22

33
import java.util.ArrayList;
44

Diff for: ‎src/main/java/squier/john/reusingClasses/ApprovalStatus.java renamed to ‎src/main/java/squier/john/reusingClasses/ATM/ApprovalStatus.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package squier.john.reusingClasses;
1+
package squier.john.reusingClasses.ATM;
22

33
/**
44
* Created by johnsquier on 1/18/17.

Diff for: ‎src/main/java/squier/john/reusingClasses/BankAccountStatus.java renamed to ‎src/main/java/squier/john/reusingClasses/ATM/BankAccountStatus.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package squier.john.reusingClasses;
1+
package squier.john.reusingClasses.ATM;
22

33
/**
44
* Created by johnsquier on 1/18/17.

Diff for: ‎src/main/java/squier/john/reusingClasses/BankAccountTransaction.java renamed to ‎src/main/java/squier/john/reusingClasses/ATM/BankAccountTransaction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package squier.john.reusingClasses;
1+
package squier.john.reusingClasses.ATM;
22

33
/**
44
* Created by johnsquier on 1/18/17.

Diff for: ‎src/main/java/squier/john/reusingClasses/BankAccountType.java renamed to ‎src/main/java/squier/john/reusingClasses/ATM/BankAccountType.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package squier.john.reusingClasses;
1+
package squier.john.reusingClasses.ATM;
22

33
/**
44
* Created by johnsquier on 1/18/17.

Diff for: ‎src/main/java/squier/john/reusingClasses/CheckingAccount.java renamed to ‎src/main/java/squier/john/reusingClasses/ATM/CheckingAccount.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package squier.john.reusingClasses;
1+
package squier.john.reusingClasses.ATM;
22

33
/**
44
* Created by johnsquier on 1/18/17.
55
*/
6-
public class CheckingAccount extends Account {
6+
public class CheckingAccount extends ATM.Account {
77

88
public CheckingAccount(BankAccountType accountType, double balance, String accountHoldersName, double interestRate,
99
BankAccountStatus accountStatus, OverdraftProtection overdraftProtection) {

Diff for: ‎src/main/java/squier/john/reusingClasses/InvestmentAccount.java renamed to ‎src/main/java/squier/john/reusingClasses/ATM/InvestmentAccount.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package squier.john.reusingClasses;
1+
package squier.john.reusingClasses.ATM;
22

33
/**
44
* Created by johnsquier on 1/18/17.
55
*/
6-
public class InvestmentAccount extends Account {
6+
public class InvestmentAccount extends ATM.Account {
77

88
public InvestmentAccount(BankAccountType accountType, double balance, String accountHoldersName, double interestRate,
9-
BankAccountStatus accountStatus, OverdraftProtection overdraftProtection) {
9+
BankAccountStatus accountStatus, OverdraftProtection overdraftProtection) {
1010

1111
super(accountType, balance, accountHoldersName, interestRate, accountStatus, overdraftProtection);
1212
}

Diff for: ‎src/main/java/squier/john/reusingClasses/OverdraftProtection.java renamed to ‎src/main/java/squier/john/reusingClasses/ATM/OverdraftProtection.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package squier.john.reusingClasses;
1+
package squier.john.reusingClasses.ATM;
22

33
/**
44
* Created by johnsquier on 1/18/17.

Diff for: ‎src/main/java/squier/john/reusingClasses/SavingsAccount.java renamed to ‎src/main/java/squier/john/reusingClasses/ATM/SavingsAccount.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1-
package squier.john.reusingClasses;
1+
package squier.john.reusingClasses.ATM;
2+
3+
import squier.john.reusingClasses.ATM.ATM;
4+
import squier.john.reusingClasses.ATM.BankAccountStatus;
5+
import squier.john.reusingClasses.ATM.BankAccountType;
6+
import squier.john.reusingClasses.ATM.OverdraftProtection;
27

38
/**
49
* Created by johnsquier on 1/18/17.
510
*/
6-
public class SavingsAccount extends Account {
11+
public class SavingsAccount extends ATM.Account {
712

813
public SavingsAccount(BankAccountType accountType, double balance, String accountHoldersName, double interestRate,
914
BankAccountStatus accountStatus, OverdraftProtection overdraftProtection) {

Diff for: ‎src/main/java/squier/john/reusingClasses/TransactionType.java renamed to ‎src/main/java/squier/john/reusingClasses/ATM/TransactionType.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package squier.john.reusingClasses;
1+
package squier.john.reusingClasses.ATM;
22

33
/**
44
* Created by johnsquier on 1/18/17.

Diff for: ‎src/main/java/squier/john/reusingClasses/Main.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
package squier.john.reusingClasses;
22

3-
import sun.print.SunMinMaxPage;
3+
import squier.john.reusingClasses.humans.Genders;
4+
import squier.john.reusingClasses.humans.Human;
5+
import squier.john.reusingClasses.humans.SuperHuman;
6+
import squier.john.reusingClasses.inventory.Inventory;
7+
import squier.john.reusingClasses.inventory.Product;
8+
import squier.john.reusingClasses.rotatableList.RotatableList;
49

510
/**
611
* Created by johnsquier on 1/18/17.

Diff for: ‎src/main/java/squier/john/reusingClasses/Genders.java renamed to ‎src/main/java/squier/john/reusingClasses/humans/Genders.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package squier.john.reusingClasses;
1+
package squier.john.reusingClasses.humans;
22

33
/**
44
* Created by johnsquier on 1/18/17.
55
*/
6+
// extensibile
67
public enum Genders {MALE, FEMALE}

Diff for: ‎src/main/java/squier/john/reusingClasses/Human.java renamed to ‎src/main/java/squier/john/reusingClasses/humans/Human.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package squier.john.reusingClasses;
1+
package squier.john.reusingClasses.humans;
22

33
import com.sun.tools.javac.jvm.Gen;
44

Diff for: ‎src/main/java/squier/john/reusingClasses/SuperHuman.java renamed to ‎src/main/java/squier/john/reusingClasses/humans/SuperHuman.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package squier.john.reusingClasses;
1+
package squier.john.reusingClasses.humans;
22

33
/**
44
* Created by johnsquier on 1/18/17.

Diff for: ‎src/main/java/squier/john/reusingClasses/Inventory.java renamed to ‎src/main/java/squier/john/reusingClasses/inventory/Inventory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package squier.john.reusingClasses;
1+
package squier.john.reusingClasses.inventory;
22

33
import java.util.ArrayList;
44

Diff for: ‎src/main/java/squier/john/reusingClasses/Product.java renamed to ‎src/main/java/squier/john/reusingClasses/inventory/Product.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package squier.john.reusingClasses;
1+
package squier.john.reusingClasses.inventory;
22

33
/**
44
* Created by johnsquier on 1/18/17.

Diff for: ‎src/main/java/squier/john/reusingClasses/RotatableList.java renamed to ‎src/main/java/squier/john/reusingClasses/rotatableList/RotatableList.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package squier.john.reusingClasses;
1+
package squier.john.reusingClasses.rotatableList;
22

3-
import java.lang.reflect.Array;
43
import java.util.*;
54

65
/**

Diff for: ‎src/test/java/squier/john/reusingClasses/ATMTest.java

+12-11
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.junit.Assert;
44
import org.junit.Before;
55
import org.junit.Test;
6+
import squier.john.reusingClasses.ATM.*;
67

78
import java.util.ArrayList;
89

@@ -12,21 +13,21 @@
1213
public class ATMTest {
1314

1415
ATM atm;
15-
ArrayList<Account> accounts;
16+
ArrayList<ATM.Account> accounts;
1617

1718
@Before
1819
public void setup() {
19-
accounts = new ArrayList<Account>();
20+
accounts = new ArrayList<ATM.Account>();
2021

21-
Account account1 = new SavingsAccount(
22+
ATM.Account account1 = new SavingsAccount(
2223
BankAccountType.SAVINGS, 100.0, "John", 10.0,
2324
BankAccountStatus.OPEN, OverdraftProtection.ENABLED);
2425

25-
Account account2 = new CheckingAccount(BankAccountType.CHECKING, 50.0, "Alice", 0.0,
26+
ATM.Account account2 = new CheckingAccount(BankAccountType.CHECKING, 50.0, "Alice", 0.0,
2627
BankAccountStatus.OPEN, OverdraftProtection.DISABLED);
2728

2829

29-
Account account3 = new InvestmentAccount(BankAccountType.INVESTMENT, 10000.0, "Bob", 15.0,
30+
ATM.Account account3 = new InvestmentAccount(BankAccountType.INVESTMENT, 10000.0, "Bob", 15.0,
3031
BankAccountStatus.OPEN, OverdraftProtection.ENABLED);
3132

3233
accounts.add(account1);
@@ -38,8 +39,8 @@ public void setup() {
3839

3940
@Test
4041
public void getAccountsTest() {
41-
ArrayList<Account> expected = accounts;
42-
ArrayList<Account> actual = atm.getAccounts();
42+
ArrayList<ATM.Account> expected = accounts;
43+
ArrayList<ATM.Account> actual = atm.getAccounts();
4344
Assert.assertEquals(expected, actual);
4445
}
4546

@@ -54,20 +55,20 @@ public void displayAccountNamesAndBalancesTest() {
5455

5556
@Test
5657
public void addAccountToAccountsTest() {
57-
Account expected = new SavingsAccount(BankAccountType.SAVINGS, 0.0, "John", 0.0,
58+
ATM.Account expected = new SavingsAccount(BankAccountType.SAVINGS, 0.0, "John", 0.0,
5859
BankAccountStatus.OPEN, OverdraftProtection.ENABLED);
5960
atm.addAccountToAccounts(expected);
60-
Account actual = atm.getAccounts().get(3);
61+
ATM.Account actual = atm.getAccounts().get(3);
6162
Assert.assertEquals(expected, actual);
6263
}
6364

6465
@Test
6566
public void removeAccountWithNameAndBalanceTest() {
6667
// need to implement .equals in Account I believe
67-
ArrayList<Account> expected = accounts;
68+
ArrayList<ATM.Account> expected = accounts;
6869

6970
atm.removeAccountWithNameAndBalance("John", 0.0);
7071

71-
ArrayList<Account> actual = atm.getAccounts();
72+
ArrayList<ATM.Account> actual = atm.getAccounts();
7273
}
7374
}

Diff for: ‎src/test/java/squier/john/reusingClasses/CheckingAccountTest.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
import org.junit.Assert;
44
import org.junit.Test;
5+
import squier.john.reusingClasses.ATM.*;
56

67
/**
78
* Created by johnsquier on 1/18/17.
89
*/
910
public class CheckingAccountTest {
10-
Account bankAccount;
11+
ATM.Account bankAccount;
1112
double delta = 0.00001;
1213

1314
@Test
@@ -109,8 +110,8 @@ public void updateBalanceZeroTest() {
109110
"John", 10.0, BankAccountStatus.OPEN,
110111
OverdraftProtection.ENABLED);
111112

112-
ApprovalStatus expected = ApprovalStatus.ZERO_TRANSACTION;
113-
ApprovalStatus actual = bankAccount.updateBalanceWithCreditOrDebit(0.0);
113+
ATM.ApprovalStatus expected = ATM.ApprovalStatus.ZERO_TRANSACTION;
114+
ATM.ApprovalStatus actual = bankAccount.updateBalanceWithCreditOrDebit(0.0);
114115
Assert.assertEquals(expected, actual);
115116
}
116117

Diff for: ‎src/test/java/squier/john/reusingClasses/InventoryTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
import org.junit.Assert;
44
import org.junit.Before;
55
import org.junit.Test;
6+
import squier.john.reusingClasses.inventory.Inventory;
7+
import squier.john.reusingClasses.inventory.Product;
68

7-
import java.security.ProtectionDomain;
89
import java.util.ArrayList;
910

1011
/**

Diff for: ‎src/test/java/squier/john/reusingClasses/InvestmentAccountTest.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
import org.junit.Assert;
44
import org.junit.Test;
5+
import squier.john.reusingClasses.ATM.*;
56

67
/**
78
* Created by johnsquier on 1/18/17.
89
*/
910
public class InvestmentAccountTest {
10-
Account bankAccount;
11+
ATM.Account bankAccount;
1112
double delta = 0.00001;
1213

1314
@Test
@@ -109,8 +110,8 @@ public void updateBalanceZeroTest() {
109110
"John", 10.0, BankAccountStatus.OPEN,
110111
OverdraftProtection.ENABLED);
111112

112-
ApprovalStatus expected = ApprovalStatus.ZERO_TRANSACTION;
113-
ApprovalStatus actual = bankAccount.updateBalanceWithCreditOrDebit(0.0);
113+
ATM.ApprovalStatus expected = ATM.ApprovalStatus.ZERO_TRANSACTION;
114+
ATM.ApprovalStatus actual = bankAccount.updateBalanceWithCreditOrDebit(0.0);
114115
Assert.assertEquals(expected, actual);
115116
}
116117

Diff for: ‎src/test/java/squier/john/reusingClasses/ListRotatorTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.junit.Assert;
44
import org.junit.Before;
55
import org.junit.Test;
6+
import squier.john.reusingClasses.rotatableList.RotatableList;
67

78
/**
89
* Created by johnsquier on 1/18/17.

Diff for: ‎src/test/java/squier/john/reusingClasses/ProductTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
import org.junit.Assert;
44
import org.junit.Before;
55
import org.junit.Test;
6-
7-
import java.util.Date;
6+
import squier.john.reusingClasses.inventory.Product;
87

98
/**
109
* Created by johnsquier on 1/18/17.

0 commit comments

Comments
 (0)