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 1bcfda2..89d986a 100644 Binary files a/bin/networking/networking.class and b/bin/networking/networking.class differ 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 {