From db9dbb0dd840a1f2c7500b65e71ee3942265670f Mon Sep 17 00:00:00 2001 From: Stefan Suhren Date: Tue, 15 Dec 2015 20:05:13 +0100 Subject: Don't remove all Ansprechpartner on Organisation delete --- .../fhswf/in/inf/se/projektthemenvergabe/Main.java | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'src/de/fhswf/in/inf/se/projektthemenvergabe/Main.java') diff --git a/src/de/fhswf/in/inf/se/projektthemenvergabe/Main.java b/src/de/fhswf/in/inf/se/projektthemenvergabe/Main.java index fe144e7..e786f78 100644 --- a/src/de/fhswf/in/inf/se/projektthemenvergabe/Main.java +++ b/src/de/fhswf/in/inf/se/projektthemenvergabe/Main.java @@ -175,15 +175,13 @@ public class Main extends Application { Organisation organisation = orga .get(rs.getString("organisation")); - if (organisation != null) - { - Ansprechpartner ansprechpartner = new Ansprechpartner( - organisation); - ansprechpartner.setVorname(rs.getString("vorname")); - ansprechpartner.setNachname(rs.getString("nachname")); - this.ansprechpartner.add(ansprechpartner); - } + Ansprechpartner ansprechpartner = new Ansprechpartner( + organisation); + ansprechpartner.setVorname(rs.getString("vorname")); + ansprechpartner.setNachname(rs.getString("nachname")); + + this.ansprechpartner.add(ansprechpartner); } organisation.addAll(orga.values()); @@ -223,7 +221,14 @@ public class Main extends Application { ps.setString(1, ans.getVorname()); ps.setString(2, ans.getNachname()); - ps.setString(3, ans.getOrganisation().getName()); + if (ans.getOrganisation() != null) + { + ps.setString(3, ans.getOrganisation().getName()); + } + else + { + ps.setString(3, null); + } ps.execute(); } -- cgit v1.2.3-70-g09d2