From f3a365aa3e1d80d16f99af71b7e56740138ac5ae Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Mon, 24 Apr 2017 14:59:14 +0200 Subject: [PATCH] Fixed type of startDate and duration in TenancyContract Signed-off-by: Jim Martens --- 02/src/de/dis2017/data/TenancyContract.java | 16 ++++++++-------- 02/src/de/dis2017/data/db/ORM.java | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/02/src/de/dis2017/data/TenancyContract.java b/02/src/de/dis2017/data/TenancyContract.java index d05d546..65a7968 100644 --- a/02/src/de/dis2017/data/TenancyContract.java +++ b/02/src/de/dis2017/data/TenancyContract.java @@ -1,27 +1,27 @@ package de.dis2017.data; -import java.util.Date; +import java.sql.Timestamp; public class TenancyContract extends Contract { - private int startDate; - private int duration; - private int additionalCost; + private Timestamp startDate; + private Timestamp duration; + private int additionalCost; private int apartment; - public int getStartDate() { + public Timestamp getStartDate() { return startDate; } - public void setStartDate(int startDate) { + public void setStartDate(Timestamp startDate) { this.startDate = startDate; } - public int getDuration() { + public Timestamp getDuration() { return duration; } - public void setDuration(int duration) { + public void setDuration(Timestamp duration) { this.duration = duration; } diff --git a/02/src/de/dis2017/data/db/ORM.java b/02/src/de/dis2017/data/db/ORM.java index d74c198..491e801 100644 --- a/02/src/de/dis2017/data/db/ORM.java +++ b/02/src/de/dis2017/data/db/ORM.java @@ -220,8 +220,8 @@ public class ORM { ((PurchaseContract) contract).setHouse(rs.getInt("house")); } if (contract instanceof TenancyContract) { - ((TenancyContract) contract).setStartDate(rs.getInt("startDate")); - ((TenancyContract) contract).setDuration(rs.getInt("duration")); + ((TenancyContract) contract).setStartDate(rs.getTimestamp("startDate")); + ((TenancyContract) contract).setDuration(rs.getTimestamp("duration")); ((TenancyContract) contract).setAdditionalCost(rs.getInt("additionalCosts")); ((TenancyContract) contract).setApartment(rs.getInt("apartment")); }