From f5cd4f97383ea0cf4448be27c448f5ccc30deb59 Mon Sep 17 00:00:00 2001
From: lukasfriedrichsen <lukas.friedrichsen@hs-bochum.de>
Date: Mon, 16 Jan 2017 14:09:24 +0100
Subject: [PATCH] minor bug fixes

---
 Praktikum/VINF_MaerklinControl/bin/.gitignore |   2 ++
 .../bin/gui/MainApp$EstablishConnection.class | Bin 4176 -> 3888 bytes
 .../bin/gui/MainApp$UpdateFunctionality.class | Bin 4313 -> 3886 bytes
 .../bin/server/MaerklinServer.class           | Bin 4392 -> 4104 bytes
 .../bin/server/UDPListener.class              | Bin 4433 -> 4443 bytes
 .../VINF_MaerklinControl/src/gui/MainApp.java |  12 ++++++------
 .../src/server/MaerklinServer.java            |   4 ++--
 .../src/server/UDPListener.java               |   1 +
 8 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 Praktikum/VINF_MaerklinControl/bin/.gitignore

diff --git a/Praktikum/VINF_MaerklinControl/bin/.gitignore b/Praktikum/VINF_MaerklinControl/bin/.gitignore
new file mode 100644
index 0000000..d0380dd
--- /dev/null
+++ b/Praktikum/VINF_MaerklinControl/bin/.gitignore
@@ -0,0 +1,2 @@
+/gui/
+/server/
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$EstablishConnection.class b/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$EstablishConnection.class
index abf9f4e0db7a71c616c8c917f97ef954f63fca27..65bf01205c2e4a0b643560c0e9b5f6a9a535ea37 100644
GIT binary patch
delta 651
zcmcbhut84X)W2Q(7#J8#81Aq$FflU7PcGz=->9$5$|22=&%;o_P&oM*t1(+K4?_t<
z>E!>cMo#5C3>6HOj0`-*sU_a2sRfQXnPsVr3@jQ^nqgcFVGPwg3^gEm{^Hb<pw!ah
zRL7K*qSWGIkX#)PLp?*o<S15M4rzua9)@OymdV9zrW|1mZ9EL^3>}mESq(R@VpC(5
z2xB<J!*G~Ekdc8kIVZn3m5bph!*O<oW0MuQB$!VyoSbaUrOnLFaC&kcmm2pehIL#F
z=NK-qGn}71pG$)A;^ZA%#+!|~&oGLKGO#hQFfcHhYi(iR-NE3yjUjLrqt0YeUL#wO
zi0%%CJP^Hup@?N0Lm7fu1!98m4u+y_47EEL8bKTo1`D)KZs5(((mloysJo5f;Bp2p
zAKhaN>>#%GeqZh53>-Q>%NcmJb(S)4XzOfaI5IhhPg>(tq}FzZGdmbIXm4XUyODvJ
z!Jgp>!+Qn>20?~j48Ir{7<d^47zG&4P2SHZUT@DB$l%Tx#1O<7%n-{M!jQ)p%23Z3
z#?ZwW&M=iRf?)?^B*S6GB!***$qW}6vl*^4CNVr=%w-f{%wrT}%x9EgEMQb;EMzod
ztYS1{tYr{oU|>*SU<L&RgBXK20|SFS!%l`v43`<083h?s8Llu~Wng6RW?*2@V&MG8
zpmU6!;V2k|352sV9R0<>;mFQ#l#}y610w??JA^o=D!{=Y$8c@(Hhv?<Ym;B{8<<~b
qU|?WkxWRA}Y!E90BZD-<Ed~aL)eI1@4MH)Tg3@ysq#15AFaQ9!PoPNv

delta 930
zcmdlWcR_*c)W2Q(7#J8#7@lq9@?hl%W60-WC}1d@%+99E5ynu=!%)IdI=Pa~kgc4D
zp@N}uaulmETQv_u4MXkZ$*e|f^*js>42_ddvq~v7^Dwk9G%_;q7pIm4rIr?_I;Nx)
zr4|=+F-SAC@i4SAbWFBkGu^y`O@o>95W^96hQo{uB9kYwiTLp_9Ayw>WMECs$uCaj
zVmJ<xJi*8yoRwIXsGpgy@0nLnS`u7Rl$w~!#c+z@3_HVVm~2jBUb=orMp1rwVp2{j
z55rl8bCa35v^lsK!a$~6oNUOYrgDK{9T&qDhHLB$S5fr2RwSnulw{`T@i1JUT+L-{
zz>%2;v4)XB)CY_0){G3C`7oz2GKfu{z$UhN4c9qFu?-At3~USxjJ;Z07<hLu_-<ne
zoW<BQc><4-rS3L{JS!I6Z45<LtRPw49Smh4dIv)l%Ql8O1hWamlw{e#&<bX-PX5o6
zQ7_4Qj6p(@bsNLM<qQHoARY&pr@dd2<rssuB+E92W6K$oeYKA>aOn6fXW-S=S<1kn
zt+S2cBuD`VSb_F_-D3<Xy4x7eFK39wrd0PB13O4sdq0{iE7+vT6M3cUFGOl>XSlS3
zVT1NIhRYinSQ)$-9x%LRU|?`%_{GT1z`$V7sLp7_z`!8L7{D07z`(%En8ujKaD{=H
zL4<*UA&x<ufq~JVftN7=q=LblF_0mcF^D0KF_<BfF@&LrF_fX2F^r*&F`Qu{V+6w%
z#z=<!j7bcK7?T;!GG;T>UuH~Vc)*y;n8ujLn9i8bSj1SsSj$+**uhxE*uz-MAPP>#
zte{9>5Cd7pV9&_UaD(9{12cmw!vls}47V9r7`z$QGTdRf%fQN*&Y;S0kKsN8BZD^s
z1A{k%@PCFw3~cNSjO+}jz$lEJ;W#_PAqED4NOp!(hQAoN7=73oPH}SnV&G)-g0k2h
z!HoY5j3A9*;)<#O2ZJ2LgUQqQj2ItGKFMcb{*Zxzfr;S}!(#>p1}z3w21W*Hh9?XR
X467L+U>k&DxB#W+Fi0~zWncgR^#|+e

diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$UpdateFunctionality.class b/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$UpdateFunctionality.class
index 9ae81e7efe023ff6ee577cdadb8e82860609ef83..dd619b744dbc378707abbe824475de71efe9180b 100644
GIT binary patch
delta 1752
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

delta 2221
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

diff --git a/Praktikum/VINF_MaerklinControl/bin/server/MaerklinServer.class b/Praktikum/VINF_MaerklinControl/bin/server/MaerklinServer.class
index a30f632a905c4237764ac5b3635bcbf7cf9d406b..afe7a4d2062fca83c9266f25ce3c80bae44dadef 100644
GIT binary patch
delta 337
zcmZ3X)S<w2>ff$?3=9k=4A(bu$#W>PGaO=M5H3zFDoZWW4=qSZEJ+Q?C`wIC;bPd&
zaD<29D8sSI#vHoLTnq;%*KjB^b1<BqEW>Fld6tLa9K(4=2KJ1^V!zai5=I7Q4b3Qa
zhKrMnIITBd;{3u|&v2E2g@J{Efx$s*3xnl0hONHK8T52^GVEkzIKZ&qM{5g1)NY1@
zk=olB4sT~TzLQ}s6GQlN1|Gjn3>reGwlNs!>|{8@$S~{w`Hc*W45AEL47v;#7?>HR
zFfcI4F|ac*FwA5SWthXD#W0samth`*9>aVFGlrQA_6&;{rZO-vBq=a3gDhv5#xR|M
zfkBi(k>L`<Wd=qDJq8Yj84On#m>Fg<FfbT0F#l)ZW?*J#U}Rut*u}u`pFt7KV`tb8
b;xn={T=>tx0TzNNU|?jp%D}+D#BdD&WzJFW

delta 607
zcmeBBSfRvq>ff$?3=9k=3{N(4$#ZaVG3;kJ#KUly;mBkk4qaw;hGUa;I3yU4POjll
zuIFMn&2W~T;S3{#NLFH5qJCz+zJF;+L1{^FNl|KIE)T;w1{FpI*5sW0;#4k%3k;Xo
z87?w12!qw;B<7{-hh!AxmnSCWr1CIaX1K!0z?+zo5?oqPP?TC+oSMSOAfe%dMX|MJ
z7ze{OMuy2tIIJaa@G#tDxW&l8o{?DWms(N6$iS?j8O6?UXYvmYYbDNnm}3|j#2{v&
zIdZcB=Xch6#xMpJ1~vu;hAOQs43^s%w)!q-$k5rzu#=JD0K<MCMn6U?7VT{e2d!AO
zwlGBPW;hxt$-154_)dnkObp?Ytj8FvC0VyIoLbIc><8j;fO)$6typxAGjK|>_$_DP
z*Og>h%D|~B$+C^%yzYL#O$-`BSGO@3=<H;;&REYd>;Ke^49pA)48{x&3=9lX489D$
z3=9mS4CxH%47VAW8Ky8WFsLzbGB7aAWDsST#URBni$Q^54udhnT!wUpc?=m0^BD>l
zW-?SVEMl0-z`&rzzyk6P!!(BJU~{4w?lRnCU}R8W&}O*L@PL7pA%lT~VFtrP24;p?
zDGUq@VGJDq8Mqmk*%=ra*co;)F#KmQVPIotU}R_5&(5%mo#6r)odyY9_{G5G$j)$q
hoBKZlBUlSW5lHU#e+CY)5X2M)MutZW3=B*Rj{&dkogx4L

diff --git a/Praktikum/VINF_MaerklinControl/bin/server/UDPListener.class b/Praktikum/VINF_MaerklinControl/bin/server/UDPListener.class
index 739f64cfde4ac5c302dcba68ba9caab5cf5df178..f22ee468a140cc7e74b01e0951de358494f54002 100644
GIT binary patch
delta 292
zcmcbpbX#e|Endzt1{MZ(1_s8plXW>wCrj{E^W<z|=-S3G!HR7;L&)U$eBuH&lB`<W
z7`AL>*e1!!yp>_`<O6(~;#`t!I~g`IGR*qFV)?(nTH6>p1jH8n`!b0?ly4qfYTfdG
z6DQ|#YAZ0dF}5)<Ft9LAWSq#rz`($`oN+mWH3Kt)7y|=CAA|Dbb^Jc{438O#7`YgV
z8F?A<7{wXN7^N7>8I>6-7_As88QmDF82uTl8Os=I7%Len7@Ha58QU3}7?(3NGp=B0
zVO+z|#vsnXz~BM#4TA)OBm)BjKVt)fJ%a-SGlLpqEQ2G169WrF41+zxX@)ZltPCd@
fTp=t*D+YT8_OlG<7+4usOs)~gW(=78LLd_Wzp+Wa

delta 266
zcmcbubWv%;EndzX1{MZ(1_s9ElXW>wCrj{EPgdvCWZANnVcX<me463{l59H}HZn5I
z`oC`Ze`c+13>^Yu3;z9@%*G$ew**P<-}K43oZ1SE4U7#83=Axc-HhD~3=9m63mF$O
zSTis)h%qoQbTKGR-oo!w&&a}1#K_K&$0*29$|%B6#wg2B&S=6=!RWwH$>_;Y#aO^l
z%~;G(&REM3&)CS&$heT9iE$A_GvhLbRt9kf1_lp^iy0&sBpDbO_!+Ah>=_&wm>JX<
z!x<bIoETUbVi@chPBWZgU}ZP~V=<aA*fX4EILE-u%D8B9n?UyDeFDalRRqle^M^mz

diff --git a/Praktikum/VINF_MaerklinControl/src/gui/MainApp.java b/Praktikum/VINF_MaerklinControl/src/gui/MainApp.java
index e90aec9..f66ae23 100644
--- a/Praktikum/VINF_MaerklinControl/src/gui/MainApp.java
+++ b/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("M�rklin 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) {
diff --git a/Praktikum/VINF_MaerklinControl/src/server/MaerklinServer.java b/Praktikum/VINF_MaerklinControl/src/server/MaerklinServer.java
index a716f55..c2774bd 100644
--- a/Praktikum/VINF_MaerklinControl/src/server/MaerklinServer.java
+++ b/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!");
diff --git a/Praktikum/VINF_MaerklinControl/src/server/UDPListener.java b/Praktikum/VINF_MaerklinControl/src/server/UDPListener.java
index 127e4df..e2d66c5 100644
--- a/Praktikum/VINF_MaerklinControl/src/server/UDPListener.java
+++ b/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;
 							}
-- 
GitLab