TD2: Simplify the object serialization trough socket.

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/TD2/IHM/SocketClient.java b/TD2/IHM/SocketClient.java
index 92c7412113f3b2107c0edef45823691430405cd6..d6db15dd2c2f609f4db5126777828a1314841c81 100644 (file)
--- a/TD2/IHM/SocketClient.java
+++ b/TD2/IHM/SocketClient.java
@@ -37,6 +37,20 @@ public class SocketClient {
         }
     }
 
+    public SocketClient(boolean withoStream) {
+        // établie une connexion au serveur par un appel
+        // à connexionServeur()
+        attributesInit();
+        try {
+            connexionServeur("localhost", 5000, withoStream);
+        }
+        catch (IOException e) {
+            System.err.println("IOException: " + e);
+            e.printStackTrace();
+            closeRWIO();
+        }
+    }
+
     private void connexionServeur(String adresseIPServeur, int portServeur, boolean hasoStream) throws IOException {
         // créer un objet socket lié au socket serveur et l'affecte à sock
         // puis établie les chaînages de flot nécessaires

diff --git a/TD2/IHM/ThreadIHMSend.java b/TD2/IHM/ThreadIHMSend.java
index f173996f1650ff4066190d42e713dbf29a27f18c..2b1a64aba6b80590f8505ed4dff8e70f8f764474 100644 (file)
--- a/TD2/IHM/ThreadIHMSend.java
+++ b/TD2/IHM/ThreadIHMSend.java
@@ -10,7 +10,6 @@ public class ThreadIHMSend implements Runnable {
     }
 
     public void run() {
-        BufferedReader userInput = null;
         try {
             boolean end = false;
             while (!end) {

diff --git a/TD2/client/Main.java b/TD2/client/Main.java
index 08300b7139c8f0b0236905b11561d8a19822862c..bd02ad4562eaf4a51a4ec7d86881b20464612969 100644 (file)
--- a/TD2/client/Main.java
+++ b/TD2/client/Main.java
@@ -78,7 +78,7 @@ public class Main {
                Thread thR = null;
 
                try {
-                       client = new SocketClient();
+                       client = new SocketClient(true);
                        thS = new Thread(new ThreadClientoSend(client));
                        thR = new Thread(new ThreadClientoReceive(client));
                        thS.setName("thoS");

diff --git a/TD2/client/SocketClient.java b/TD2/client/SocketClient.java
index 92c7412113f3b2107c0edef45823691430405cd6..15ed27935892cd325019bb81689a6ce69037323a 100644 (file)
--- a/TD2/client/SocketClient.java
+++ b/TD2/client/SocketClient.java
@@ -23,6 +23,20 @@ public class SocketClient {
         }
     }
 
+    public SocketClient(boolean withoStream) {
+        // établie une connexion au serveur par un appel
+        // à connexionServeur()
+        attributesInit();
+        try {
+            connexionServeur("localhost", 5000, withoStream);
+        }
+        catch (IOException e) {
+            System.err.println("IOException: " + e);
+            e.printStackTrace();
+            closeRWIO();
+        }
+    }
+
     public SocketClient(String adresseIPServeur, int portServeur) {
         // établie une connexion au serveur par un appel
         // à connexionServeur()

diff --git a/TD2/server/Main.java b/TD2/server/Main.java
index c951e81a1a951ea0a1114924bef6894990b3c368..ab049220967c1e0a74cb13e074363973cf64613d 100644 (file)
--- a/TD2/server/Main.java
+++ b/TD2/server/Main.java
@@ -5,15 +5,16 @@ public class Main {
        public static void main(String[] args) {
                ServerSocket listenSocket = null;
                try {
+                       int servPort = Integer.parseInt(args[0]);
                        System.out.println("Demarrage du serveur sur le port "
-                                                               + Integer.parseInt(args[0]) + " et en attente de connexion :");
-                       listenSocket = new ServerSocket(Integer.parseInt(args[0])); // port
+                                                               + servPort + " et en attente de connexion :");
+                       listenSocket = new ServerSocket(servPort); // port
                        while (true) { // le dispatcher est le thread qui execute main()
                                Socket clientSocket = listenSocket.accept();
                                System.out.println("Connexion de :" + clientSocket.getInetAddress());
                                //Launch the text broadcasting server
                                Thread serviceThread = new Thread(new BroadcastThreadService(clientSocket));
-                               //Or lauch the object broadcasting server
+                               //Or launch the object broadcasting server
                                //Thread serviceThread = new Thread(new BroadcastoThreadService(clientSocket));
                                serviceThread.start();
                        }