minor bug fixes

Praktikum/VINF_MaerklinControl/bin/.gitignore

+/gui/
+/server/

Praktikum/VINF_MaerklinControl/src/gui/MainApp.java

@@ -102,7 +102,7 @@ public class MainApp extends Application {
     @Override
     public void start(Stage primaryStage) {
         this.primaryStage = primaryStage;
-        this.primaryStage.setTitle("Mrklin Control Client");
+        this.primaryStage.setTitle("M�rklin Control Client");
         this.primaryStage.getIcons().add(new Image("file:res/BO.png"));
         initRootLayout();
         initTabs();
@@ -333,12 +333,12 @@ public class MainApp extends Application {
 		@Override
 		public void run() {
 			if (!connectionEstablished) {
-				try (Socket socket = new Socket(configuration.getSocketAddress().get().getHostName(), configuration.getSocketAddress().get().getPort()); InputStream inStream = socket.getInputStream(); OutputStream outStream = socket.getOutputStream();) {
+				try (Socket socket = new Socket(configuration.getSocketAddress().get().getHostName(), configuration.getSocketAddress().get().getPort())) {
 					client = socket;
 					client.setKeepAlive(true);
 					client.setReuseAddress(true);
-					in = inStream;
-					out = outStream;
+					in = client.getInputStream();
+					out = client.getOutputStream();
 					connectionEstablished = true;
 					running = true;
 					UTILITY_THREAD_EXECUTOR.submit((new UpdateFunctionality(CONTROLLER_INSTANCE, in)));
@@ -392,7 +392,7 @@ public class MainApp extends Application {
 		}
 
 		public void parseDatagram (byte[] datagram) {
-			System.out.println("2:     "+DatatypeConverter.printHexBinary(datagram));
+			//System.out.println("2:     "+DatatypeConverter.printHexBinary(datagram));
 			if (datagram.length < 5) {
 				setStatus("Error while updating!");
 				return;
@@ -452,7 +452,7 @@ public class MainApp extends Application {
 								for (int i = 0; i < Properties.IN_BUFFER_SIZE; i++) {
 									datagram[i] = buffer[counter-Properties.IN_BUFFER_SIZE+i+1];
 								}
-								System.out.println("1:     "+DatatypeConverter.printHexBinary(datagram));
+								//System.out.println("1:     "+DatatypeConverter.printHexBinary(datagram));
 								parseDatagram(datagram);
 							}
 							else if (dataCounter > 5 && startByte) {

Praktikum/VINF_MaerklinControl/src/server/MaerklinServer.java

@@ -151,9 +151,9 @@ public class MaerklinServer{
 	// Starts the thread to broadcast the current status
 	public void statusUpdate(){
 		for (Socket clientSocket : clients) {
-			try (OutputStream outStream = clientSocket.getOutputStream()){
+			try {
 				//System.out.println("Updating client: "+clientSocket.getRemoteSocketAddress());
-				UTILITY_THREAD_EXECUTOR.submit(new UpdateThread(outStream));
+				UTILITY_THREAD_EXECUTOR.submit(new UpdateThread(clientSocket.getOutputStream()));
 			} 
 			catch (IOException e) {
 				System.out.println("Failed to receive output-stream of one of the clients!");

Praktikum/VINF_MaerklinControl/src/server/UDPListener.java

@@ -110,6 +110,7 @@ public class UDPListener implements Runnable{
 						for (Engine train : Engine.engines){
 							if (train.getEngineID() == getAddress()){
 								train.engineDirection = getEngineDirection();
+								train.engineSpeed = 0;
 								System.out.println("Direction of Engine "+train.getEngineID()+" changed to "+train.getEngineDirection());
 								break;
 							}