From 7f6a73be0003b5475f689acea6d4784d110f05b6 Mon Sep 17 00:00:00 2001 From: SirTeruki Date: Fri, 26 Apr 2019 18:26:54 +0200 Subject: [PATCH] Added classes according to class diagram --- src/main/java/_2/_3/Out.java | 8 +--- src/main/java/_3/_1/Account.java | 28 ++++++++++---- src/main/java/_3/_1/Address.java | 36 ++++++++++++------ src/main/java/_3/_1/Bank.java | 24 ++++++++---- src/main/java/_3/_1/Banking.java | 4 +- src/main/java/_3/_1/Customer.java | 52 +++++++++++++++++--------- src/main/java/_3/_1/PostOfficeBox.java | 22 +++++++++++ src/main/resources/3/Bankkonten_2.uxf | 49 ++++++++++++------------ 8 files changed, 145 insertions(+), 78 deletions(-) create mode 100644 src/main/java/_3/_1/PostOfficeBox.java diff --git a/src/main/java/_2/_3/Out.java b/src/main/java/_2/_3/Out.java index 9bc8800..a820f26 100644 --- a/src/main/java/_2/_3/Out.java +++ b/src/main/java/_2/_3/Out.java @@ -14,17 +14,13 @@ public class Out { System.out.println(d); } - public static void out(char c) { - System.out.println(c); - } + public static void out(char c) { System.out.println(c); } public static void out(String s) { System.out.println(s); } - public static void out(Object o) { - System.out.println(o); - } + public static void out(Object o) { System.out.println(o); } } diff --git a/src/main/java/_3/_1/Account.java b/src/main/java/_3/_1/Account.java index 747fb51..e75c1cc 100644 --- a/src/main/java/_3/_1/Account.java +++ b/src/main/java/_3/_1/Account.java @@ -1,21 +1,33 @@ package _3._1; public class Account { - + private Customer[] holders; private long balance; private String iban; - - public Account(String iban) { this.iban = iban; } - public Customer[] getHolders() { return holders; } + public Account(String iban) { + this.iban = iban; + } + + public Customer[] getHolders() { + return holders; + } - public void setHolders(Customer[] holders) { this.holders = holders; } + public void setHolders(Customer[] holders) { + this.holders = holders; + } - public long getBalance() { return balance; } + public long getBalance() { + return balance; + } - public void setBalance(long balance) { this.balance = balance; } + public void setBalance(long balance) { + this.balance = balance; + } - public String getIban() { return iban; } + public String getIban() { + return iban; + } } diff --git a/src/main/java/_3/_1/Address.java b/src/main/java/_3/_1/Address.java index a7730ae..cb33e14 100644 --- a/src/main/java/_3/_1/Address.java +++ b/src/main/java/_3/_1/Address.java @@ -1,21 +1,33 @@ package _3._1; public class Address { - + private String street; private String postCode; private String city; - public String getStreet() { return street; } - - public void setStreet(String street) { this.street = street; } - - public String getPostCode() { return postCode; } - - public void setPostCode(String postCode) { this.postCode = postCode; } - - public String getCity() { return city; } - - public void setCity(String city) { this.city = city; } + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } + + public String getPostCode() { + return postCode; + } + + public void setPostCode(String postCode) { + this.postCode = postCode; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } } diff --git a/src/main/java/_3/_1/Bank.java b/src/main/java/_3/_1/Bank.java index 1a3ad4f..8afa32d 100644 --- a/src/main/java/_3/_1/Bank.java +++ b/src/main/java/_3/_1/Bank.java @@ -1,18 +1,28 @@ package _3._1; public class Bank { - + private String name; private Account[] accounts; - public Bank(String name) { this.name = name; } - - public String getName() { return name; } + public Bank(String name) { + this.name = name; + } + + public String getName() { + return name; + } - public void setName(String name) { this.name = name; } + public void setName(String name) { + this.name = name; + } - public Account[] getAccounts() { return accounts; } + public Account[] getAccounts() { + return accounts; + } - public void setAccounts(Account[] accounts) { this.accounts = accounts; } + public void setAccounts(Account[] accounts) { + this.accounts = accounts; + } } diff --git a/src/main/java/_3/_1/Banking.java b/src/main/java/_3/_1/Banking.java index 8297b2f..fa195d1 100644 --- a/src/main/java/_3/_1/Banking.java +++ b/src/main/java/_3/_1/Banking.java @@ -1,7 +1,7 @@ package _3._1; public class Banking { - + public static void main(String[] args) { Bank sbt = new Bank("Smaug Bank & Trust"); sbt.setAccounts(new Account[1]); @@ -21,7 +21,7 @@ public class Banking { work.setPostCode("54321"); work.setCity("Erebor"); thorin.setWorkAddress(work); - sbt.getAccounts()[0].setHolders(new Customer[] { thorin }); + sbt.getAccounts()[0].setHolders(new Customer[]{thorin}); } } diff --git a/src/main/java/_3/_1/Customer.java b/src/main/java/_3/_1/Customer.java index 2daaeb7..6b9def7 100644 --- a/src/main/java/_3/_1/Customer.java +++ b/src/main/java/_3/_1/Customer.java @@ -1,26 +1,42 @@ package _3._1; -public class Customer { - +public class Customer extends BankUser{ + private String name; private Account[] accounts; private Address homeAddress; private Address workAddress; - - public String getName() { return name; } - - public void setName(String name) { this.name = name; } - - public Account[] getAccounts() { return accounts; } - - public void setAccounts(Account[] accounts) { this.accounts = accounts; } - - public Address getHomeAddress() { return homeAddress; } - - public void setHomeAddress(Address homeAddress) { this.homeAddress = homeAddress; } - - public Address getWorkAddress() { return workAddress; } - - public void setWorkAddress(Address workAddress) { this.workAddress = workAddress; } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Account[] getAccounts() { + return accounts; + } + + public void setAccounts(Account[] accounts) { + this.accounts = accounts; + } + + public Address getHomeAddress() { + return homeAddress; + } + + public void setHomeAddress(Address homeAddress) { + this.homeAddress = homeAddress; + } + + public Address getWorkAddress() { + return workAddress; + } + + public void setWorkAddress(Address workAddress) { + this.workAddress = workAddress; + } } diff --git a/src/main/java/_3/_1/PostOfficeBox.java b/src/main/java/_3/_1/PostOfficeBox.java new file mode 100644 index 0000000..0394d53 --- /dev/null +++ b/src/main/java/_3/_1/PostOfficeBox.java @@ -0,0 +1,22 @@ +package _3._1; + +public class PostOfficeBox { + private String poBoxCode; + private String poBoxCity; + + public String getPoBoxCode() { + return poBoxCode; + } + + public void setPoBoxCode(String poBoxCode) { + this.poBoxCode = poBoxCode; + } + + public String getPoBoxCity() { + return poBoxCity; + } + + public void setPoBoxCity(String poBoxCity) { + this.poBoxCity = poBoxCity; + } +} diff --git a/src/main/resources/3/Bankkonten_2.uxf b/src/main/resources/3/Bankkonten_2.uxf index b9d292a..23d19aa 100644 --- a/src/main/resources/3/Bankkonten_2.uxf +++ b/src/main/resources/3/Bankkonten_2.uxf @@ -1,11 +1,10 @@ - - + 10 UMLClass 460 - 260 + 250 210 200 @@ -20,7 +19,7 @@ UMLClass 460 - 10 + 0 210 90 @@ -36,7 +35,7 @@ Account(iban: String) UMLClass 0 - 260 + 250 210 180 @@ -51,7 +50,7 @@ Account(iban: String) UMLClass 10 - 10 + 0 210 70 @@ -66,8 +65,8 @@ Account(iban: String) Relation 560 - 90 - 90 + 80 + 100 190 lt=<-> @@ -81,7 +80,7 @@ m1=0..* Relation 200 - 260 + 250 280 50 @@ -94,7 +93,7 @@ m1=1 Relation 200 - 360 + 350 280 50 @@ -107,7 +106,7 @@ r1=1 UMLClass 0 - 540 + 530 210 70 @@ -120,7 +119,7 @@ r1=1 UMLClass 270 - 490 + 480 210 70 @@ -133,7 +132,7 @@ r1=1 Relation 40 - 430 + 420 30 130 @@ -144,7 +143,7 @@ r1=1 Relation 160 - 430 + 420 170 80 @@ -155,7 +154,7 @@ r1=1 UMLClass 270 - 660 + 650 210 70 @@ -169,8 +168,8 @@ r1=1 Relation 310 - 550 - 120 + 540 + 130 130 lt=<- @@ -182,21 +181,21 @@ m1=0..1 UMLClass 520 - 580 + 570 210 70 *FinancialAdvisor* -- - +- customer: Customer[] Relation 560 - 450 - 100 + 440 + 110 150 lt=<- @@ -208,7 +207,7 @@ m1=0..* UMLClass 800 - 280 + 270 210 70 @@ -221,7 +220,7 @@ m1=0..* Relation 660 - 300 + 290 160 30 @@ -232,7 +231,7 @@ m1=0..* Relation 720 - 340 + 330 130 300 @@ -243,7 +242,7 @@ m1=0..* Relation 210 - 30 + 20 270 50