Browse Source

Syncbitch

derp
Groamer 11 years ago
parent
commit
54407c0519
11 changed files with 16 additions and 12 deletions
  1. 1 1
      AvgWindspeed.java
  2. 2 2
      BinnenTemperatuur.java
  3. 1 1
      BuitenTemperatuur.java
  4. 1 1
      Calculator.java
  5. 1 1
      GUIboard.java
  6. 1 1
      IO.java
  7. 1 1
      Main.java
  8. 1 1
      Measurement.java
  9. 1 1
      OutsideHum.java
  10. 5 1
      Weerstation.java
  11. 1 1
      WeerstationConnector.java

+ 1 - 1
AvgWindspeed.java

@@ -1,4 +1,4 @@
-package weerstation;
+ 
 
 import java.util.ArrayList;
 

+ 2 - 2
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();

+ 1 - 1
BuitenTemperatuur.java

@@ -1,4 +1,4 @@
-package weerstation;
+ 
 import java.io.*;
 import java.net.*;
 import java.util.ArrayList;

+ 1 - 1
Calculator.java

@@ -1,4 +1,4 @@
-package weerstation; 
+  
 
 public class Calculator {
 	public Calculator(){

+ 1 - 1
GUIboard.java

@@ -1,4 +1,4 @@
-package weerstation;
+ 
 
 import java.util.ArrayList;
 

+ 1 - 1
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.

+ 1 - 1
Main.java

@@ -1,4 +1,4 @@
-package weerstation;
+ 
 
 public class Main {
 	public static void main(String[] args){

+ 1 - 1
Measurement.java

@@ -1,4 +1,4 @@
-package weerstation;
+ 
 
 import java.math.BigDecimal;
 

+ 1 - 1
OutsideHum.java

@@ -1,4 +1,4 @@
-package weerstation;
+ 
 import java.net.*;
 import java.util.ArrayList;
 /**

+ 5 - 1
Weerstation.java

@@ -1,4 +1,4 @@
-package weerstation;
+ 
 
 
 import java.lang.reflect.InvocationTargetException;
@@ -27,6 +27,10 @@ public class Weerstation {
 		final List<Object> lstScreens = new ArrayList<Object>();
 		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

+ 1 - 1
WeerstationConnector.java

@@ -1,4 +1,4 @@
-package weerstation;
+ 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;