From 64b0a2c5c6e7f941c6108b83789806cb15d5994e Mon Sep 17 00:00:00 2001 From: Jonathan Roemer Date: Sun, 8 Feb 2015 18:13:53 -0500 Subject: [PATCH] Updated UML --- bin/UML.cld | 344 +++++++++++++++++--------------- bin/networking/networking.class | Bin 2048 -> 3148 bytes src/UML.cld | 344 +++++++++++++++++--------------- src/networking/networking.java | 2 +- 4 files changed, 377 insertions(+), 313 deletions(-) diff --git a/bin/UML.cld b/bin/UML.cld index f00fe99..60eabc7 100644 --- a/bin/UML.cld +++ b/bin/UML.cld @@ -23,7 +23,7 @@ - + true @@ -31,7 +31,7 @@ - + 2 @@ -40,10 +40,11 @@ -1 -1 - 336 - 108 + 351 + 6 - + + true @@ -55,83 +56,6 @@ - - - - - true - - - - - - 2 - - - - - - -1 - -1 - 351 - 6 - - - - - - - - - - _stereo_type - Stereo Type - false - - - _simpleEntityName - Simple Name - false - - - _entityName - Name - false - - - _background - Background Color - false - - - _attrs - Attributes... - false - - - _operations - Operations... - false - - - - Connectable - - - - - - - true - - - - - 2 - - - - @@ -153,7 +77,6 @@ 253 - true @@ -187,44 +110,21 @@ 247 - + true - + 2 - - - - 0.5 - - 1 - -101 - - - 325 - 81 - - - - 0.5 - - -240 - -73 - - - 1 - 83 - - - - + + + @@ -979,6 +879,7 @@ + @@ -1109,35 +1010,173 @@ Thermostat false - - - - 0.5 - - -1 - -77 - - - -160 - 84 - - - - 0.5 - - 160 - -78 - - - 1 - 83 - - - - - + + + + - + + + + + true + + + + + + 2 + + + + + + receiveCurrentTempPORT + int + false + + + + + true + + + + + + 2 + + + + + + receiveCurrentTemp + void + + false + false + + + + + true + + + + + + 2 + + + + + + receiveDesiredTemp + void + + false + false + + + + + true + + + + + + 2 + + + + + + sendCurrentTemp + void + + false + false + + + + + true + + + + + + 2 + + + + + + sendDesiredTemp + void + + false + false + + + + + true + + + + + + 2 + + + + + + receiveDesiredTempPORT + int + false + + + + + true + + + + + + 2 + + + + + + sendCurrentTempPORT + int + false + + + + + true + + + + + + 2 + + + + + + sendDesiredTempPORT + int + false + + @@ -1170,25 +1209,18 @@ Operations... false - - _abstract - abstract - false - - NetworkConnector - false - - - - - - - - - - + Network + + + + + + + + + \ No newline at end of file diff --git a/bin/networking/networking.class b/bin/networking/networking.class index 1bcfda2acd1833121b620461f173d2622dd49798..89d986a89a3ac46b793829682502a24e2e8e10ba 100644 GIT binary patch literal 3148 zcmcIlZBr9h6n-`Y7Q!lTqJoNPt;matTC^2Vs^Cim1WAfSw021@u#)V?%?7mZt!@3# zztI^#x19l}wDo&`On-q>`rO@3vWd>%blPMlyZ7F6&w0*so^$f&-@pC=U=UALgcP)! z!dbWMRl{5!D8H%*D`m~0JyQ@hz=3%MZFym)UokKG85eoO7U`lNc_-=LsXF4WAA8)$r>r$$&ses@ z3tc*q${?kE0+RcS3hML1re$nKLF;5Wo48{$-C+fqvm)%QMbM74sUJyY4AXEfDyZq{ zol_7Vv(iGv{t7O<+Y#(Tr-lP)S5PQl%AQ>Z9}e$o3ApfAadnVO5_}ays9`#3d%W@PE;IY72N~YZy@ew9Jf-d!ik_8 zy%J*|Q|XEI&dH7A8cyIOLF*~$n@)RrJ#O6V?!{phr&w&)sbLLVE-WnxmT6Y#X<@54 zqoAXB7Bh1Nhm;6C>m5fZt#c~QGV?Mh*Q*JQIzFR@&#a6sffZn8Ls zc@?*d>LG)Hh#Hc(Lowte2s#;gO;QU1uihXS_5)S=VyHpf)o@StL~SZ#<%Ja7U9y%j zNPsD97Ta@HEmfAdF7K*@R{dh6z0KDagF3Goac(IBocZdKS{#HWwVIPAuUfD} zRgfdE&5PvTwhc$v@~)$yfHekW2Td28Qsc??C|4wS!je41BN_6sg3fY#RM^~+$R6TT z4WG$Lp}Jbgn6e@qtFmZSV)YP_ayRq9pk@(#sw#@ml(jfjE!&$-a?-Z>J5+jL{_f5T zr@~uHA(z&j;J*!LV%#d&DRI@1qqM2~mvvIMY#slJz~PU2bf6Y>T&Y}z+;v0MIuckn z(q5}t?+UDU^SmjrZswYUp1wQenCG*BG4`OH5%+R+o-yU8eGB`No9Orj2TN~VKk*=h zD1RfaStp+d@s_(Q9lcFAAspd4On2`{hst3Fuj9_b7P^xy2j(}?Gtsw!{>d#2B)4!n z*}s8zH*tOwBU8sWF!~&07k@^qbvpbzYLYdFp5s=010UXg25l%z+l7ws3;B4q{o7D2 z9evbM`+`B6ahYGB5wrY)Tt@kOmAQfd8`;jy=*52Y;V_>^a2)+OiE|vn!+eh76i3r( zT*nzq@HtKJvp9Wr}@Fsu44|kB_-(<{cf2O!EjSNFhxO{p3+F*%~a-q8s6t zXjIX?O(!8fRd#}+V!3`>)`J`FinJL!)5cP~8Ep^#JK8QV-Ahb#oU~mbZR1S!8k3AM zpBtntMhYglJ4xE6_%=z}MoHTYX}d+*X8&i}GRRh|4L`C-wX#@S7)l_1D`zG{%a`AEh#3JP$N=VVox+(ZtEqvdyh?WA6;1Bsm| z#J*mE{i_moISAey``4vmA(@aLr92qq}>utVE*mS=0B9o K6@2Hy`u-nfAgEpd delta 872 zcmb7>%TE(g6vn>`eb8Zuw%DeC(eZ_}fUOEXsG{=H3gy*;RE;@o8+yjl?d8m<5RPa9T zFO~Ru#hVUx=fXJ4ut#TenJGHP8kY*PIPW|5F(m%rm`}}zalv~LOg3e4NyTLhc<+Om zrhZ)UtFC(Af=BcHxTfMdZZL!^#33!4A<#vozWcC>5yTmShUK`NA!byC;I{O+xX@)) zkQj2gy~Kt0Jdp67HpbiU2vc&AV`wQ#-B>H=m6A?_3S+|C4J2PrgjU%m(rBc)1Ii9M z%dxI)q~B500FCw#80{$>t0_PPy@*rp1jPZ$okW68e|H$Hb2x)corCv9iJr=qyQ3Wo z+c;O)L4Ubt3l{_1$W8XPZ(;D|?$?0;Nkd+=xm_QJib=F#3P(^N(-}gU#c3344blYV zYy)+lC-+Ax}@fO?ed!-=T()Erl^ok1HVKeO3Ts7B9uUtW@jU#EXL6sX^}l$gyl2hFTUKgb4a6J4bWO49l$n}RsZ(ZsrB&`L KjHcs%Xz3?=8mt}w diff --git a/src/UML.cld b/src/UML.cld index f00fe99..60eabc7 100644 --- a/src/UML.cld +++ b/src/UML.cld @@ -23,7 +23,7 @@ - + true @@ -31,7 +31,7 @@ - + 2 @@ -40,10 +40,11 @@ -1 -1 - 336 - 108 + 351 + 6 - + + true @@ -55,83 +56,6 @@ - - - - - true - - - - - - 2 - - - - - - -1 - -1 - 351 - 6 - - - - - - - - - - _stereo_type - Stereo Type - false - - - _simpleEntityName - Simple Name - false - - - _entityName - Name - false - - - _background - Background Color - false - - - _attrs - Attributes... - false - - - _operations - Operations... - false - - - - Connectable - - - - - - - true - - - - - 2 - - - - @@ -153,7 +77,6 @@ 253 - true @@ -187,44 +110,21 @@ 247 - + true - + 2 - - - - 0.5 - - 1 - -101 - - - 325 - 81 - - - - 0.5 - - -240 - -73 - - - 1 - 83 - - - - + + + @@ -979,6 +879,7 @@ + @@ -1109,35 +1010,173 @@ Thermostat false - - - - 0.5 - - -1 - -77 - - - -160 - 84 - - - - 0.5 - - 160 - -78 - - - 1 - 83 - - - - - + + + + - + + + + + true + + + + + + 2 + + + + + + receiveCurrentTempPORT + int + false + + + + + true + + + + + + 2 + + + + + + receiveCurrentTemp + void + + false + false + + + + + true + + + + + + 2 + + + + + + receiveDesiredTemp + void + + false + false + + + + + true + + + + + + 2 + + + + + + sendCurrentTemp + void + + false + false + + + + + true + + + + + + 2 + + + + + + sendDesiredTemp + void + + false + false + + + + + true + + + + + + 2 + + + + + + receiveDesiredTempPORT + int + false + + + + + true + + + + + + 2 + + + + + + sendCurrentTempPORT + int + false + + + + + true + + + + + + 2 + + + + + + sendDesiredTempPORT + int + false + + @@ -1170,25 +1209,18 @@ Operations... false - - _abstract - abstract - false - - NetworkConnector - false - - - - - - - - - - + Network + + + + + + + + + \ No newline at end of file diff --git a/src/networking/networking.java b/src/networking/networking.java index 2def963..c5de9e2 100644 --- a/src/networking/networking.java +++ b/src/networking/networking.java @@ -33,7 +33,7 @@ public static void receiveCurrentTemp() throws Exception { ServerSocket listener = new ServerSocket(receiveCurrentTempPORT); try { // This stays running continuously once called - while (true) { + while (true) { // Sets the socket to an accept state Socket socket = listener.accept(); try {