Cleanup

Installer experiments
Still work to do

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="/home/lukas/VInf/Praktikum/VINF_MaerklinControl/controlsfx-8.40.12.jar"/>
+	<classpathentry kind="lib" path="D:/Users/Philipp/gitlab/VInf/Praktikum/VINF_MaerklinControl/controlsfx-8.40.12.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Praktikum/VINF_MaerklinControl/.gitignore

+/build/

Praktikum/VINF_MaerklinControl/bin/.gitignore

 /gui/
-/server/

Praktikum/VINF_MaerklinControl/build/build.xml

@@ -97,15 +97,14 @@
 		<fx:application id="fxApplication"
 			name="Märklin Control"
 			mainClass="gui.MainApp"
-			toolkit="fx"
-			version="0.9"
+			version="1.0"
 		/>
 	
 		<mkdir dir="build/classes/META-INF" />
 	
 	
 	
-		<fx:jar destfile="dist/VINF_MaerklinControl.jar">
+		<fx:jar destfile="dist/Märklin Control.jar">
 			<fx:application refid="fxApplication"/>
 			<fileset dir="build/classes">
 			</fileset>
@@ -114,7 +113,7 @@
 			<manifest>
 				<attribute name="Implementation-Vendor" value="lf.ps"/>
 				<attribute name="Implementation-Title" value="Märklin Control"/>
-				<attribute name="Implementation-Version" value="0.9"/>
+				<attribute name="Implementation-Version" value="1.0"/>
 				<attribute name="JavaFX-Feature-Proxy" value="None"/>
 			</manifest>
 		</fx:jar>
@@ -128,11 +127,11 @@
 			includeDT="false"
 			offlineAllowed="true"
 			outdir="${basedir}/deploy"
-			outfile="VINF_MaerklinControl" nativeBundles="exe"
+			outfile="Märklin Control" nativeBundles="exe"
 			updatemode="background" >
 	
 			<fx:platform basedir="${java.home}"/>
-			<fx:info title="VINF_MaerklinControl" vendor="lf.ps"/>
+			<fx:info title="Märklin Control" vendor="lf.ps"/>
 	
 			<fx:application refId="fxApplication"/>
 			<fx:resources refid="appRes"/>

Praktikum/VINF_MaerklinControl/build/build/src/gui/MainApp.java

@@ -7,8 +7,6 @@ import java.net.Socket;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import javax.xml.bind.DatatypeConverter;
-
 import gui.model.Engine;
 import gui.model.Switch;
 import gui.model.Settings;
@@ -306,7 +304,7 @@ public class MainApp extends Application {
 				settingsController.updateSettingsStatus();
 				
 			} catch (Exception e) {
-				setStatus("Error at: establishConnection (shutting down connection");
+				setStatus("Error at: establishConnection (shutting down connection)");
 				e.printStackTrace();
 			}
 		}
@@ -323,9 +321,15 @@ public class MainApp extends Application {
 			CONTROLLER_INSTANCE = controller;
 		}
 		
+		public void updateGUI () {
+			engineController.updateEngineStatus();
+			for (Switch sw : switches){
+				sw.getController().get().updateSwitchStatus();
+			}
+		}
+		
 		@Override
 		public void run() {
-			Thread.yield();
 			if (!connectionEstablished) {
 				try (Socket socket = new Socket(configuration.getSocketAddress().get().getHostName(), configuration.getSocketAddress().get().getPort())) {
 					client = socket;
@@ -346,22 +350,44 @@ public class MainApp extends Application {
 						
 					});
 					while (connectionEstablished) {
-						Thread.sleep(100);
+						Platform.runLater(new Runnable() {
+
+							@Override
+							public void run() {
+								updateGUI();					
+							}
+						
+						});
+						Thread.sleep(50);
 					}
 				}
 				catch (Exception e) {
+					connectionEstablished = false;
+					running = false;
 					Platform.runLater(new Runnable() {
 
 						@Override
 						public void run() {
-							CONTROLLER_INSTANCE.setStatus("Error at: establishConnection (establishing connection");					
+							CONTROLLER_INSTANCE.setStatus("Error at: establishConnection (establishing connection)");
+							CONTROLLER_INSTANCE.settingsController.updateSettingsStatus();
 						}
 						
 					});
 					e.printStackTrace();
 				}
 				finally {
-					CONTROLLER_INSTANCE.UTILITY_THREAD_EXECUTOR.shutdownNow();
+					try {
+						byte[] datagram = {Properties.SEPERATOR, (byte) 0x00, (byte) 0x00, (byte) Properties.SESSION_ABORT, (byte) 0x00, (byte) 0x00};
+						out.write(datagram);
+						client.close();
+						connectionEstablished = false;
+						running = false;
+						settingsController.updateSettingsStatus();
+						
+					} catch (Exception e) {
+						setStatus("Error at: establishConnection (shutting down connection)");
+						e.printStackTrace();
+					}
 				}
 			}
 		}
@@ -378,7 +404,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;
@@ -409,13 +435,6 @@ public class MainApp extends Application {
 			}
 		}
 		
-		public void updateGUI () {
-			engineController.updateEngineStatus();
-			for (Switch sw : switches){
-				sw.getController().get().updateSwitchStatus();
-			}
-		}
-		
 		@Override
 		public void run() {
 			int stopCounter, dataCounter, counter;
@@ -445,7 +464,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) {
@@ -457,14 +476,6 @@ public class MainApp extends Application {
 					while (INPUT_STREAM.available() != 0) {
 						INPUT_STREAM.read();
 					}
-					Platform.runLater(new Runnable() {
-
-						@Override
-						public void run() {
-							updateGUI();					
-						}
-					
-					});
 					Thread.sleep(50);
 				}
 			}