From b607b7643eb5ef48bff8fdf97723e9974665aee4 Mon Sep 17 00:00:00 2001 From: Nils Dittberner Date: Thu, 19 Nov 2015 21:37:37 +0100 Subject: [PATCH] Klasse ConnectionFactory umbenannt. --- src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java | 6 +----- .../java/de/uniluebeck/mi/projmi6/model/StationsHistorie.java | 9 --------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java b/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java index 789570a..097524a 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java @@ -388,11 +388,7 @@ public class DBHandler { if (rs.getTimestamp("entlassungsdatum") != null) { hist.setEntlassungsDatum(rs.getTimestamp("entlassungsdatum").toLocalDateTime()); } - - // TODO: Muss das jeweils das Objekt sein? - // hist.setFall(null); - // hist.setStation(null); - + hist.setStation(getStation(rs)); hist.setStationKey(rs.getString("station")); return hist; diff --git a/src/main/java/de/uniluebeck/mi/projmi6/model/StationsHistorie.java b/src/main/java/de/uniluebeck/mi/projmi6/model/StationsHistorie.java index 4524069..c9a2406 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/model/StationsHistorie.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/model/StationsHistorie.java @@ -12,7 +12,6 @@ import java.time.LocalDateTime; public class StationsHistorie extends Version { private SimpleObjectProperty aufnahmeDatum = new SimpleObjectProperty<>(this, "aufnahmeDatum"); private SimpleObjectProperty entlassungsDatum = new SimpleObjectProperty<>(this, "entlassungsDatum"); - private Fall fall; private int fallID; // platte Objektstruktur! private Station station; private SimpleStringProperty stationKey = new SimpleStringProperty(this, "stationskey"); // platte Objektstruktur! @@ -42,14 +41,6 @@ public class StationsHistorie extends Version { return entlassungsDatum; } - public Fall getFall() { - return fall; - } - - public void setFall(Fall fall) { - this.fall = fall; - } - public Station getStation() { return station; }