diff --git a/.gitignore b/.gitignore index 2ab354a..7a1167b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ log -out/ \ No newline at end of file +out/ +*.log \ No newline at end of file diff --git a/.idea/artifacts/Client_jar.xml b/.idea/artifacts/Client_jar.xml new file mode 100644 index 0000000..bca276c --- /dev/null +++ b/.idea/artifacts/Client_jar.xml @@ -0,0 +1,10 @@ + + + $PROJECT_DIR$/out/artifacts/Client_jar + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/Server_jar.xml b/.idea/artifacts/Server_jar.xml new file mode 100644 index 0000000..a0b38e8 --- /dev/null +++ b/.idea/artifacts/Server_jar.xml @@ -0,0 +1,14 @@ + + + $PROJECT_DIR$/out/artifacts/Server_jar + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/TextTwist_jar.xml b/.idea/artifacts/TextTwist_jar.xml new file mode 100644 index 0000000..da74d61 --- /dev/null +++ b/.idea/artifacts/TextTwist_jar.xml @@ -0,0 +1,13 @@ + + + $PROJECT_DIR$/out/artifacts/TextTwist_jar + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/redis_clients_jedis_2_9_0.xml b/.idea/libraries/redis_clients_jedis_2_9_0.xml new file mode 100644 index 0000000..3799a93 --- /dev/null +++ b/.idea/libraries/redis_clients_jedis_2_9_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5c55d9a..62626a3 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,13 +1,15 @@ - - + + + + + + - - - + - + com.texttwist.client.* com.texttwist.client.* + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -167,41 +146,166 @@ - READY T - READY TO - datagramSoc - cl - clo - clos - close - close( - INVIO - datagramSocke - datagramSocket - datagramsocket - datagramSo - close() - D - Dat - Data - Data... - ReceiveWords - R - ReceiveW - ReceiveWo - ReceiveWor - ReceiveWord - datagramP - channel - score - ComputeScore - 5 - buffer + multicast + multicastID + us + users + users" + "users" + m + matchT + matchTi + matchTime + matchTimeo + matchTimeou + matchTimeout + A + AP + APP not + APP no + APP n + APP + APP + APP: + APP: A + APP: + no + notifica + notificationS + notificationSEr + notificationSErv + notificationSErver + notificationSErver. + + C:\Users\loke\TextTwist\out\production + C:\Users\loke\TextTwist\ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -811,11 +841,11 @@ + - @@ -1250,8 +1280,8 @@ - - + + @@ -1301,70 +1331,63 @@ + + + + + + + + + + + + + + + + + + - - - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1375,7 +1398,7 @@ - @@ -1384,430 +1407,435 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + - + - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + - - + + - + - - + + + + + + + + + + + + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1817,10 +1845,12 @@ + TextTwist:jar @@ -1840,6 +1870,7 @@ + jedis-2.1.0-sources - Client + Server - com.github.cliftonlabs:json-simple:2.1.2 + redis.clients:jedis:2.9.0