final release v2

Praktikum/VINF_MaerklinControl/.classpath

@@ -3,6 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
-	<classpathentry kind="lib" path="D:/Users/Philipp/gitlab/VInf/Praktikum/VINF_MaerklinControl/controlsfx-8.40.12.jar"/>
+	<classpathentry kind="lib" path="/home/lukas/VInf/Praktikum/VINF_MaerklinControl/controlsfx-8.40.12.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Praktikum/VINF_MaerklinControl/bin/.gitignore

 /gui/
+/server/

Praktikum/VINF_MaerklinControl/src/gui/MainApp.java

@@ -87,7 +87,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();
@@ -394,6 +394,7 @@ public class MainApp extends Application {
 					e.printStackTrace();
 				}
 				finally {
+					if (connectionEstablished) {
 						try {
 							// Properly shuts down the connection to the server in case of an unexpected termination of the client-instance
 							byte[] datagram = {Properties.SEPERATOR, (byte) 0x00, (byte) 0x00, (byte) Properties.SESSION_ABORT, (byte) 0x00, (byte) 0x00};
@@ -401,8 +402,15 @@ public class MainApp extends Application {
 							client.close();
 							connectionEstablished = false;
 							running = false;
-						settingsController.updateSettingsStatus();
+							Platform.runLater(new Runnable() {
 	
+								// Sets the connection-esttablishing-buttons text to "Verbindung herstellen"
+								@Override
+								public void run() {
+									CONTROLLER_INSTANCE.settingsController.updateSettingsStatus();
+								}
+								
+							});
 						} catch (Exception e) {
 							setStatus("Error at: establishConnection (shutting down connection)");
 							e.printStackTrace();
@@ -411,6 +419,7 @@ public class MainApp extends Application {
 				}
 			}
 		}
+	}
 
 	/*
 	 * Diese Runnable-Klasse lauscht auf dem Update-Port des Servers auf Status-Updates, 

Praktikum/VINF_MaerklinControl/src/gui/view/EngineController.java

@@ -66,7 +66,6 @@ public class EngineController {
     
     public void handleEngineDirection(){
     	eng.setDirection(engineFwdButton.isSelected());
-    	eng.setSpeed(0);
     	mainApp.setEngineDirection(eng);
     	updateEngineStatus();
     }
@@ -81,15 +80,15 @@ public class EngineController {
     	engineFwdButton.setSelected(eng.getDirection().get());
     	engineRevButton.setSelected(!eng.getDirection().get());
     	if (eng.getDirection().get())
-    		status.append("vorwrts");
+    		status.append("vorw�rts");
     	else
-    		status.append("rckwrts");
+    		status.append("r�ckw�rts");
     	mainApp.setStatus(status.toString());
     }
     
     public void setSelectedEngine(Engine eng){
     	this.eng = eng;
-    	mainApp.setStatus(eng.toString() + " ausgewhlt");
+    	mainApp.setStatus(eng.toString() + " ausgew�hlt");
     	updateEngineStatus();
     }
     

Praktikum/VINF_MaerklinControl/src/server/Engine.java

@@ -67,7 +67,6 @@ public class Engine {
 			throw e;
 		}
 		udpProtocol.changeEngineDirection(engineID, engineDirection);
-		listener.listen();
 	}
 	
 	public void setEngineSpeed(int newEngineSpeed) throws Exception {