From 4ff091ff315404f2b956e2625347d2831e7ff2d1 Mon Sep 17 00:00:00 2001 From: Ileana Krontsi Date: Sun, 15 Nov 2015 14:29:18 +0100 Subject: [PATCH 1/2] Enum Geschlecht mit parseChar ausgestattet. --- src/main/java/de/uniluebeck/mi/projmi6/model/Patient.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/uniluebeck/mi/projmi6/model/Patient.java b/src/main/java/de/uniluebeck/mi/projmi6/model/Patient.java index 2d9b429..57bbb45 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/model/Patient.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/model/Patient.java @@ -27,7 +27,6 @@ public class Patient extends Version { private SimpleStringProperty cave = new SimpleStringProperty(this, "cave"); - public int getPatID() { return patID.get(); } @@ -210,6 +209,18 @@ public class Patient extends Version { this.geschlecht = geschlecht; } + public static Geschlecht parseChar(final char id) { + switch (id) { + case 'm': + return MALE; + case 'w': + return FEMALE; + case 'o': + default: + return OTHER; + } + + } @Override public String toString() { @@ -237,4 +248,4 @@ public class Patient extends Version { return familienstand; } } -} +} \ No newline at end of file From 67f24bdb566ff051079beaec8e04abef8c06ab2f Mon Sep 17 00:00:00 2001 From: Ileana Krontsi Date: Sun, 15 Nov 2015 14:41:09 +0100 Subject: [PATCH 2/2] Enum Familienstand mit parseChar ausgestattet. --- .../java/de/uniluebeck/mi/projmi6/model/Patient.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/uniluebeck/mi/projmi6/model/Patient.java b/src/main/java/de/uniluebeck/mi/projmi6/model/Patient.java index 77616a1..8dee655 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/model/Patient.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/model/Patient.java @@ -243,7 +243,7 @@ public class Patient extends Version { public enum Familienstand { LEDIG('l', "ledig"), - GETRANNT('g', "getrennt"), + GETRENNT('g', "getrennt"), VERHEIRATET('v', "verheiratet"), VERWITWET('w', "verwitwet"); @@ -255,6 +255,21 @@ public class Patient extends Version { this.familienstand = familienstand; } + public static Familienstand parseChar(final char id) { + switch (id) { + case 'l': + return LEDIG; + case 'g': + return GETRENNT; + case 'v': + return VERHEIRATET; + case 'w': + return VERWITWET; + default: + return LEDIG; + } + } + @Override public String toString() { return familienstand;