From 567ced3feb9c00fa5eaf5bdbc0207b9d8e70e83a Mon Sep 17 00:00:00 2001 From: esheteda67206 Date: Thu, 20 Dec 2018 14:43:22 +0100 Subject: [PATCH 1/4] commit --- src/Account.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/Account.java diff --git a/src/Account.java b/src/Account.java new file mode 100644 index 0000000..71acc74 --- /dev/null +++ b/src/Account.java @@ -0,0 +1,12 @@ +public class Account { + public Person owner; + public String email; + + + public void accountErstellen(Person p, String e_email){ + + + + } + +} From f064d3835e996015b164fc1aad4c9a45428f8b55 Mon Sep 17 00:00:00 2001 From: blckxsepia Date: Thu, 20 Dec 2018 14:48:09 +0100 Subject: [PATCH 2/4] Beduerftiger Class erstellt --- src/Beduerftiger.java | 15 +++++++++++++++ src/TestBeduerftiger.java | 27 +++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 src/Beduerftiger.java create mode 100644 src/TestBeduerftiger.java diff --git a/src/Beduerftiger.java b/src/Beduerftiger.java new file mode 100644 index 0000000..bf41d29 --- /dev/null +++ b/src/Beduerftiger.java @@ -0,0 +1,15 @@ +public class Beduerftiger { + + public String bFirstName; + public String bLastName; + public String bNeed; + + public Beduerftiger(){ + + } + public Beduerftiger(String theFirstName, String theLastName, String theNeed ){ + this.bFirstName = theFirstName; + this.bLastName = theLastName; + this.bNeed = theNeed; + } +} diff --git a/src/TestBeduerftiger.java b/src/TestBeduerftiger.java new file mode 100644 index 0000000..e6d8898 --- /dev/null +++ b/src/TestBeduerftiger.java @@ -0,0 +1,27 @@ +import org.junit.Test; +import static org.junit.Assert.*; + + +public class TestBeduerftiger { + + @Test + public void firstNameChange(){ + String bfirstName= "Jesus"; + String result ="Jesus"; + assertEquals(bfirstName, result); + } + @Test + public void lastNameChange(){ + String bLastName= "Gottessohn"; + String result ="Gottessohn"; + assertEquals(bLastName, result); + } + + @Test + public void NeedChange(){ + String bNeed= "Abendmahl"; + String result ="Abendmahl"; + assertEquals(bNeed, result); + } + +} From a8cfd4fd562c8dc5b724eac69e95c0f76e34547d Mon Sep 17 00:00:00 2001 From: esheteda67206 Date: Thu, 20 Dec 2018 14:54:31 +0100 Subject: [PATCH 3/4] Person commit --- src/Person.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/Person.java diff --git a/src/Person.java b/src/Person.java new file mode 100644 index 0000000..e88b0fa --- /dev/null +++ b/src/Person.java @@ -0,0 +1,16 @@ +public class Person { + + + public String name; + public String vname; + public int age; + + Person(String name, String vname, int age){ + + this.name = name; + this.vname = vname; + this.age = age; + } + + +} From 4c73ee72ea19076ddd13aa71cce69bbd3b4df43d Mon Sep 17 00:00:00 2001 From: amadoubahaa68134 Date: Thu, 20 Dec 2018 15:18:50 +0100 Subject: [PATCH 4/4] Spender Klasse fertig --- .idea/misc.xml | 4 ++-- src/Credentials.java | 8 -------- src/Person.java | 1 - src/Spender.java | 20 ++++++++++++++++++++ 4 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 src/Spender.java diff --git a/.idea/misc.xml b/.idea/misc.xml index 0ae562a..0e8a68a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,7 +3,7 @@ - - + + \ No newline at end of file diff --git a/src/Credentials.java b/src/Credentials.java index 6e46956..8c8f399 100644 --- a/src/Credentials.java +++ b/src/Credentials.java @@ -30,20 +30,12 @@ public class Credentials { System.out.println(pw); } - - compare(name, pw); - } return false; } - private void compare(String name, String pw) { - - - } - diff --git a/src/Person.java b/src/Person.java index e88b0fa..032b92a 100644 --- a/src/Person.java +++ b/src/Person.java @@ -6,7 +6,6 @@ public class Person { public int age; Person(String name, String vname, int age){ - this.name = name; this.vname = vname; this.age = age; diff --git a/src/Spender.java b/src/Spender.java new file mode 100644 index 0000000..71dbf5f --- /dev/null +++ b/src/Spender.java @@ -0,0 +1,20 @@ +public class Spender extends Person{ + + private int amount; + + public Spender (String fname, String lname, int age, int summe){ + super(fname, lname, age); + this.amount = summe; + } + + public void betragSetzen(int summe){ + if(summe > 0){ + amount = summe; + } + } + + public int getAmount(){ + return amount; + } + +}