From 6e8cd85f278c156f38cd717a12694ed08a689f2e Mon Sep 17 00:00:00 2001
From: lukasfriedrichsen <lukas.friedrichsen@hs-bochum.de>
Date: Tue, 17 Jan 2017 10:03:27 +0100
Subject: [PATCH] final release v2
---
Praktikum/VINF_MaerklinControl/.classpath | 16 ++++----
Praktikum/VINF_MaerklinControl/bin/.gitignore | 1 +
.../bin/common/Properties.class | Bin 1350 -> 1350 bytes
.../gui/MainApp$EstablishConnection$1.class | Bin 1369 -> 869 bytes
.../gui/MainApp$EstablishConnection$2.class | Bin 679 -> 1369 bytes
.../gui/MainApp$EstablishConnection$3.class | Bin 992 -> 679 bytes
.../bin/gui/MainApp$EstablishConnection.class | Bin 4787 -> 4755 bytes
.../gui/MainApp$UpdateFunctionality$1.class | Bin 807 -> 807 bytes
.../bin/gui/MainApp$UpdateFunctionality.class | Bin 3886 -> 3886 bytes
.../bin/gui/MainApp.class | Bin 11074 -> 11074 bytes
.../bin/gui/model/Engine.class | Bin 3014 -> 3014 bytes
.../bin/gui/model/Settings.class | Bin 1048 -> 1048 bytes
.../bin/gui/model/Switch.class | Bin 2663 -> 2663 bytes
.../bin/gui/view/EngineController.class | Bin 5416 -> 5301 bytes
.../bin/server/Engine.class | Bin 2539 -> 2509 bytes
.../bin/server/UDPListener.class | Bin 4443 -> 4135 bytes
.../VINF_MaerklinControl/src/gui/MainApp.java | 37 +++++++++++-------
.../src/gui/view/EngineController.java | 7 ++--
.../src/server/Engine.java | 1 -
19 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/Praktikum/VINF_MaerklinControl/.classpath b/Praktikum/VINF_MaerklinControl/.classpath
index 423fc1c..ef0f0db 100644
--- a/Praktikum/VINF_MaerklinControl/.classpath
+++ b/Praktikum/VINF_MaerklinControl/.classpath
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <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="output" path="bin"/>
+</classpath>
diff --git a/Praktikum/VINF_MaerklinControl/bin/.gitignore b/Praktikum/VINF_MaerklinControl/bin/.gitignore
index c14b100..d0380dd 100644
--- a/Praktikum/VINF_MaerklinControl/bin/.gitignore
+++ b/Praktikum/VINF_MaerklinControl/bin/.gitignore
@@ -1 +1,2 @@
/gui/
+/server/
diff --git a/Praktikum/VINF_MaerklinControl/bin/common/Properties.class b/Praktikum/VINF_MaerklinControl/bin/common/Properties.class
index 680801dcf289b5287de748be0b58330b5fee9d44..fbc4f673aebf589bf17fad845c16888b95b54077 100644
GIT binary patch
delta 13
UcmX@cb&P9+CMzSyWGz-103I>}W&i*H
delta 13
UcmX@cb&P9+CMzTJWGz-103I0wVE_OC
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$EstablishConnection$1.class b/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$EstablishConnection$1.class
index 91a92d0511ba80da321a112ff9c9f46348ff5281..8bf54e7156281ecca3db64172c699d1dbb2bb8e9 100644
GIT binary patch
delta 207
zcmcb~^^}e4)W2Q(7#J8#7<4ys&0>`1VvuE!XJ?ROWZ+IO&D8fz%*=BvDBxjGU{IXg
z!feB)%%IB7pfdRwvjU^q<mb%0>ZdXYF)%RjFfcMOFmN#lGl(!SFfcNRG6*m*GH^36
zFxW6Kg5~(MwlMJQU=Z8EAhV4@X(Iyz0~3QFSPv5e1LG_PUdGu-Ch<W{VrEbWtJGl7
gWME)mVGw7~V$fz_U=U(pVi0GLWzgXQTgLzb0Omv*i~s-t
delta 684
zcmaFLc9V<i)W2Q(7#J8#7y>tP&0?%)XOLxN5YI|1OVrOv%uCk~E-A{)OLr>G%t=Wt
z;$V<xWZ(-+ElSGFODWAuSEwpg;9`(rP~>6YWKd#c5Y_NO*J-U8#>F7cpu)qT${@|i
zz>%1ooLXG0V#vjy&Y;Q8puxz%onD%$@0*yJ=U7m{Q_rBqpp8&w!pNYY;e({WS`%VJ
zUTTScaDH-jYKb)$gD!(UJA)o013%bugcJ{h0fQkUgIIcMNl<ETen~1shhs`gQEG89
zBZHI%hH3RsNo$a|jCmML7)%)%*b)m0Qu9(68FZ2T=bx07np^^N5N2Rmb1;}QGH@#-
zmZqhrCMA}ZD1ywi1es}tW)vilK}IEG4|uS1Y<L)K8SEGtI7;#%8W<TwU_L;y-Wn9N
z4m=EwpcvsSPAv&8Nh~QX28lZJFt{+dPTtRG!{*N5$<E+0nUP6>(QC32(=NvF$#<FL
z>$4eH7#JBC7%a86F!1bP5Zlcl6DcIOok0P@SKh&(wv9n&8-tOM*)|4?Z4B1i80;ZZ
zVmla|wlTPEWME)mVi06tVBlk5W?*29X3%DgVX$C~We{RuVBmom&LGSn!oa}5%-{`H
m?Ze>9z`(%5AkHA^$KcPvz#zoH#30U~&Je)B0M@|3zyJWH3#Ft0
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$EstablishConnection$2.class b/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$EstablishConnection$2.class
index 824dae680925b6eeb32b9d0a9c62a3b97b954c79..f272ef3746b8c3408b5886e7d95bff637a2d7cc0 100644
GIT binary patch
delta 848
zcmZ3^dXtOm)W2Q(7#J8#7y>tPMKcOYGcs@_CMTyB7poXBG8kz1Ocao>x7PGYFU{2V
zP0Y-5EGV#MXOLxN5YI|1OVrOv%uCk~E-A{)OLr>G%t=Wt;$V<xWZ(-+ElSGFODWAu
zSEwpg;9`(rP~>6YWKd#c5Y_NO*J-U8#>F7cpu)qT%7A3QAs2%>gC;wJMm-|~H<JB4
z3|b7@2xpowGAL-ExK9&eLtbi$esF$rc4~<=7lST?K0AXRBLhF!a)cBQg8_pfBZF9a
zYDrLPZhlEBM2BNaN>OTYF(ZSNhNe$FnjWa6HOO1WJPalbri=`1i3J6zc`1wxy2$?X
zPs&P7F0qC>2s5y(IT*|t8MqY^OViR*lM+iy6hUTMg3Po+7*&s?5sz6Qtu{OiwhVTR
z3>+o-kXT`45YfQ2-Wn9N4m=EwpcvsSPAv&8Nh~QX28lZJFt{+dB7)bPk)d7(J$ym2
zQI?rnt{<FQQj(dMUhJHoS5lOplapFx&Bfr(;K|P5!N?$uM;Q-;7lQyJgGgyXN@7VW
z%ovC>7#X;N^Gl18Q{6IiQW+U|CO0t}O+LyP&zL@0l}Wxnn}LOak%581QfmtX&khE$
z-3&63LUP*~6d-)%9SmyQ7<9HV7zvqeW3br9V7-mO9wH^SgTZMVgWE<11_mYuK?Vi}
zJ_cq62F4r)ZN^*%3&uPKAqEBp9*E%#!VDq|3=GT+-eA=}489Bu3@i-d43d5f{tOHZ
ULJUj{;tc8x0SpXa4Gatn09|3&&Hw-a
delta 191
zcmcb~wVajf)W2Q(7#J8#7?d}1MKkgWFfwqK7NjJWq`HTCPGWHqWM@!hWZ+IO&D8fz
z%*=BvD46WT5?`OlAjH7Hz{9}Ez`(%8Aj}}bz`(%BAj%-Xz{tSOz`$U}zzCM((AvVl
zvyDM)BLf2i6N4aFH4_5^V=4nXV;Yhf98fcu8Kl7~Wf)``7#LU>#2Mrm<QW(kgcz6@
S#2FMAl)&~durM$%FaQ8<#1^vv
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$EstablishConnection$3.class b/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$EstablishConnection$3.class
index 744366b7f03a08ef18d230db577a5c1456acb36d..6a2d1016ebba22dc195943324fab97d521466868 100644
GIT binary patch
delta 165
zcmaFBzMPfo)W2Q(7#J8#7?d}1MKkgWFfwqK7NjJWq`HTCPF}|3B*@O7$jHE*UYe=z
zo0ysBSWqze1yej@(PR&1`D8N&Mg~R(1_lnTEet%{7{oR*FfcGN2r@7*a4|43Fff)e
zurro32r)1)@Icft2s4N<FfcGPNP|_%Fvv16Ft9L)GsrQ>GcYg+F)%TRGbk`9F))DD
IGcYg!0B-gej{pDw
delta 452
zcmZ3^`hcD5)W2Q(7#J8#7>qY^MKcOYGcs@_CMTyB7poXBG8kz1Ocao>x7PGYFU{2V
zP0Y-5EGV$%V31{GFn28~$}dt#EU{8ZEiOq+%E>IwaL&)mOHD4x%+FKMfD2~kr7I-E
zB{aDh<QWv%859^9xRK1{VNhaFW@O+jPAv&8Nh~QXW@Hf6@X1OnOVrOvtj|l=4=yRn
z%uBb{3<K#`<zY}`P)E4boRL9C1I39D2bX20mg@(nmXu`Xr58Kr=am%Y=j5aoS#vRH
zGHA0iXfZNKgWP~a84rUFg8(CgNU3l^N@7VW%p8dOCKoX}O+LyP&zL`1l}WzRhk=QK
zk%56hN^1)P&khDLA(?Fqa!~dT29<3L8XFlH7?>CY85kJ&7?>Ft7>gNr7)ux=8A}<2
z7#J9MAi5cZ8AKQu7?>G!!K(Eb^cff!SQx|^3>XX<7#M^Ym>9$v<Qa?@7{KZo7#IM7
Cn{D*~
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$EstablishConnection.class b/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$EstablishConnection.class
index 7e71f251611ed0d532eefdea856567f20da664fb..02f39aafe939f6bcea50d21c0bdf18127bc0028e 100644
GIT binary patch
delta 789
zcmdn2I$4$L)W2Q(7#J8#7(Q;~dceVGH2F2haz^9HlQ|DFnoJJoTFuPPaCdS(r!uD@
z7sDNfbsP*2CU<k&vpwQrc+Bu*^962CMovElPDXzQKE{B_O1w3KAq-rMp$saFVGM?h
zp$t}x5tG;RI*5fburaVPFfbKrZDHWu!Qi`%A#fH`+GJL~TO6vo+ZYZmXOx@#oX?#X
zAw84PV6q;+wZU$NJCR!38Sd?1*sz@8xfLr&h0y(N3=bt)w=tYu&Tz$w1tbJ9b0$L!
zNRu9lCSi0<k}Uf%v`FIAGTBl<vEG@nld*^490M<-8RL8g2F7)aUl_kLoMRGaie*Y*
zILE-uAi}`FaErl=fq^lWL69+y!JaXm!JRRIA&4=NA(k<TA&)Vcp`I~?p^Gt<VJc%9
z!w$xDhQo}7496IY7%nnaF<fUXWO%|@!zjR5%P7cL$0);CDWz-YwS#b{Q~*vsh5
zIDs*UftN9kaS~$&<7CES#wm<-j8hpq8Rs$fG0tb4&bWYaK4TB#LdIUkb&L}j_cBgo
zJjpnT@iOCN#(RuY7+*3@W&FZ8kMSqtd?qHw1x)OWi<!6>dzr);CorioPGmA-oWx|q
zIGM?vaSBrq<5Z?t#(7LhjPseY85c0s7ceem5M^Lsh+*Ia#Ug_kgE#{NgFVAehNleA
z7?>Fa8B`gbGrVA6WDH_3XL!l*ih-4JFO0>c24gYyG4O%au`>RIv6zxzECz1|28IX*
z{(lU|*cpz3QJ6qDJHydmlg|r^b62x7oC{)SIQpL<eDX&@S?*AFhI9M^91L;{uO~|i
zsqp)NUC6}1Ai%+(&hUD&kC2L{CrpfiiQx?c0|OJoTZVTG3=BpLYz&MH(hTnz7#Qv_
QFfcGoo+u>G{DFZ10LCE9K>z>%
delta 827
zcmbQNx>=R$)W2Q(7#J8#7`|`hdceVGIQcclaz>-clQ|DF8cz=AT3ye@AkA=>hv6Q>
zeMSb3#N_1E;$jtZMg|=XpY+m9ec!~)Jja3pYfUh(EHkxSKRC6dBr`9)*f~G1q$ocp
zC$-3$i{T-|V|Io|j11BsO*oYCFg#%pWMmL2El5c$Nrf82RUBNBSW;Td!SHOdA-6r-
z3m%4-46inqaeFdyIxuiDIx_GvI!!*oQzPigz{Tjspu*_RV94mkV8!S;Ih5ByOqqd=
zfsKKI$z5v;1Mdz7-)#(mvzTlqujakQ!Ku5A;ox#crpdj0?vo$#St~)5+}XzPU^&BS
zD^?I!=;=0w=aQ`37|t$d*kQ#2Ql<bB-@yP;CXB93l4U<gkpwP9lQ{(x>&+Oe8S5C%
zG4L{)F-~M)V4Tc&gYh=QImUNP#!O}m=NOn7L>L$tE-{!eFfjTu@G|-_2r~LH*faVw
zxHASY1Th9O#4-jk<S_;_)H8-KbTNi9Ol1sX*ufaiaF{WH;TU5g!$rnShU<(83{M!d
z83h<~7zG(~8D$vr7}Xi`8I9^0D;UifYZzS_YZ(I>>lmXM>lxD+8yE{28yTw^n;9Dz
zTNpbTTNx)ZRxwUytYKWlSj)JMv5s*EV?E<x#s<c7jE#&p7@HaIGPW>2V{B!7&DhTP
zj<JUEFJmneCu1FxFk?NF9Ag8MCSxO$F=I261!D`7BV#L*8)GMfC<6mSbPNM0C`uT_
z7{nPE80;B#GQ4JZ!@$fa$e_ybmf;-(Bcm&W8N+*q4-Bk~i{Pxka8?5YA6OkL<6Rhw
z$pXTf+%0I#oy*Q}E{L7s=zj*!$tMM6x!u_r&hZOyFvu}{ocvKxh2IYB3?>E!0S*Rr
wu$b^<b0I-R8<;o)6T>G41_maE&kSD}7#Oq|SQ!`@q#3?WE)<ey{>H!n0Pg?YnE(I)
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$UpdateFunctionality$1.class b/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$UpdateFunctionality$1.class
index 86accba0c001ecc868558a047b7eb9c9133b916b..0a6fa090871ffb5639ad89d215289dcf140a134b 100644
GIT binary patch
delta 25
hcmZ3^ww!IlJSHY4_Q?yFoY|PT8F-j@Cck8|0{~ZA1{VMT
delta 25
hcmZ3^ww!IlJSHZ_CzBU2IkPdoVBleVIr$}%9RP732&(`9
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$UpdateFunctionality.class b/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$UpdateFunctionality.class
index d4dd5a8184f3066f63fae0511990b93ae30dab75..893fd0f7b68e413e751be2122e5fc6d6a5353682 100644
GIT binary patch
delta 270
zcmZ1{w@z*Y8yD|322RH941A0`7-SiDZWiW>X7t_5z{a?bfuC_dg8<_}1}(-z4DO7F
z8DbcZFk~?vWhi4j#!%0Af}xx7B*PTO(+rCl4>GJ_JjZa1@jSz0#tRG|880&YWxT}5
z#(0jApYht}-Q1TL>+dqKGu~t1VSLEI&-jQzknu5tFyj*jQO2hX5{%Cnq#2(xXfwWG
zFkpPiV9fZM!Ikk1gFE9}1~0~U48DvX82lMOG6XSxVu)e<%n--;g&~FUD?<t67lvBK
z?+ne1KN#8=e=<y9{KYVf@h`(%#%By`82>Y@XJTO3&iJ3<AQKbAaWTe+3|E*~7_Kw1
bGTdZhW4On}&hU~+V6qb5L&lAhS@^X8k!(@a
delta 270
zcmZ1{w@z*Y8yD|H22RFF41A1}8Dtr!Y!>E<X7ruGz{WU}fuC^}g8<_k1}(<94DO8c
z7-AUbGh{I?U?^i;$WYI?grS>pDZ>=T6%30R=P;~cT+MKdaSg*`#<dI|8P_rVWn9n5
z#<-f1pK;6P-Q1TL>vuA+Gwx#GVcg5W&$y34ka0hQFyjFRQO1J|5{!o!q!|x0XfqyR
zFkn2&V9a=&!Ikj@gFE9%1~0}_48DwK82lN}G6XT6V~Alq&k)CWfgy$QB0~w|1%_J2
zD-6wyR~gzEuQ5zuyv{I-@fO2e#zPEi81FEwXS~a>o$(ICLB{(G$Hf@;GF)MN$Z(zU
c5yMT!#|-xvpD?^+d^=f*?;&H~WEOrc0H0q^`v3p{
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/MainApp.class b/Praktikum/VINF_MaerklinControl/bin/gui/MainApp.class
index 9c912940a43206d9b74ab2466c61498d4886fb68..d1bc6059aa050e2c06bbb3b9be55f174a6c28c3c 100644
GIT binary patch
delta 3858
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
delta 3989
zcmX>Ub|`E^9>-)2{)dzEI8?M}^DwY7uyHWVWn>WdJ-nnSJ0~+w!8t##q$oc}!8s>0
zHLrw=VLrn`c7_F$_i>1;En=u<WZ)=HEeXji$w>uCE#YBU%3#UJz>%I>;+dSESIo|^
zeDZG&S-+Kx4E$-CIjL4fsm1zE{(1#@>0AuU7^=7!7#Y^^Fsx-TU}WIS%*!kZ%Fi$H
zNvzB-Edfcb=V90YlHveKg(M~wvomaBWDuJ?pIgk1i(w;!F$cp|Mh20x%+zvygigJ*
zirgG7hV2YH*%@{)GVo_5mL=-vB<7{-JLe=87xOUeV%R--7pE!5MuxpS4Eq@NPyWuS
zqPdabAP>VKhQo{uEIIj!DU1vv8k#-`t^P?_smUeQ><mXIyKt#0ALn6UXW#(2;Uo{k
zDUdGS^wbh)VCAG1u``^R+{2|JaE^z8lYxti;WWbq9)^nymnI+JQgXe*$RGqVIjus!
zI5{;hRX-R+axq+HxW>bv&v2cQK|%v;HC#bJVo_>diM3`JD3ovVFx+CeJz1Sw-C#b$
zT^@#epdex?&d4w4VtByth@IgfBZDx=eErOPeNTVaisaOSlFa-(9)`!0>$pqBUo$cY
zfP>66FFi9a6&zgb3~wiM@u>2==V9Px;9+O@$jBf$*`86-jFW+p;WH0|0D~YG!v}^7
z91P!J0UlhQS(2RLlUZB>HUXsY2M+^3NcXSFT|6qne|Q*#7=*bPellDD5&wA@873d(
z5m#koVq_2oJ0PUAD6b?jDF@;PP6kFs79Iv(1|D`sw#k2al=(P#7(^IExfod)E^sh%
zPuAm=<mBaH-~%b(pB%ueBr3?mAi*HX#mL8Sfs2ukQG|z4lu>MQJFk|31S5k4C=B31
zm<&nC`XPx)9E?(o3@kqR*~MIp;*2sp4El_+lOOWxs>w4lu!pB+CTFDPaWE<}GVr=)
z<`tKu=H!&-rKjd`F`Q;p=3!KsY{KU%#95qL5?qp4Qd$fW*5YB*n0%YhcXB145}OeZ
zqcNkw<b`}1lWhbf6)bodEkQBFo0^+il%ATGTp3)FU%<_f#%RsMXv1hbxl}-n&7RSb
zozY?PLIH6RCs1l)$xE#$;bI79bm3uiWptZ-MnKKOp3#Gc(UZ}Ok%2uUvDh!QqJ)uw
zSwl05i{S&K4-ca+$P%H_f|SIPR7lK1+{eM_&&a^$=O5x28qCGO$fz~hN>E-sgoiN{
zWE4+Qetu4BVqREcPH8GA2Eut5G#E6w7$X^@*%_lIHwa3K#W2P)GO(5xWtOBeGO%hy
zJ86b-Fvd?_FDS#7$nc1rF=_HeL5Inl0>+aCg_baSZQdp%%EZXG`HTn$o1+~A3xh5L
zH-jF75Q9F0B!dNmB7-G^CWAeLA%i1>4TB3qD1$3Q0fQSuH-jg`1O_jLISk$m#~C~s
zE-?5rJZ1=-EGlirZOOpIAj81Gz{D_l@_BhB%?O4b1_lNm21W)323Ce%hCT)c21bS{
z3<z~o84MX181yIq){;?<!K!*1lIrP`BNdeD6R@hA!7!775o}s10}BHa0|SGumiAVL
zSz22dW(m#N#xM`W*v7DUH^Z_>p%vR1R_$a+Wnu`|+QzV2Ya7G5jbLYYGcYhnF|aW(
zFr+cCGNd!`F=Q~PFk~`lFk~_4Fl2)*p1es~s(vkl0o1lT49pD73=9mRyBRh{ZfDr+
zqb<ZJv}GH^wrvc1w6wP|95}#mWGlll5c9+VhSOUa&T4I8IIFdd;rwof%aK}J7>;dc
zxatdXoX$3e8z6cc!=2>}96s9H818Qb2b~XtKf?nCW(JV!^cc7q7#Qjc7&sUT8H5>%
z7~~j=88jJ67z`Q88EhFU7+e`D8GIP37y=lo8A2Fp!A{m<U;()h8Uq{*E(}i?o-!~p
z*fQ`lJY#syz{C*1z{2o?;Uxnj!$bxK22KX1?+pIz3=dcs7(qol#H&n346F>S3=E9k
zyX%qs`U=IbZ?-bLgZlNuR)$YnTNplRZDaTX4IEz`Ax5FEPz^fZz<INk;k%a3Hii=i
z7=CVL_^q{t;kVW{hQA<s8^b@SK0jR{Mqx%qs7Bpw^`KyVvz3uqOBbY*k##F0yVe#)
zcCBrUoKP)RERrlBO<Yh-k}Oc`7<sfn>=OqV`L;3&Xl-E>(Avf*1g5tzgl=OL*4n~g
zwVP2qQkYRvYYW4>?TpgUqyiV0tJm7X@Et=!s9kFdBQu7uFr$Lj7DgUq@w3|)l~CfC
z(TUL&9>-M-atsU%EesqCZ4AN;?F@1Z9SoWboeYKy-3*otJq#`k^}P)K41Eky4E+pA
z3=<eK8746lGE8QuWthUy!7!C!GQ%{6*$gunmN3j@*vK%8VK2jMhLa3)7%no*Ww^tz
zfZ+?nLPj2jMU2V}iy5sMmM}UoEMs(ISkCChunL@B>_Az7(HoXt7_Fe`#gdVeQI+8-
z15-UiA;U#RHHN1Q%nVBy<}s=>JY`^Ebi+tQjINMG#Hhhg4M{`{jtorT+{p>b2HM*g
zH4!<F3oNmTfrDW)*coDAJ}1-}3=Eu%+Kf63j0}v7^}39DQ1kRb0-*8*lyx@1b1@q@
z=WGL;gIWM_GU_wJGOsaQ^A1KsbcgI>U}4yeYyhJPqbaBaV>Fw5UO}|pTx$!1-A+a;
zMh4&I45B(a8SNMu4lsoKXfy9%h~CENth1BRosnVI{}-T4u#M4MOPJAb8)E>-8c1H2
zV_;`sVA#jN!myt~n&AM0GQ)lb9fm^;#terUtQd}ht%ihwH8c#Q88{dN8H2#tw4Q-M
zkb&txgCGMlI|CyFJEJ{FfDu%SL4)Qkv>=Sv+QQ(rjWKv8L%7x!1`jYxL4a)!M<lbr
zzYrg-EsSB>+ZZFXn0GKZY-R9R&R_tSjAUa$QosUJ!0)3aT+bM{jWIxb8)E{fl;UFW
zX9!|UgqBif47>~s3?~@47)~*WFq~$PV>rX0#&DKFkKr7HA;Sd*dxnb)?hKb0{28t=
z1T$P^h+??L5XW#6>|;n_6%X~X9D@L3GGht@BZEDh70kfR@Pbi16&wr<3>*y1h6(J9
ziQEi~jA@MNlcy-C7~BCHg&OgUj2VoXkf34YV_*fBi5bwKncT1BQy-?gjWJ?51HZ49
zFk{U&#sD3--y#^I;eOL%;9_84c)-BL@R&h_;R%Bz!!rhHh8GM03@;fX7+x{NFuZ0+
zW_ZJp&hQ@W2ykX%$bkBXfguALgJKNKjCG9l3``8t47MPa2)G>P0DG62AqMQp)X90u
za*T<SdzEDwgD0<64nc8b3yLEX7?R<RRAS&@U|{&fz{T)|L5SfiLj=P&h6IN13@Hph
z7_u3DGUPM-0XxnFRG>2yz#Ufrb(|1`A7dNC1O_IC2nLvoQa~;eVoYUVLR1pT?2L(%
zC#ZlNw@$?;5IF>UQ5=UEg8vz~7?~JE7?~L)8Ce;m8QB>E7&#as7&#eY7`Ygd8MztK
z8TlrAtD5qH;vYFcB-x4?7(o`VQI%y0p2-k6d7+wFJv<#RX8<Kn#)&AY)04pm9ys89
z$0*3a#VE|+$SA_#$tcR;%P7VW!YIxV!6*d|7zJ>p9tjN?M`$20GWdc5ff1JUz!jwr
zIPFbtQj=y3o;**@u^yb8pstvL;tF4e05n&~GH@}<Gq^G;F!(YmG6XUzF+?ybGsG~e
zA-N(J>Izr5D*`cH5dd}tBjYrN$#Lr9Qo%DBJdtuS6CxK+?pK!*7TCr(Z#jdikCrgw
zLZ}NT?@?E%N6Em9nhacw+6)qmIt&Vox(w=!dJOuE`V8ib1`KwLMhs4j#tfc}CJere
zW()z077WRZR!ELcfjU}(K@FUu85x{V9L>eR{GGv(oiUM5NPvTJ9pidX&YT>r!7ua)
zy%blQT%%#cs5g1NhSB6&Egp?6j9Wp985kH;;pO)h#xQhkCX+=qjTnt4duSSiv`uc;
z)L^unyg^fuQDAbmhRo!5n(B;Nlf|@*8I2};X&Fymr@=G1Q%hVZ3{*lhfm>UUTEt}X
SCM_ed^am|<M*YbW+FAg(nRUeg
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/model/Engine.class b/Praktikum/VINF_MaerklinControl/bin/gui/model/Engine.class
index 70daf85d355a2ba387aa43d0b47184ab4bd5b27c..11d28d37e4e07a7e13b4af329bbe6387d42821a3 100644
GIT binary patch
delta 127
zcmX>meoTCWBnPWB13QDvWH}CdR(S??28GE<97`pY8CV!p7z7wp8RQw%7#tZi8GISE
z7$O;TCM$5pG8#^<<FsKko4lLThS7TR4^A6KhsmZ~&aAEs+zf7$Yq{JQy(S;wa%S~s
g;ARMzT+1asS()3MF=TQyw*zY=0|!IY<OSSn02yu?IRF3v
delta 125
zcmX>meoTCWB*)}f4z9_{99FE#4D1Xllan}>O6oGOFz7J|Fz7SLGZ-*9G8i-XGMF$#
zGMG(P;EZLonq0?e!)P~oH>VAw)8rqVHjHkQO}U&|y%@L|yeHRkxiR`pKEmb98pOcO
e5Inh-OMJ32w>e|j<Y;aO)+h!JhUm!)xYYoWWgC0|
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/model/Settings.class b/Praktikum/VINF_MaerklinControl/bin/gui/model/Settings.class
index 6e3f4f643ab156b0ea23d1167574d2a8ad1315c9..57f9b707ca5fbcd9262e2d7b64a943a73b3afe94 100644
GIT binary patch
delta 37
tcmbQiF@s}6JTs>N0}F#7gEWKC<P2sPMzP6jnH^ZA88{eZCVyg90|1Q@2Ydhk
delta 37
tcmbQiF@s}6JTs>#0}F!~gEWKq<P2sPMybhbnH^Z=7&sW@Cx2pA0|1Wi2bBN-
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/model/Switch.class b/Praktikum/VINF_MaerklinControl/bin/gui/model/Switch.class
index 8f96aaa57ba1a1873a51dec262eea4c64ff1bd3a..99428519d08472273e8e15fb4d185fc3e8725b02 100644
GIT binary patch
delta 119
zcmaDZ@?2zt0z0cD13QD%<aiFz$yV%Ita1$O4DypR*_%a`7+4sT83Y(q7~~mL8MGNR
z7|a>8CNpxxGU`u`=dfWknLLNXfz^_MgTZR@Lk>4ayU7}yHj~vk#U@vA>alt-a5H#L
YUd!pn=sWojrvqyc0|!I!WJfMF0AU3fFaQ7m
delta 119
zcmaDZ@?2zt0z0cL13QD<<aiFz$yV%ItQrjL44RWO*_%bR8CV!}7z7w}8RQxC7_=D-
z8O#}sCo^)yGMZ10=dfY4o;-)cfz_UYgTZ0)Lk_peDV$=HZ8_B$-6yAVI<tB+a5MN!
YUd!pn=s)=nrvqy+0|!IMWJfMF0FCMx?EnA(
diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/view/EngineController.class b/Praktikum/VINF_MaerklinControl/bin/gui/view/EngineController.class
index 06031cbb88424aba6ae1302ab7dd6d0f0982b52e..53db6af0fef88ce05f017d0770de6b5df7ec4b20 100644
GIT binary patch
delta 1106
zcmZ3XwN;br)W2Q(7#J8#7=CT!3g_U6WSGRmFqvV><cl1Js?&HFrZb2$G6<Cxq$HN4
zy5^;4=A{OgB$kvGb1`Hv%;aI1#V~uaI;SP)T!#7V4D%QnR43cBicPNP6y{pM$iS?j
z>B-KpX!0CR8HFW`3_?DsB~>M<#R}f}xw(mXDfw0kTnq~tmhmu%F)W{agHwiWB@e?Y
zhSigQajM9zWmwP7u#S;IAS<yfQ9ma!FI_*lq$o2lorj^DVZ&q_E^Yozj0}um6SnX$
zY-QLsxs1!2cOk<{E{3%XJ3*>;P2R^PC9sE)fk{;X<lKEc4Eq@lOn$*-%Xx_52s^`J
zm~&mYC5(^pFz_=7a4?);WZ){xFDie(e{WGqF$cpbMh4!Z_xtxIXG4X!7$O<Y@GzWZ
zSU$OjJDl$_BLlBOVrg-DDoB3u2X02TyF3gR8KzAB#&eVH1;Z<LhL@AC@~ShxW_UCC
zKkoy^=aV1s1*p8^Vqj$W$ir}p;Wj@z!v_I|+l&l6o_TqxMb0^i#l@+`><r%~hwy7M
zG5pwE&#%T56VAZIz{tSBps2Nlp;2oKgT^+7<{b>}+ZcMawlIW&1h+9v)Y`@{bt3}<
z0~3QZ0|SE)0}BHKgA0QogDZm!gBybagFAx^0|NsO#2^M)1~~=>21bVIlLdqf>St_Y
zm?OZI)4q*CX*a{dNTJ2s8J7BJgP0J*SL|R|vz=k7(8g^Ho3}A+-^Q>x97z_cdk4b~
zkeb~HH6W)#4A{Gk;ovp~Ev+pKM-c)u8Q7VZGqA91s|U+8Zesu`o5{edEp!}Y#c~EN
zZK0DO7Ra00V2e+KyvPjpq7efR0|SE>g9w8+gC>J7gE502Lm-1cLn%W5LmNXN!+eGy
zhBXYq4BHq&8TK-SF`Qrs2M2)|0}}%S!%1im7&A;`s6WSWo`I3!0s{ksDg(=ZhS>~E
z><o<T3=2Vo_J2^ILitSW4BCv6Yz&N`SY}{kkYHe7NM~RHo2ag(y%iiiVW5E1-o^k6
zwM(!NIgKrjq8M1Y7@`@J7-AUI7-A<M7nWzf!f<u+OJNno1h9J{QN{{!uK)+bHHPa@
zn^h-&6qcFnCBnmegW=}nND%{xTMW0MatRDf;3UANrMr#c&g6w68u9lS?t^2Wjo|@<
zDA>tt3=bJZ8JHO!!BYks!##$_42%rS3{ODbW_Zf*3@Z1Qftlew!zYH%3}3+Mi;2O9
O0Rp}<d}sK{APE56$|qF-
delta 1216
zcmdn0xk8KU)W2Q(7#J8#7@0S6g>%$TVwl3tFqx4-Fe|YvQ9ma!FJ0d=uOu}+wTOqI
zn_(&=gP4Y=rVoasH5Wq$!*m{o84NQS890hlOM(khQ&T{yv8dGy<6?+pn9aj5hhZ)w
zgHUm5iECbZW?rgGX3^vd4kecPJPZpa&*PA0Tg1b#m|@A}{T!BT%NSO$Gc2F{k3)xd
zB_ji~hNdSw!)itb@yQO{;>;WjYbOVCigT=DSkJ>C#;{>>0jCVxCLV^(3|l5o;#85_
z#;}8(VLKy(0K(nDB}JKe=^#JtoP32-n}0VW1ET^L!zzZoJPi97_D|;HvKCs!u!)Od
z8^a-xs>6&7q8gr)7jg;<aWEWZWMEQN0D1X155ozDlam{`Y}rmToMmS?Gx;Bf<m5YC
z5(eja82A|kI2bN6GH{mV7nL7gQdCmR!El+8fxGDNp5$zZ04N}?@-SRu*f3e0JDm3p
zBLj~@Vrg-DYWd+Mi+i{k*`Dz*++vtJc@ob}wvP;-*%>}fF632b{=)Ee@@(D*j2|Y~
z@CB%R=VD-F_{GEUnBfUOJHt-_h9`^+Jf3-ZsYT8?iN(dK#q13KCx776WMyPzWRRPz
z$S1qmnxBm+JB@*ffsuiMK}Tx~L!;If290eD%{v&{w=wjB1ekX)Ox(sWO=}B77>K)#
zVV2f5hItzq7#Nrsq!}0(#28o^7#Lg_1Q}czWEk8S)EV3vv>7}YWEdD2cp&C7$TG+=
zFfcGOESNl3(4c<dHio4FTsiIA7?gH1tcny`vz=j`k2Z)2v0&p4hOOHf)(P#}#;|7_
z!+~uKd%}@qp}Kc490aL3f=~l;ImCct+Zax5W6;vt!f*~DFq46uc{u|M%eH#3Oyf2N
zkg}N!yxKw+Kvpbg;L;Yl1Y&`_stvaI3dozxU~d{R@Gvkicr%DF_%LWP_%RqW_%j4D
z1Td5`1TwTS1ToBK2xeHr5W=vHA&g-!LpZ|;h6r#Fh%qoRFfg2i27xidGzPQl3^y1U
z8E!H#FsL%H{AZZWz{JkL$j-0|L}>p91uT@$#Ll42D9Oga2#$M3Vd<z<k=olBVBvEc
z=JzY8F(Smk!oa`~&A`eK!=S_v%b>;(hvXD>s8bji)EPt=L>U+v7#Z#|+?!k`tfH6*
zRtJeSR){(Q4u<;-4;UC3BtY(+Tqi8UF9}w~!~jax4;da!ekN=n@tENWR80Z{6WD$>
zE!}MlPbce%Xv9BfcmYlbYz!|MM8V;~#_)<kl!2MyH9V29F+68@!@$VE%<vWz0u1jM
l-b3ZSF)%ayVEE1Ohv6>+1A`C)6N3)}1pH%UU}R#D1OR2GI%og@
diff --git a/Praktikum/VINF_MaerklinControl/bin/server/Engine.class b/Praktikum/VINF_MaerklinControl/bin/server/Engine.class
index 61fe9f164dc6f24e543e1a5391eb450b7d7169c5..ddeb21d94820b3679bf8989d78b055a8e2a0c416 100644
GIT binary patch
delta 441
zcmaDYd{&t2)W2Q(7#J8#7z#IXePEu<%Oc5{#KXYDz{SCkGFhKRmL-jcA$@ZI%XB8r
zV+_m;%nS?+-jhGDdGT&!U|?Wo5NBXuFk|4I?8j~@F2TUSpa4<9Aju%b00Q0&36tls
zdwC=-XW-w>;20^CyqzJ+S7*Q076w(VEet_gTNo0zF{C04lVf0KU|{fM;AZe*5Mc0T
z5N7aYkY(^=kY@;B&|?UkY``Hdo58@vz{nuWz{KFs5Wv915Xiv5z{0>J%+0{akU9Az
zhk|ROfKkF$hD0p3FoB)S2X<x%12;n`gA_v;1IXz-42%p64AM}iGcsg>Oma^YFiIh8
zQX~U6LllD)Lo`;CvKewF8*r*H#!WuYDaxG7kTW@#Q-v`J#M8)Q$YEe)5N2Rt&}U!-
ayMPrGCTkcN7$8n%0}G~s6tm}pMGF8Qvq@$E
delta 488
zcmX>r{92gn)W2Q(7#J8#7)myBePA}_Vo+yD<Y7o+5MpFt%gHP*NzG$q5Xws}cg;)B
z%u992EJ{r-$;{8=WME`S<ze7q;NoCNpDe>7%aX~%khR&CWjYh*MFwUDW(Ed^pviaH
zyhOCNFlcRKNZ820z`)EP&cMK6#lSb&gxyp+kinfnf`NfS0iu{el0k|A1cDfnCpWNr
zC8R88;NQ*Q7%7ytogvCsXTR1K234&s3_)637*e(|WFQQbV_;`sVDMt#X7FYZVDMoO
zX7FQ>W$<T^X9#4_V+caBL?3R6K123oEe>hMoXM*>6kJmTj1smoq+qdu3G8G(uoFWW
zxEaD2q!_}%Ch{;aGB7YmLrr94$OW0?o+4nBLfE7z25yFE1}TOZtS03#<WCmjRAG#t
zypdCsxqu;mvOlK^V={=RQOJ<bz{nuXz`&r-zzB8$D=0kHFfcGcoXQ3kOb01uF9M4e
F0|36?Rc!zO
diff --git a/Praktikum/VINF_MaerklinControl/bin/server/UDPListener.class b/Praktikum/VINF_MaerklinControl/bin/server/UDPListener.class
index f22ee468a140cc7e74b01e0951de358494f54002..c116d862c6b31c41dc3fd90997f8b57dca65c1d7 100644
GIT binary patch
delta 808
zcmcbuv|NGf)W2Q(7#J8#81`@E`o^Zl%`lx|IS<1M246-7_Kd`0ztoBnE(S)1RXhwH
z4DOr^-3)7Z7}idnz%CNQ$*`VbBRj(eMh4#E)S|M~BK_d<%#!2`9)?W}{frD8#b91)
zF&D#nhAlh{TN&IL8MxC^OCYK|T|oM`^DyjS;9z9nhbVT*EJ{r-$;{82?98!~Q;>m$
zL5P8eL3lDN=Qc$#27U%{1`!4c1~mpr1|0?|22%!UhC~J#h9m}AhBOBG$#*#W8I>mI
za0N4}O+LWo%&0Y)h1;1?Z?Xq>Fr(4r16-n$H*y;?noWMp?apb%z{6n8z{g-W*_daw
zrV9fLgDV3EgBt@MgFAy5g9n2ggC~OqgBL>-gEvDggAYR-gD*o8ga2f9-hSR71`dW0
z1|Eh`1`&qf$%}c-xR~BEurRPQFfdw7*5x#vEWyXmW50=^Ya7D^E4Jkf>XYa5iR<x8
zvTAK(Sh$s8@$&zRCE0c|EMsJt_5bSf|I@U#F?0xUEnsj(Xwd~}NfiZaS-F*AwInMu
zSYrfS<N4+Py}=sA7W{YG#IO!#7f8W0Mur0n>#bNNS+_B4*4oA}e*pu;_LW;1wk`iJ
z3{nHLoo#Y1r*=J~Afq4y0|N`A45JJK0|Nu25u*`<H3Kt)7y|=C6N3T+149f0KSL~o
z2tz!B8bbnu4nrb?DMJ#24MQ@6D?<uH3_~hI216P{Awvd32}24)9YZ!lBSQ{D7eg+?
zLWVqswG8<T+ZYNM_AnGN>}SYjILT1TaE76b;VMHp!yAVB3WgsHm5huG)r>3*<&1m`
zag0I?jf_SNO^n72&5Y&@tqkG}3=AHSFlLZokYr$B;AiA!uxD^!U}jKbc){Sv;Kabf
z5W^tBu#;gI11rNq2019}4TA*3ZiYP!tc=DCEDX*JE)0wet_%ze+Zp)(F^I4;n6fiW
fo+lv3s62VUfB~Z>m{gvuDyYxCmw|zSiD4fAtt7ud
delta 1162
zcmZ3ka9fG%)W2Q(7#J8#7%pz)`o>nz!LXc>K_IvwH8n*cKTW|kFFi9aRe_5kieV)W
zLngy2Mg|!TPfee!#Ii*FoW#6z{os<K%)E4`(#)Kc)FNvRhBb@~JPOGfiFxU%DGDX|
z3S11`42!rJiWt`OFl=B*U}Rt~D9X$$$;snpn9i_?hhZ~=FCzncMq;sFYDEcGJp&`d
zRvrcq26s+|ZiekV3_BP&7#a9e!On2WEJ{r-$;{8=VA#dTAOh#2IJBE#D<{KVhW+de
z`xqH`i&KlrQj7G1%QH)oGk6#dF!VDra1?`isl{9jdl?S#FdSxZXJp_`Pb~>9&vY$G
z&hT^r8E}+`;TYI%h-$cH91JJW?S`1H05a|r4}&Lz`{ZftJ2{0ISQvyEco;+`M{sOY
z6ldUPkYEsDkYrF}kYdnbkY+GtkYPw<kYz|>kYh+=P?)UG+0Upvc|T_`qx$6cT%waT
zxbzscCx>%6GwM&C%@xdOJo!DB8>9JTGj4ZIYX%+$8wNfG`^jzGt2JF2SQy+GI2ha+
z_!vAG#27po<QTjdG#I=Yq8NM_Vi|lH;u!oGk{ALeNAdLY1~YIlgfj3jgfWOPgiQX%
zW5&f?#=yeB&cML9c5(xU>Evu){`#~{3|-q8CRnj8XYi9`+sQDEk>LPCw-u`->o$ft
zTH6@rFJLf}WYyZnuy8BG;!O-;yBVS)g_dn+hyyFw#;`(Y^)`ld5NGW+h85cwa<?(8
zTmHWWWYk7RhFSmDE&rddwT+=efNKFm4#KVwkb-H94E5-i*?=wEvXx<*Br7wLl{>Ln
zxf{t!E|7^}D_1Q4_ZMuX*n)pwHZknM@ZMgC_YP`pV{n1{Z_8GOBQXCRhgx<J*?%Vy
zmi?Otw`|?=e-kGk;LxsTY-4O=U|?WjoX9wlfq{X6aXI6125Sap1~CQ(hCT*m1_p*$
z27ZP(1`&n?1~rC61|5bZ22+M)1{;PH23Lkuh8Tu4h75*uhC+r6h8YZ*46_+h8J05S
zFsxw6W!T7&$8drnpWzBa0mEH}LWai-MT}ew#f-cRd5q!=WsFh`_2rDp3>A!443&&-
z3{{N&4AqQf3^k0E3>A#c4DpQZ3{8y78JZbaFtjkPVQ6CzXJBCPfFuP52?j|91_pk{
z1_pZu2L@&aHO5#5M+PSb7KRuGdxp~tXBb!+PB6GaSd3N-_6%nk&M~kuu3%tcaAt5}
rU}SJ*U|?d{J2{PCgZVdu*W?5I2F$-10-&_l<d6LN?B^LkYAyf(J;pqS
diff --git a/Praktikum/VINF_MaerklinControl/src/gui/MainApp.java b/Praktikum/VINF_MaerklinControl/src/gui/MainApp.java
index ea9b6b7..f0b31a5 100644
--- a/Praktikum/VINF_MaerklinControl/src/gui/MainApp.java
+++ b/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("M�rklin Control Client");
+ this.primaryStage.setTitle("M�rklin Control Client");
this.primaryStage.getIcons().add(new Image("file:res/BO.png"));
initRootLayout();
initTabs();
@@ -394,19 +394,28 @@ public class MainApp extends Application {
e.printStackTrace();
}
finally {
- 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};
- out.write(datagram);
- client.close();
- connectionEstablished = false;
- running = false;
- settingsController.updateSettingsStatus();
-
- } catch (Exception e) {
- setStatus("Error at: establishConnection (shutting down connection)");
- e.printStackTrace();
- }
+ 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};
+ out.write(datagram);
+ client.close();
+ connectionEstablished = false;
+ running = false;
+ 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();
+ }
+ }
}
}
}
diff --git a/Praktikum/VINF_MaerklinControl/src/gui/view/EngineController.java b/Praktikum/VINF_MaerklinControl/src/gui/view/EngineController.java
index 98eded7..72473ad 100644
--- a/Praktikum/VINF_MaerklinControl/src/gui/view/EngineController.java
+++ b/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("vorw�rts");
+ status.append("vorw�rts");
else
- status.append("r�ckw�rts");
+ status.append("r�ckw�rts");
mainApp.setStatus(status.toString());
}
public void setSelectedEngine(Engine eng){
this.eng = eng;
- mainApp.setStatus(eng.toString() + " ausgew�hlt");
+ mainApp.setStatus(eng.toString() + " ausgew�hlt");
updateEngineStatus();
}
diff --git a/Praktikum/VINF_MaerklinControl/src/server/Engine.java b/Praktikum/VINF_MaerklinControl/src/server/Engine.java
index 60f39ce..be0e29c 100644
--- a/Praktikum/VINF_MaerklinControl/src/server/Engine.java
+++ b/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 {
--
GitLab