diff --git a/Calculator.java b/Calculator.java index 8cdb1f9..fba52bf 100644 --- a/Calculator.java +++ b/Calculator.java @@ -199,7 +199,7 @@ public class Calculator { public static Periode timeStampToPeriode(Timestamp timeStamp1, Timestamp timeStamp2) { - Periode periode = new Periode(); + Periode periode = new Periode("-"); int year,month,day; String[] ts1 = timeStamp1.toString().split(" "); diff --git a/Periode.java b/Periode.java index 180d0cf..c12f83d 100644 --- a/Periode.java +++ b/Periode.java @@ -6,26 +6,30 @@ public class Periode { private GregorianCalendar beginPeriode; private GregorianCalendar eindePeriode; + private String name; - public Periode() + public Periode(String name) { beginPeriode = new GregorianCalendar(); eindePeriode = new GregorianCalendar(); + this.name = name; } - public Periode(int jaar, int maand, int dag, int eindjaar, int eindmaand, int einddag) + public Periode(int jaar, int maand, int dag, int eindjaar, int eindmaand, int einddag, String name) { beginPeriode = new GregorianCalendar(); eindePeriode = new GregorianCalendar(); setBeginPeriode(jaar, maand, dag); setEindePeriode(eindjaar, eindmaand, einddag); + this.name = name; } - public Periode(Calendar cal1, Calendar cal2){ + public Periode(Calendar cal1, Calendar cal2, String name){ beginPeriode = new GregorianCalendar(); eindePeriode = new GregorianCalendar(); setBeginPeriode(cal2.get(Calendar.YEAR), cal2.get(Calendar.MONTH), cal2.get(Calendar.DATE)); setEindePeriode(cal1.get(Calendar.YEAR), cal1.get(Calendar.MONTH), cal1.get(Calendar.DATE)); + this.name = name; } public GregorianCalendar getBeginPeriode() @@ -48,6 +52,16 @@ public class Periode eindePeriode.set(jaar, maand, dag); } + public void setName(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + public String toString() { String returnString = beginPeriode.get(Calendar.DATE) + "-" + (beginPeriode.get(Calendar.MONTH)+1) + "-" + beginPeriode.get(Calendar.YEAR);