From 168df83a60983cbf53cb952d7895468132b7e0a0 Mon Sep 17 00:00:00 2001 From: SirTeruki Date: Mon, 29 Apr 2019 12:40:40 +0200 Subject: [PATCH] Fixed code and UML-diagram --- src/main/java/_3/_1/BankUser.java | 18 +++ src/main/java/_3/_1/Banking.java | 4 +- src/main/java/_3/_1/Customer.java | 28 +--- src/main/java/_3/_1/HomeAddress.java | 11 +- src/main/resources/3/Bankkonten_2.uxf | 218 +++++++++++++------------- 5 files changed, 142 insertions(+), 137 deletions(-) diff --git a/src/main/java/_3/_1/BankUser.java b/src/main/java/_3/_1/BankUser.java index 778e33a..18b2e88 100644 --- a/src/main/java/_3/_1/BankUser.java +++ b/src/main/java/_3/_1/BankUser.java @@ -2,6 +2,8 @@ package _3._1; public class BankUser { private String name; + private HomeAddress homeAddress; + private WorkAddress workAddress; public String getName() { return name; @@ -10,4 +12,20 @@ public class BankUser { public void setName(String name) { this.name = name; } + + public HomeAddress getHomeAddress() { + return homeAddress; + } + + public void setHomeAddress(HomeAddress homeAddress) { + this.homeAddress = homeAddress; + } + + public WorkAddress getWorkAddress() { + return workAddress; + } + + public void setWorkAddress(WorkAddress workAddress) { + this.workAddress = workAddress; + } } diff --git a/src/main/java/_3/_1/Banking.java b/src/main/java/_3/_1/Banking.java index fa195d1..a7ff7c8 100644 --- a/src/main/java/_3/_1/Banking.java +++ b/src/main/java/_3/_1/Banking.java @@ -11,12 +11,12 @@ public class Banking { thorin.setAccounts(new Account[1]); thorin.getAccounts()[0] = sbt.getAccounts()[0]; thorin.setName("Thorin"); - Address home = new Address(); + HomeAddress home = new HomeAddress(); home.setStreet("Kingsroad 1"); home.setPostCode("12345"); home.setCity("Dunland"); thorin.setHomeAddress(home); - Address work = new Address(); + WorkAddress work = new WorkAddress("Evil Corp"); work.setStreet("Throneroom 1"); work.setPostCode("54321"); work.setCity("Erebor"); diff --git a/src/main/java/_3/_1/Customer.java b/src/main/java/_3/_1/Customer.java index 6b9def7..334a586 100644 --- a/src/main/java/_3/_1/Customer.java +++ b/src/main/java/_3/_1/Customer.java @@ -1,19 +1,10 @@ package _3._1; -public class Customer extends BankUser{ +public class Customer extends BankUser { - private String name; - private Account[] accounts; - private Address homeAddress; - private Address workAddress; - public String getName() { - return name; - } + private Account[] accounts; - public void setName(String name) { - this.name = name; - } public Account[] getAccounts() { return accounts; @@ -23,20 +14,5 @@ public class Customer extends BankUser{ 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/HomeAddress.java b/src/main/java/_3/_1/HomeAddress.java index c29d51b..8ad012c 100644 --- a/src/main/java/_3/_1/HomeAddress.java +++ b/src/main/java/_3/_1/HomeAddress.java @@ -1,5 +1,14 @@ package _3._1; -public class HomeAddress { +public class HomeAddress extends Address { + private PostOfficeBox postOfficeBox; + + public PostOfficeBox getPostOfficeBox() { + return postOfficeBox; + } + + public void setPostOfficeBox(PostOfficeBox postOfficeBox) { + this.postOfficeBox = postOfficeBox; + } } diff --git a/src/main/resources/3/Bankkonten_2.uxf b/src/main/resources/3/Bankkonten_2.uxf index 23d19aa..03f4cc1 100644 --- a/src/main/resources/3/Bankkonten_2.uxf +++ b/src/main/resources/3/Bankkonten_2.uxf @@ -1,16 +1,16 @@ - 10 + 7 UMLClass - 460 - 250 - 210 - 200 + 637 + 175 + 147 + 140 - *Customer* + *BankUser* -- - +- name: String @@ -18,10 +18,10 @@ UMLClass - 460 + 637 0 - 210 - 90 + 147 + 63 *Account* -- @@ -34,10 +34,10 @@ Account(iban: String) UMLClass - 0 - 250 - 210 - 180 + 119 + 147 + 147 + 126 *Adress* -- @@ -49,10 +49,10 @@ Account(iban: String) UMLClass - 10 + 322 0 - 210 - 70 + 147 + 49 *Bank* -- @@ -64,51 +64,51 @@ Account(iban: String) Relation - 560 - 80 - 100 - 190 + 777 + 28 + 231 + 175 lt=<-> r2=-holders m2=1..* r1=-accounts m1=0..* - 10.0;10.0;10.0;170.0 + 10.0;20.0;260.0;20.0;260.0;230.0 Relation - 200 - 250 - 280 - 50 + 497 + 175 + 154 + 35 - lt=<- -r1=-homeAddress -m1=1 - 260.0;20.0;10.0;20.0 + lt=-> +r2=-workAddress +m2=0..1 + 200.0;20.0;10.0;20.0 Relation - 200 - 350 - 280 - 50 + 497 + 245 + 154 + 35 - lt=<- -m1=-workAddress -r1=1 - 260.0;20.0;10.0;20.0 + lt=-> +r2=-homeAddress +m2=0..1 + 200.0;20.0;10.0;20.0 UMLClass - 0 - 530 - 210 - 70 + 357 + 154 + 147 + 49 *WorkAdress* -- @@ -118,45 +118,23 @@ r1=1 UMLClass - 270 - 480 - 210 - 70 + 357 + 224 + 147 + 49 *HomeAddress* -- - - Relation - - 40 - 420 - 30 - 130 - - lt=<<- - 10.0;10.0;10.0;110.0 - - - Relation - - 160 - 420 - 170 - 80 - - lt=<<- - 10.0;10.0;150.0;60.0 - UMLClass - 270 - 650 - 210 - 70 + 357 + 343 + 147 + 49 *PostOfficeBox* -- @@ -167,10 +145,10 @@ r1=1 Relation - 310 - 540 - 130 - 130 + 385 + 266 + 91 + 91 lt=<- r1=-postOfficeBox @@ -180,49 +158,49 @@ m1=0..1 UMLClass - 520 - 570 - 210 - 70 + 679 + 399 + 147 + 49 *FinancialAdvisor* -- -- customer: Customer[] + Relation - 560 - 440 - 110 - 150 + 707 + 308 + 21 + 105 - lt=<- -r1=-customers -m1=0..* + lt=<<- + 10.0;10.0;10.0;130.0 UMLClass - 800 - 270 - 210 - 70 + 875 + 189 + 147 + 49 - *BankUser* + *Customer* -- -- name: String + + Relation - 660 - 290 - 160 - 30 + 777 + 203 + 112 + 21 lt=<<- 140.0;10.0;10.0;10.0 @@ -230,25 +208,49 @@ m1=0..* Relation - 720 - 330 - 130 - 300 + 819 + 231 + 203 + 210 - lt=<<- - 110.0;10.0;10.0;280.0 + lt=<- +r1=-customers +m1=0..* + 190.0;10.0;190.0;280.0;10.0;280.0 Relation - 210 - 20 - 270 - 50 + 462 + 14 + 189 + 35 lt=<<<<-> r2=-accounts m2=0..* 10.0;20.0;250.0;20.0 + + Relation + + 259 + 175 + 112 + 21 + + lt=<<- + 10.0;10.0;140.0;10.0 + + + Relation + + 259 + 245 + 112 + 21 + + lt=<<- + 10.0;10.0;140.0;10.0 +