diff --git a/AvgWindspeed.java b/AvgWindspeed.java index 87b2ae3..c9a6890 100644 --- a/AvgWindspeed.java +++ b/AvgWindspeed.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; diff --git a/BinnenTemperatuur.java b/BinnenTemperatuur.java index ca83448..7a993d3 100644 --- a/BinnenTemperatuur.java +++ b/BinnenTemperatuur.java @@ -1,9 +1,9 @@ -package weerstation; + import java.io.*; import java.net.*; import java.util.ArrayList; -public class BuitenTemperatuur +public class BinnenTemperatuur { private Measurement laatsteMeting; Calculator calculator = new Calculator(); diff --git a/BuitenTemperatuur.java b/BuitenTemperatuur.java index 290f563..247e757 100644 --- a/BuitenTemperatuur.java +++ b/BuitenTemperatuur.java @@ -1,4 +1,4 @@ -package weerstation; + import java.io.*; import java.net.*; import java.util.ArrayList; diff --git a/Calculator.java b/Calculator.java index c8cad9d..6553dfd 100755 --- a/Calculator.java +++ b/Calculator.java @@ -1,4 +1,4 @@ -package weerstation; + public class Calculator { public Calculator(){ diff --git a/GUIboard.java b/GUIboard.java index 40395c0..4de8fbf 100644 --- a/GUIboard.java +++ b/GUIboard.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; diff --git a/IO.java b/IO.java index b0c9ed0..c4a52ac 100755 --- a/IO.java +++ b/IO.java @@ -1,4 +1,4 @@ -package weerstation; + // // Port IO emulator class. All read/writes are send over TCP/IP to the host // using a dedicated protocol on port 81. diff --git a/Main.java b/Main.java index 343278f..2e74ab0 100644 --- a/Main.java +++ b/Main.java @@ -1,4 +1,4 @@ -package weerstation; + public class Main { public static void main(String[] args){ diff --git a/Measurement.java b/Measurement.java index ab48980..375809d 100755 --- a/Measurement.java +++ b/Measurement.java @@ -1,4 +1,4 @@ -package weerstation; + import java.math.BigDecimal; diff --git a/OutsideHum.java b/OutsideHum.java index 02bc250..b4c85be 100644 --- a/OutsideHum.java +++ b/OutsideHum.java @@ -1,4 +1,4 @@ -package weerstation; + import java.net.*; import java.util.ArrayList; /** diff --git a/Weerstation.java b/Weerstation.java index 64860bb..fe2ff7a 100644 --- a/Weerstation.java +++ b/Weerstation.java @@ -1,4 +1,4 @@ -package weerstation; + import java.lang.reflect.InvocationTargetException; @@ -27,6 +27,10 @@ public class Weerstation { final List lstScreens = new ArrayList(); lstScreens.add(new AvgWindspeed(meting1, meting2)); lstScreens.add(new RainRate(meting1, meting2)); + lstScreens.add(new BinnenTemperatuur(meting1, meting2)); + lstScreens.add(new BuitenTemperatuur(meting1, meting2)); + lstScreens.add(new InsideHum(meting1, meting2)); + lstScreens.add(new OutsideHum(meting1, meting2)); //Screen switcher diff --git a/WeerstationConnector.java b/WeerstationConnector.java index e0b2e78..22e5242 100644 --- a/WeerstationConnector.java +++ b/WeerstationConnector.java @@ -1,4 +1,4 @@ -package weerstation; + import java.sql.Connection; import java.sql.DriverManager; import java.sql.ResultSet;