From ca4642f78557b0923c9df12ae1e7f1711e27c218 Mon Sep 17 00:00:00 2001 From: Delta1805 Date: Wed, 20 Sep 2017 19:51:25 +0200 Subject: [PATCH] converted datenbank to static --- src/fußballmanager/namegen/Datenbank.java | 36 +++++++++++++--------- src/fußballmanager/personen/Person.java | 16 +--------- 2 files changed, 23 insertions(+), 29 deletions(-) diff --git a/src/fußballmanager/namegen/Datenbank.java b/src/fußballmanager/namegen/Datenbank.java index 6f7d93f..4f4a771 100644 --- a/src/fußballmanager/namegen/Datenbank.java +++ b/src/fußballmanager/namegen/Datenbank.java @@ -3,20 +3,28 @@ package fu public class Datenbank { int n = 100; - public int counterName = 0; - public int counterVorname = 0; - public int counterBeiname = 0; - public String[] nameFeld; - public String[] vornameFeld; - public String[] beinameFeld; - - public Datenbank(){ - nameFeld = new String[n]; - vornameFeld = new String[n]; - beinameFeld = new String[n]; + static int counterName = 0; + static int counterVorname = 0; + static int counterBeiname = 0; + static String[] nameFeld; + static String[] vornameFeld; + static String[] beinameFeld; + + public static String genName(){ + String r = ""; + nameFeldFüllen(); + r += nameFeld[(int) (Math.random() * counterVorname)]; + return r; + } + + public static String genVorname(){ + String r = ""; + nameFeldFüllen(); + r += vornameFeld[(int) (Math.random() * counterVorname)]; + return r; } - public void nameFeldFüllen(){ + static void nameFeldFüllen(){ nameFeld[counterName] = "Guenther"; counterName++; nameFeld[counterName] = "Schmidt"; @@ -79,7 +87,7 @@ public class Datenbank { } - public void beinameFeldFüllen(){ + static void beinameFeldFüllen(){ beinameFeld[counterBeiname] = " Junior"; counterBeiname++; beinameFeld[counterBeiname] = " Senior"; @@ -97,7 +105,7 @@ public class Datenbank { } } - public void vornameFeldFüllen(){ + static void vornameFeldFüllen(){ vornameFeld[counterVorname] = "Anton"; counterVorname++; vornameFeld[counterVorname] = "Ralph"; diff --git a/src/fußballmanager/personen/Person.java b/src/fußballmanager/personen/Person.java index 79836bf..306e4a6 100644 --- a/src/fußballmanager/personen/Person.java +++ b/src/fußballmanager/personen/Person.java @@ -12,21 +12,7 @@ public abstract class Person { this.team = team; } - public String genName(){ - String r = ""; - Datenbank data = new Datenbank(); - data.nameFeldFüllen(); - r += data.nameFeld[(int) (Math.random() * data.counterVorname)]; - return r; - } - - public String genVorname(Datenbank d){ - String r = ""; - Datenbank data = new Datenbank(); - data.nameFeldFüllen(); - r += data.vornameFeld[(int) (Math.random() * data.counterVorname)]; - return r; - } + public Team getTeam(){ return team;