From 6948b310d449b3bc0135fc89a36fa1519894325d Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Wed, 22 Oct 2014 11:28:48 +0200 Subject: [PATCH] Many things changed --- AvgWindSpeed.java | 2 +- Barometer.java | 2 +- CloudHeight.java | 2 +- DewPoint.java | 2 +- Grootheid.java | 2 +- HeatIndex.java | 2 +- InsideHum.java | 2 +- InsideTemp.java | 2 +- LangsteRegenPeriode.java | 2 +- LangsteZomerPeriode.java | 4 ++-- MaximaleRegenPeriode.java | 2 +- OutsideHum.java | 2 +- OutsideTemp.java | 2 +- RainRate.java | 2 +- Sun.java | 2 +- UVLevel.java | 2 +- Weerstation.java | 15 ++++++++------- WindChill.java | 2 +- Zonsterkte.java | 2 +- 19 files changed, 27 insertions(+), 26 deletions(-) diff --git a/AvgWindSpeed.java b/AvgWindSpeed.java index 27d99ef..4f8b899 100644 --- a/AvgWindSpeed.java +++ b/AvgWindSpeed.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; public class AvgWindSpeed extends Grootheid{ diff --git a/Barometer.java b/Barometer.java index abd0989..20baf6b 100644 --- a/Barometer.java +++ b/Barometer.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; public class Barometer extends Grootheid{ diff --git a/CloudHeight.java b/CloudHeight.java index 34a4a11..f383dcb 100644 --- a/CloudHeight.java +++ b/CloudHeight.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; public class CloudHeight extends Grootheid{ diff --git a/DewPoint.java b/DewPoint.java index 98392cb..597db90 100644 --- a/DewPoint.java +++ b/DewPoint.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; public class DewPoint extends Grootheid diff --git a/Grootheid.java b/Grootheid.java index db9ae0c..8d8f4c9 100644 --- a/Grootheid.java +++ b/Grootheid.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; public class Grootheid diff --git a/HeatIndex.java b/HeatIndex.java index 0041d11..fc0ff52 100644 --- a/HeatIndex.java +++ b/HeatIndex.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; public class HeatIndex extends Grootheid{ diff --git a/InsideHum.java b/InsideHum.java index c8d5515..e1c1759 100644 --- a/InsideHum.java +++ b/InsideHum.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; public class InsideHum extends Grootheid{ diff --git a/InsideTemp.java b/InsideTemp.java index 48e24ef..6062db1 100644 --- a/InsideTemp.java +++ b/InsideTemp.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; public class InsideTemp extends Grootheid{ diff --git a/LangsteRegenPeriode.java b/LangsteRegenPeriode.java index f0715d1..51705a8 100644 --- a/LangsteRegenPeriode.java +++ b/LangsteRegenPeriode.java @@ -7,7 +7,7 @@ public class LangsteRegenPeriode extends Grootheid{ //constructor public LangsteRegenPeriode(Measurement measurement1, ArrayList measurement2){ list = new ArrayList(); - regenPeriode = new Periode(); + regenPeriode = new Periode("Regen"); updateRecent(measurement1); update24Hour(measurement2); } diff --git a/LangsteZomerPeriode.java b/LangsteZomerPeriode.java index 84f6bb3..8a3c35c 100644 --- a/LangsteZomerPeriode.java +++ b/LangsteZomerPeriode.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; public class LangsteZomerPeriode extends Grootheid{ @@ -8,7 +8,7 @@ public class LangsteZomerPeriode extends Grootheid{ //constructor public LangsteZomerPeriode(Measurement measurement1, ArrayList measurement2){ list = new ArrayList(); - zomerPeriode = new Periode(); + zomerPeriode = new Periode("Zomer"); updateRecent(measurement1); updatePeriod(measurement2); } diff --git a/MaximaleRegenPeriode.java b/MaximaleRegenPeriode.java index 1351ff2..e6b2ea8 100644 --- a/MaximaleRegenPeriode.java +++ b/MaximaleRegenPeriode.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; public class MaximaleRegenPeriode extends Grootheid{ diff --git a/OutsideHum.java b/OutsideHum.java index d93fe90..b477781 100644 --- a/OutsideHum.java +++ b/OutsideHum.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; public class OutsideHum extends Grootheid{ diff --git a/OutsideTemp.java b/OutsideTemp.java index 8069597..eb385e4 100644 --- a/OutsideTemp.java +++ b/OutsideTemp.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; public class OutsideTemp extends Grootheid{ diff --git a/RainRate.java b/RainRate.java index d597bf7..bb350a4 100644 --- a/RainRate.java +++ b/RainRate.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; public class RainRate extends Grootheid{ diff --git a/Sun.java b/Sun.java index 7d0cf7c..b4c2fc9 100644 --- a/Sun.java +++ b/Sun.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; diff --git a/UVLevel.java b/UVLevel.java index f63f31f..f4ffb3b 100644 --- a/UVLevel.java +++ b/UVLevel.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; public class UVLevel extends Grootheid{ diff --git a/Weerstation.java b/Weerstation.java index 4797ef3..5efd066 100644 --- a/Weerstation.java +++ b/Weerstation.java @@ -37,31 +37,31 @@ public class Weerstation { startStartupAnimatie(); calPeriod.add(Calendar.DATE, -1); - periods.add(new Periode(now, calPeriod)); + periods.add(new Periode(now, calPeriod, "Dag")); calPeriod = Calendar.getInstance(); calPeriod.add(Calendar.DATE, -7); - periods.add(new Periode(now, calPeriod)); + periods.add(new Periode(now, calPeriod, "Week")); calPeriod = Calendar.getInstance(); calPeriod.add(Calendar.MONTH, -1); - periods.add(new Periode(now, calPeriod)); + periods.add(new Periode(now, calPeriod, "Maand")); calPeriod = Calendar.getInstance(); calPeriod.add(Calendar.MONTH, -3); - periods.add(new Periode(now, calPeriod)); + periods.add(new Periode(now, calPeriod, "Maand 3")); calPeriod = Calendar.getInstance(); calPeriod.add(Calendar.MONTH, -6); - periods.add(new Periode(now, calPeriod)); + periods.add(new Periode(now, calPeriod, "Maand 6")); calPeriod = Calendar.getInstance(); calPeriod.add(Calendar.YEAR, -1); - periods.add(new Periode(now, calPeriod)); + periods.add(new Periode(now, calPeriod, "Jaar")); calPeriod = Calendar.getInstance(); calPeriod.add(Calendar.YEAR, -2); - periods.add(new Periode(now, calPeriod)); + periods.add(new Periode(now, calPeriod, "Jaar 2")); calPeriod = Calendar.getInstance(); System.out.println("Day: " + periods.get(0)); @@ -104,6 +104,7 @@ public class Weerstation { lstScreens.add(new DewPoint(meting1, meting2)); //Dauwpunt lstScreens.add(new Sun(meting1)); //Sunrise en Sunset lstScreens.add(new LangsteZomerPeriode(meting1, meting2)); //Langste Zomerse Periode + lstScreens.add(new LangsteRegenPeriode(meting1, meting2)); //Langste Regen Periode lstScreens.add(new MaximaleRegenPeriode(meting1, meting2)); //Totale regenval in een periode lstScreens.add(new GraadDagen(meting1, meting2)); //Aantal graaddagen in een periode diff --git a/WindChill.java b/WindChill.java index 98b68aa..166e5af 100644 --- a/WindChill.java +++ b/WindChill.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; public class WindChill extends Grootheid{ diff --git a/Zonsterkte.java b/Zonsterkte.java index fac54ff..e41ee6b 100644 --- a/Zonsterkte.java +++ b/Zonsterkte.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; public class Zonsterkte extends Grootheid{