Fixed disconnection issue

jberclaz · Apr 11, 2020 · 2ef3fd9 · 2ef3fd9
1 parent f8ba656
commit 2ef3fd9
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 4 deletions.
diff --git a/src/main/java/com/leflat/jass/client/ClientNetwork.java b/src/main/java/com/leflat/jass/client/ClientNetwork.java
@@ -65,6 +65,7 @@ public boolean isConnected() {
     public void disconnect() {
         try {
             clientSocket.close();
+            clientSocket = null;
         } catch (IOException e) {
             e.printStackTrace();
         }

diff --git a/src/main/java/com/leflat/jass/client/JassFrame.java b/src/main/java/com/leflat/jass/client/JassFrame.java
@@ -128,7 +128,7 @@ private void jButtonConnectActionPerformed() {
             }
             int gameId = myself.connect(dc.name, dc.host, dc.gameId);
             if (gameId >= 0) {
-                jButtonConnect.setText("Déconnexion");
+                jButtonConnect.setText("Quitter");
                 setGameId(gameId);
             } else {
                 JOptionPane.showMessageDialog(null, "La connection a échoué.", "Erreur", JOptionPane.ERROR_MESSAGE);
@@ -292,6 +292,12 @@ public void setAnnouncementEnabled(boolean enable) {
         jButtonAnounce.setEnabled(enable);
     }
 
+    @Override
+    public void lostServerConnection() {
+         JOptionPane.showMessageDialog(this, "Le connexion au serveur a échoué. La partie est terminée.", "Serveur déconnecté", JOptionPane.ERROR_MESSAGE);
+         disconnect();
+    }
+
     @Override
     public boolean hasPlayerAnnounced() {
         return announcementPressed;

diff --git a/src/main/java/com/leflat/jass/client/JassPlayer.java b/src/main/java/com/leflat/jass/client/JassPlayer.java
@@ -258,6 +258,12 @@ public void playerLeft(BasePlayer player) {
         disconnect();
     }
 
+    @Override
+    public void lostServerConnection() {
+        disconnect();
+        frame.lostServerConnection();
+    }
+
     @Override
     public int connect(String name, String host, int gameId) {
         network = networkFactory.getClientNetwork();
@@ -281,12 +287,12 @@ public int connect(String name, String host, int gameId) {
     @Override
     public boolean disconnect() {
         controller.terminate();
+        network.disconnect();
         try {
-            controllerThread.join();
+            controllerThread.join(500);
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        network.disconnect();
         controller = null;
         controllerThread = null;
         return true;

diff --git a/src/main/java/com/leflat/jass/client/RemoteController.java b/src/main/java/com/leflat/jass/client/RemoteController.java
@@ -38,8 +38,8 @@ public void run() {
                 handleControllerMessage(message.split(" "));
             } catch (ServerDisconnectedException e) {
                 e.printStackTrace();
+                player.lostServerConnection();
                 running = false;
-                // TODO: player.serverDisconnected
             }
         }
         System.out.println("Exiting listener ");

diff --git a/src/main/java/com/leflat/jass/common/IJassUi.java b/src/main/java/com/leflat/jass/common/IJassUi.java
@@ -54,5 +54,7 @@ public interface IJassUi {
     void canceledGame(int leavingPlayerPosition);
 
     void setAnnouncementEnabled(boolean enable);
+
+    void lostServerConnection();
 }
 
diff --git a/src/main/java/com/leflat/jass/common/IPlayer.java b/src/main/java/com/leflat/jass/common/IPlayer.java
@@ -42,4 +42,6 @@ public interface IPlayer {
     boolean getNewGame() throws PlayerLeftExpection;
 
     void playerLeft(BasePlayer player) throws PlayerLeftExpection;
+
+    void lostServerConnection();
 }
diff --git a/src/main/java/com/leflat/jass/server/RemotePlayer.java b/src/main/java/com/leflat/jass/server/RemotePlayer.java
@@ -169,6 +169,11 @@ public void playerLeft(BasePlayer player) throws PlayerLeftExpection {
         network.receiveMessage();
     }
 
+    @Override
+    public void lostServerConnection() {
+
+    }
+
     private void updatePlayerInfo() throws PlayerLeftExpection {
         network.sendMessage(String.valueOf(id));
         this.name = network.receiveMessage()[0];

diff --git a/src/main/java/com/leflat/jass/test/MockUi.java b/src/main/java/com/leflat/jass/test/MockUi.java
@@ -159,6 +159,11 @@ public void setAnnouncementEnabled(boolean enable) {
 
     }
 
+    @Override
+    public void lostServerConnection() {
+
+    }
+
     private void waitSec(float seconds) {
         if (seconds <= 0) {
             return;

diff --git a/src/test/java/MockRemotePlayer.java b/src/test/java/MockRemotePlayer.java
@@ -134,4 +134,9 @@ public boolean getNewGame() {
     public void playerLeft(BasePlayer player) {
 
     }
+
+    @Override
+    public void lostServerConnection() {
+
+    }
 }