From 624d02be2266181a43f1c236984c496664fdf9a0 Mon Sep 17 00:00:00 2001 From: lukasfriedrichsen <lukas.friedrichsen@hs-bochum.de> Date: Mon, 16 Jan 2017 15:15:08 +0100 Subject: [PATCH] final release --- .../gui/MainApp$EstablishConnection$1.class | Bin 1370 -> 1369 bytes .../gui/MainApp$EstablishConnection$3.class | Bin 993 -> 992 bytes .../bin/gui/MainApp$EstablishConnection.class | Bin 3888 -> 4787 bytes .../gui/MainApp$UpdateFunctionality$1.class | Bin 807 -> 807 bytes .../bin/gui/MainApp$UpdateFunctionality.class | Bin 3886 -> 3886 bytes .../bin/gui/MainApp.class | Bin 10972 -> 11075 bytes .../VINF_MaerklinControl/src/gui/MainApp.java | 14 ++++++++++++++ 7 files changed, 14 insertions(+) diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$EstablishConnection$1.class b/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$EstablishConnection$1.class index 5f7bff039ae9e9fac94654d9731e78941721921f..8c7406566956bc80f1591fbdb997baa29832d085 100644 GIT binary patch delta 29 lcmcb`b(3p@Arqs?W+SE$Mox~z<mA-iViohv6PQmi0sx1Z2@3!K delta 30 lcmcb~b&G3*ArqtNW+SE$MlR08<mA-iViiNf&Hc=$7y*yI2{-@% diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$EstablishConnection$3.class b/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$EstablishConnection$3.class index 721229655a516e2f583e8c4aff4315024b473f99..cc66112a4c85e7c1f47ce261361bbb793688f443 100644 GIT binary patch delta 22 dcmaFJ{(yah4ihIwVsdh7aj}Z|W;3SMi~v{22O|Ig delta 23 ecmaFB{*Zlx4igt=Vsdh7aj}Y_;bv2&)r<gMX$MaL diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$EstablishConnection.class b/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$EstablishConnection.class index 65bf01205c2e4a0b643560c0e9b5f6a9a535ea37..0339784c9952b60e7239ff861176ccc43b5e1439 100644 GIT binary patch delta 1145 zcmdlWw^^0z)W2Q(7#J8#7`|`hies6q$}Tjyiscof<>XXW3r3U4^H>+~awaAxrxq8h z7#c7#s7~I;CO$clEszT?YB+f}TNb0~WHojxMzhI@?CmT@j0`H17qW^@R%R32EW}aE zB*DcX&2X8A;R?f5Mg|V3amFCiK&qy(32|O$xXI3NgONdG@<cX~dLD*b47V8>Sj&qt zOHvsbST&-ZG{Zn<+~r}o$8aBEhB+gHj)qTqX{Nq!VrHIWL4ma<m{*pWTCN|QT2hjk zmtO3gpI1_ppOceXWX;9!kl`^q!y`rpX^<uy%IbL-o-hb9GKiEGq$HN4!psRSNh~QX z=3scn$Y9}GRFq$&kXT}+kXl@ln3R)QoZ+0GmzSDcl9`{Upi!Jr3btDzCBHmRAsH^C z3G&1X9)_0;uNWCPi&IM=W->B}YWQR&mL=-vB<7{-a|V|bW#*+@Ylcnk=du>!NJ%V7 zOfO2zWn^HAc4A~O(3mX9sJQtpR}Z5&i!uWn0~-Sale^Xy2HqVEzS|fAXEE7Kp1^aH zlaW(*8^ginj7*b@c-`v-*!FNlG7J0*iDY96v0{ZNza+`Jjo})EU9^qiAc)1hgQ0f^ z!$bsgDu}s*;m$UO2g?~wL$nG#-Nx`7r1|V}h8<QcgblAJ%5-6L(<NE<6E>R|qeU4o z%-+brK6wwXgchS2V>M$P!#M_CMl;5V3=E8u8E-J&W;n<Aj>(wGjNu#uGlK{N1H&Z- zlgamZqwDJ!T^Z{c0~s3_qZu0+(-@l=3mKaks~KAv8yMRdI~m&<Co<MBPG+oQT*O$< zxQ?-baR*}~<6*`o#&e9#j5iot8SgT-F+O8#XMD}r$@q@3j`1&JJrgHm1CuagBa<9s z6O$%mGm|l6E0YCd8<QhrJChq@H-jhx149f0Cj&zQlRJYLgE#{NgFVAehSv;l7?>Fa z8B`hGGQ4A8WOQXPV|dT-fq|8A5uEiG&T3%b1FK_YybEJ7S-@Bf-V6*35e)p3Gx*d^ zzcb{rGn@-zXE^$w!IOcNoq>^ofq|XjC<7xq!#V!{3``&fBLl;C26vEv00)B{!^g?f s_>34oPCm(JAo_`cfq{wPGs71K1_mt#Rt81}X@;+p`S|6TzcDZX0MA269RL6T delta 285 zcmdn2x<QWX)W2Q(7#J8#818K3ieq6ko}9_@o5h5YL2>c{Hj&9Stcr}LljpH6;NeJ2 zPEIW@Rxx8_P@Q~$O?+|^TOcP)(0uY<wyen+EJBmdv9V3IXIEyloSe+w&SJpGpfY(O ztLSECjy|TzU%0I|+w-hv6lW4;U}IomU|=-Y+QPuQgTZ$jL*Oh%oyn|xH#r#sb+<7b zT+ZM%`8l6E^F{{d$&LaNTnx+%A`A=+aSY;<n+2lvYZ*it7#I{7m_cSRh%tyWFfiCN z>}0saaG8ObQIJ8E;R?f521W*N1_lN#2F}TQ1=ZPA1vnVw7_Lp06f$DGHrYqWK=e8T d0|OJo4ThUwRjdq*4AKm@CQlTSXTHtA006cMM0o%J diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$UpdateFunctionality$1.class b/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$UpdateFunctionality$1.class index a2c6505b1683e102526d9713d3f2609712a1f5b5..8c037974b5e8340892e397a3122f397e185e4519 100644 GIT binary patch delta 23 fcmZ3^ww!Ild?v<clNT_#u)bp8VSGLLC6gThX@v-{ delta 23 fcmZ3^ww!Ild?v;llNT_#u-;+dVZ1x}C6gThXYUAw diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$UpdateFunctionality.class b/Praktikum/VINF_MaerklinControl/bin/gui/MainApp$UpdateFunctionality.class index dd619b744dbc378707abbe824475de71efe9180b..524bad0156be456637d6d9385a366b90d6275a41 100644 GIT binary patch delta 277 zcmZ1{w@z+D1rww3=1QhscHYShoQzW#_!y@$$TCjbEX)<n=sSynjd3;uKjRz*0mgX@ zT8#4<+!+@z#4s*o$YNZ?P{z2Jp`LLWLpS4chAE7z7#1_mV_3tumf;xVI)=xL>lr>W zZeaM!xRH^KaV;Z1<F?Jaxi2x+?`B|U+{3`bxSxTa@c@G$<3R>t#zPFEjE5N{7>_VW zGahBoW<17Vz<8X&nDHcoE8{5!cgE8UUW{iLd>PL%_%oho2x7dz5W{$pA&&79Lki<% zh7!h047H5c7@8TcGqf?@V3@#olVKL)9frA#M;O*H-eXwLc%NZA<2{Chj1L)(i!ttJ jxWf3D;X30JhMSB}8SXJYV|dB<ezFqZL&gb{S@^X8ZLU(; delta 277 zcmZ1{w@z+D1rwvu=1QhscHUM7PR2F{KE`$iS;mgd!d%gezC8?VjJ*u}jC~9Oj1w5N z7$-8gGfrZNVVum6#W;nbjBzSMJ>v|9ZpN7mQyAwkEM}a*u!eCy!!gDM438NXGJIrQ z#PFAKF(Vt}d`5o86`OZ+Ut+9Z%fQaKj)8}9BLhF<CI&&q%?!efTNp$cw=zgDZex&U z+|HoQxP!rfaVLW@<8B65#yt$~jC&cp822&wG9F;?XFSLd#CV7yhVd{%9ODs&6vm?r zC5%THY8g*3G&7!LXk$FZFoE$j!z{*g409Q`F|1*{z_6b2BExpZ3k(MtFEbn$W8BDa ih4CuGb;fH9HyN)p++)1K@RIT2WF@|bj7^hS__Y9`p-*N2 diff --git a/Praktikum/VINF_MaerklinControl/bin/gui/MainApp.class b/Praktikum/VINF_MaerklinControl/bin/gui/MainApp.class index b376dcc578cdbfe55b17ae8790c028983d407496..36a9f37d398b91874658fe206feaf3874f7f2eab 100644 GIT binary patch delta 359 zcmcZ;dN_>h)W2Q(7#J8#7%y(*nkvSqI=MhhbaJR5KaVvd14m+Va%yq0ipk`^V!AA* zj10<?FN%pwW@q7@d_bIs-wdI`oRL9i@&YlD$;uK^lP8NyO<pG^&uBUMoR}IfC)5x_ z14af_u>MkJere4xP6kHCBRmXh4C;&wa5aXE3~FFC_2ME3okoldDqwe&G7ECS)f!KB zmvCl0zqwn2n~_m*^K?lIerCq74U-pYN;7X`+&)=F(|~yg<Ic(ZH4T|}G47oFS<{et zH{+hkQCbGfdl~ml-m782yr1#F<PRE#%m*0{P5z)E!gzRcj;0LrQO08+-sJh3vJ%G` zPcSet7&0(0s4_4zFfuSOuxf2#JiK9YuBJ5O$;sVXM)Ic^7#NrsPcxojU|<kpU}9X% Sz{q%(fr0TH10&-F1_l5}?PWOt delta 321 zcmX>cb|;kU)W2Q(7#J8#7|(CynkqKAOk9t}gpomUGNZW2<UQj2oE(YC$*IM~DyEY! zi0QJJF*2xvrQV2(itOcKP-9SMWPm9#XJk+VOKM4oOwJaUn#?aQFJQ^YzzH?N(14La zW%2?siOChrd|Yr*!^u|Sh6t|F<Z20L#<QFEOK>wXDr`P2X~934MN5u(8{_uLs#=E3 zI~aFP{-_~5*<4drVi)6X21W)$1_lN-1||k31_lN;E$yw0dnV^;$uRF@+&{Tj%aHj1 z<H5<{nug4W7!OYF)-+^3%y<N30Mniglk>GyC;!mknS4o8misv4MyOe;lNU<MOqS5* mkw3w}z`(?KlJOJ+1A`C)6XRkAM#j?&42)+O7#YtoFaQ9<4pxN# diff --git a/Praktikum/VINF_MaerklinControl/src/gui/MainApp.java b/Praktikum/VINF_MaerklinControl/src/gui/MainApp.java index f66ae23..c826dfc 100644 --- a/Praktikum/VINF_MaerklinControl/src/gui/MainApp.java +++ b/Praktikum/VINF_MaerklinControl/src/gui/MainApp.java @@ -377,6 +377,20 @@ public class MainApp extends Application { }); e.printStackTrace(); } + finally { + 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(); + } + } } } } -- GitLab