From f316e7a997d1bfd7f23067896d26ced26e18ad52 Mon Sep 17 00:00:00 2001 From: mirimatcode Date: Fri, 3 Feb 2023 12:49:06 +0100 Subject: [PATCH] aggiornamento codice --- .../nbproject/private/private.properties | 2 +- .../nbproject/private/private.xml | 4 +--- ClientAccademico/nbproject/project.properties | 6 +++++- .../nbproject/private/private.properties | 2 +- .../nbproject/private/private.xml | 4 +--- .../nbproject/project.properties | 4 +++- ClientSconnesso/nbproject/project.properties | 4 +++- ServerAccademico/nbproject/project.properties | 4 +++- .../nbproject/private/private.properties | 2 +- .../nbproject/private/private.xml | 4 +--- .../nbproject/project.properties | 4 +++- ServerSconnesso/nbproject/project.properties | 4 +++- USocket/.gitignore | 2 +- USocket/build.xml | 2 +- USocket/dist/USocket.jar | Bin 6384 -> 6384 bytes USocket/nbproject/genfiles.properties | 2 +- USocket/src/com/mirimatcode/UDatagram.java | 14 ++++++++++++++ 17 files changed, 43 insertions(+), 21 deletions(-) diff --git a/ClientAccademico/nbproject/private/private.properties b/ClientAccademico/nbproject/private/private.properties index ea67f5f..1a2f6d1 100644 --- a/ClientAccademico/nbproject/private/private.properties +++ b/ClientAccademico/nbproject/private/private.properties @@ -1,2 +1,2 @@ compile.on.save=true -user.properties.file=/home/boss/.netbeans/16/build.properties +user.properties.file=/home/docente/.netbeans/16/build.properties diff --git a/ClientAccademico/nbproject/private/private.xml b/ClientAccademico/nbproject/private/private.xml index 0e97f21..6807a2b 100644 --- a/ClientAccademico/nbproject/private/private.xml +++ b/ClientAccademico/nbproject/private/private.xml @@ -2,8 +2,6 @@ - - file:/home/boss/Progetti/TestClientSocket/src/testclientsocket/TestClientSocket.java - + diff --git a/ClientAccademico/nbproject/project.properties b/ClientAccademico/nbproject/project.properties index 174192c..1c62b3a 100644 --- a/ClientAccademico/nbproject/project.properties +++ b/ClientAccademico/nbproject/project.properties @@ -33,11 +33,15 @@ dist.javadoc.dir=${dist.dir}/javadoc dist.jlink.dir=${dist.dir}/jlink dist.jlink.output=${dist.jlink.dir}/ClientAccademico excludes= +file.reference.USocket-dist=../USocket/dist file.reference.USocket.jar=lib/USocket.jar +file.reference.USocket.jar-1=../USocket/dist/USocket.jar includes=** jar.compress=false javac.classpath=\ - ${file.reference.USocket.jar} + ${file.reference.USocket.jar}:\ + ${file.reference.USocket-dist}:\ + ${file.reference.USocket.jar-1} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false diff --git a/ClientPersistente/nbproject/private/private.properties b/ClientPersistente/nbproject/private/private.properties index ea67f5f..1a2f6d1 100644 --- a/ClientPersistente/nbproject/private/private.properties +++ b/ClientPersistente/nbproject/private/private.properties @@ -1,2 +1,2 @@ compile.on.save=true -user.properties.file=/home/boss/.netbeans/16/build.properties +user.properties.file=/home/docente/.netbeans/16/build.properties diff --git a/ClientPersistente/nbproject/private/private.xml b/ClientPersistente/nbproject/private/private.xml index 154201c..6807a2b 100644 --- a/ClientPersistente/nbproject/private/private.xml +++ b/ClientPersistente/nbproject/private/private.xml @@ -2,8 +2,6 @@ - - file:/home/boss/Progetti/Didattica_Socket/ClientPersistente/src/clientpersistente/ClientPersistente.java - + diff --git a/ClientPersistente/nbproject/project.properties b/ClientPersistente/nbproject/project.properties index 274cc6f..632c5a2 100644 --- a/ClientPersistente/nbproject/project.properties +++ b/ClientPersistente/nbproject/project.properties @@ -33,9 +33,11 @@ dist.javadoc.dir=${dist.dir}/javadoc dist.jlink.dir=${dist.dir}/jlink dist.jlink.output=${dist.jlink.dir}/ClientPersistente excludes= +file.reference.USocket.jar=../USocket/dist/USocket.jar includes=** jar.compress=false -javac.classpath= +javac.classpath=\ + ${file.reference.USocket.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false diff --git a/ClientSconnesso/nbproject/project.properties b/ClientSconnesso/nbproject/project.properties index 6ea5504..ffd0d11 100644 --- a/ClientSconnesso/nbproject/project.properties +++ b/ClientSconnesso/nbproject/project.properties @@ -34,10 +34,12 @@ dist.jlink.dir=${dist.dir}/jlink dist.jlink.output=${dist.jlink.dir}/ClientSconnesso excludes= file.reference.USocket.jar=/home/docente/Modelli/USocket.jar +file.reference.USocket.jar-1=../USocket/dist/USocket.jar includes=** jar.compress=false javac.classpath=\ - ${file.reference.USocket.jar} + ${file.reference.USocket.jar}:\ + ${file.reference.USocket.jar-1} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false diff --git a/ServerAccademico/nbproject/project.properties b/ServerAccademico/nbproject/project.properties index 12440bd..dc5fb1f 100644 --- a/ServerAccademico/nbproject/project.properties +++ b/ServerAccademico/nbproject/project.properties @@ -34,10 +34,12 @@ dist.jlink.dir=${dist.dir}/jlink dist.jlink.output=${dist.jlink.dir}/ServerAccademico excludes= file.reference.USocket.jar=lib/USocket.jar +file.reference.USocket.jar-1=../USocket/dist/USocket.jar includes=** jar.compress=false javac.classpath=\ - ${file.reference.USocket.jar} + ${file.reference.USocket.jar}:\ + ${file.reference.USocket.jar-1} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false diff --git a/ServerPersistente/nbproject/private/private.properties b/ServerPersistente/nbproject/private/private.properties index ea67f5f..1a2f6d1 100644 --- a/ServerPersistente/nbproject/private/private.properties +++ b/ServerPersistente/nbproject/private/private.properties @@ -1,2 +1,2 @@ compile.on.save=true -user.properties.file=/home/boss/.netbeans/16/build.properties +user.properties.file=/home/docente/.netbeans/16/build.properties diff --git a/ServerPersistente/nbproject/private/private.xml b/ServerPersistente/nbproject/private/private.xml index a879458..6807a2b 100644 --- a/ServerPersistente/nbproject/private/private.xml +++ b/ServerPersistente/nbproject/private/private.xml @@ -2,8 +2,6 @@ - - file:/home/boss/Progetti/Didattica_Socket/ServerPersistente/src/serverpersistente/ServerPersistente.java - + diff --git a/ServerPersistente/nbproject/project.properties b/ServerPersistente/nbproject/project.properties index fa69769..bccb567 100644 --- a/ServerPersistente/nbproject/project.properties +++ b/ServerPersistente/nbproject/project.properties @@ -33,9 +33,11 @@ dist.javadoc.dir=${dist.dir}/javadoc dist.jlink.dir=${dist.dir}/jlink dist.jlink.output=${dist.jlink.dir}/ServerPersistente excludes= +file.reference.USocket.jar=../USocket/dist/USocket.jar includes=** jar.compress=false -javac.classpath= +javac.classpath=\ + ${file.reference.USocket.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false diff --git a/ServerSconnesso/nbproject/project.properties b/ServerSconnesso/nbproject/project.properties index 8ca4f4c..9af524c 100644 --- a/ServerSconnesso/nbproject/project.properties +++ b/ServerSconnesso/nbproject/project.properties @@ -34,10 +34,12 @@ dist.jlink.dir=${dist.dir}/jlink dist.jlink.output=${dist.jlink.dir}/ServerSconnesso excludes= file.reference.USocket.jar=/home/docente/Modelli/USocket.jar +file.reference.USocket.jar-1=../USocket/dist/USocket.jar includes=** jar.compress=false javac.classpath=\ - ${file.reference.USocket.jar} + ${file.reference.USocket.jar}:\ + ${file.reference.USocket.jar-1} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false diff --git a/USocket/.gitignore b/USocket/.gitignore index 84c048a..f3d6549 100644 --- a/USocket/.gitignore +++ b/USocket/.gitignore @@ -1 +1 @@ -/build/ +/build/ \ No newline at end of file diff --git a/USocket/build.xml b/USocket/build.xml index abff3fe..c4ff8c3 100644 --- a/USocket/build.xml +++ b/USocket/build.xml @@ -70,4 +70,4 @@ nbproject/build-impl.xml file. --> - + \ No newline at end of file diff --git a/USocket/dist/USocket.jar b/USocket/dist/USocket.jar index acfd1ea92a694c89521664749b839fe24e611542..94d6d2832ed866c8b7ed44bc8edaf9897fe1dfa9 100644 GIT binary patch delta 193 zcmexh_`#4Tz?+$ci-CcIf#GB7L>^7152+i?g&CPXrcU-@Q~*(Vj5B1}g?R26qMp25$zX$(5XQ zB=s0r8T1+W7z`Oi7>pQH7)%(n8O#_A7|bW@adiQ$*}RKuISacL4Do Yh#PVXCNw|W<=1K$u08`F0lK=n! delta 193 zcmexh_`#4Tz?+$ci-CcIfq^|~B9A5$Thc~zVMZqQq{%*v3Lq+vQAdb9$vJGR^`u1) zfyzKwo?&vHgyQD2jNR;t{0y870u1~Nf(+6O!VJm`A`BV~VhmOc;tcK#k__Gq(vvGW z=SV6rureqz@PXx37*rV47_@=v3>Y*g>v44ft=YVbYdH_dx@2)npc^L76L$dd9*7%& VC?N?O4wxGzhe^1C#O6u_0|0P2C^P^7 diff --git a/USocket/nbproject/genfiles.properties b/USocket/nbproject/genfiles.properties index 15c6061..5af0dc3 100644 --- a/USocket/nbproject/genfiles.properties +++ b/USocket/nbproject/genfiles.properties @@ -1,6 +1,6 @@ build.xml.data.CRC32=73e21a97 build.xml.script.CRC32=905bb893 -build.xml.stylesheet.CRC32=f85dc8f2@1.102.0.48 +build.xml.stylesheet.CRC32=f85dc8f2@1.105.0.48 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=73e21a97 diff --git a/USocket/src/com/mirimatcode/UDatagram.java b/USocket/src/com/mirimatcode/UDatagram.java index 7781603..0656ac9 100644 --- a/USocket/src/com/mirimatcode/UDatagram.java +++ b/USocket/src/com/mirimatcode/UDatagram.java @@ -10,6 +10,13 @@ public class UDatagram { static final int dim_buffer = 1024; + /** + * Inizializza un DatagramSocket server in ascolto sulla porta scelta e restituisce il messaggio una volta ricevuto da remoto + * @param porta Porta che userà il server per rimanere in ascolto + * @return stringa contenente il messaggio ricevuto da remoto + * @throws SocketException + * @throws IOException + */ public static String listenString(int porta) throws SocketException, IOException { DatagramSocket server = new DatagramSocket(porta); @@ -27,6 +34,13 @@ public class UDatagram { return messaggio; } + /** + * Inizializza un DatagramSocket lato client che trasmette il messaggio scelto all'indirizzo e alla porta passata come parametro + * @param host Indirizzo IP del destinatario + * @param porta Porta del server remoto in ascolto + * @param messaggio Messaggio da trasmettere al server remoto + * @throws IOException + */ public static void writeString(String host, int porta, String messaggio) throws IOException { InetAddress destinatario = InetAddress.getByName(host);