Final commit

Battleship/pom.xml

@@ -20,8 +20,37 @@
         <name>lo23</name>
     </organization>
 
+<reporting>
+  <plugins>
+    <plugin>
+      <groupId>org.codehaus.mojo</groupId>
+      <artifactId>cobertura-maven-plugin</artifactId>
+      <version>2.4</version>
+    </plugin>
+  </plugins>
+</reporting>
+
     <build>
         <plugins>
+             <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <version>0.7.0.201403182114</version>
+            <executions>
+                <execution>
+                    <goals>
+                        <goal>prepare-agent</goal>
+                    </goals>
+                </execution>
+                <execution>
+                    <id>report</id>
+                    <phase>prepare-package</phase>
+                    <goals>
+                        <goal>report</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -155,6 +184,7 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <properties>
+               
                 <sonar.host.url>https://sonarcloud.io</sonar.host.url>
                 <sonar.organization>lo23</sonar.organization>
                 <sonar.login>a7f86fb85267f6c368ef07d969a16ccf4be0db4b</sonar.login>

Battleship/src/main/java/com/utclo23/battleship/GameException.java

@@ -12,8 +12,6 @@ package com.utclo23.battleship;
  */
 public class GameException extends Exception {
 
-    public GameException() {
-    }
   
     public GameException(String message) {
         super(message);

Battleship/src/main/java/com/utclo23/com/ComFacade.java

@@ -10,7 +10,6 @@ import com.utclo23.data.structure.Mine;
 import com.utclo23.data.structure.StatGame;
 import com.utclo23.com.messages.*;
 import com.utclo23.data.facade.IDataCom;
-import com.utclo23.data.structure.Game;
 import com.utclo23.data.structure.LightPublicUser;
 import java.net.Inet4Address;
 import java.net.InterfaceAddress;
@@ -118,9 +117,9 @@ public class ComFacade {
      */
     public void notifyNewCoordinates(Mine mine, List<LightPublicUser> recipients) {             
         M_PlaceMine mPlaceMine = new M_PlaceMine(iDataCom.getMyPublicUserProfile(), mine);
-        System.out.println("recipients notify: " + recipients.size());
+        System.out.println("recipients new coordinates notify: " + recipients.size());
         for (LightPublicUser recipient : recipients) {      
-            System.out.println("notifyNewCoordinates +" + recipient.getPlayerName());
+            System.out.println("notifyNewCoordinates +" + recipient.getPlayerName()+" mine "+mine.getCoord().getX()+" "+mine.getCoord().getY());
             if (kIpCtrl.getHashMap().get(recipient.getId()) != null) {
                 Sender os = new Sender(kIpCtrl.getHashMap().get(recipient.getId()).getHostAddress(), kIpCtrl.getPort(), mPlaceMine);
                 new Thread(os).start();
@@ -159,13 +158,14 @@ public class ComFacade {
     }
 
     /**
-     * Called to send "leave game" notification to everybody.
+     * Called to send "leave game" notification to all users in the game.
+     * @param recipients: receivers of the notification
      */
-    public void leaveGame() {
+    public void leaveGame(List<LightPublicUser> recipients) {
         M_LeaveGame mLeaveGame = new M_LeaveGame(iDataCom.getMyPublicUserProfile());
-        for (Inet4Address ip : kIpCtrl.getHashMap().values()) {
-            if (ip != null) {
-                Sender os = new Sender(ip.getHostAddress(), kIpCtrl.getPort(), mLeaveGame);
+        for (LightPublicUser recipient : recipients) {      
+            if (kIpCtrl.getHashMap().get(recipient.getId()) != null) {
+                Sender os = new Sender(kIpCtrl.getHashMap().get(recipient.getId()).getHostAddress(), kIpCtrl.getPort(), mLeaveGame);
                 new Thread(os).start();
             }
         }       
@@ -243,4 +243,20 @@ public class ComFacade {
             Logger.getLogger(ComFacade.class.getName()).log(Level.INFO, null, "Fail joinGame");
         }
     }
+    
+    /**
+     * Called to remove a game given in parameter in the game's list of all
+     * connected users
+     * @param idGame is the game to remove
+     */
+    public void removeGame(String idGame){
+        M_RemoveGame m_RemoveGame = new M_RemoveGame(iDataCom.getMyPublicUserProfile(), idGame);
+        for (Inet4Address ip : kIpCtrl.getHashMap().values()) {
+            if (ip != null) {
+                Sender os = new Sender(ip.getHostAddress(), kIpCtrl.getPort(), m_RemoveGame);
+                Thread thread = new Thread(os);
+                thread.start();
+            }
+        }
+    }
 }

Battleship/src/main/java/com/utclo23/com/KnownIPController.java

@@ -9,7 +9,6 @@ import java.util.HashMap;
 import java.net.Inet4Address;
 import com.utclo23.data.facade.IDataCom;
 import java.net.InterfaceAddress;
-import java.util.Iterator;
 
 /**
  * Class containing a hashmap with UID and corresponding IP address of the known

Battleship/src/main/java/com/utclo23/com/messages/M_Bleu.java

@@ -41,7 +41,8 @@ public class M_Bleu extends Message {
 
     @Override
     public void callback(IDataCom iDataCom) {
-        Logger.getLogger(M_Bleu.class.getName()).log(Level.INFO, null, "Blue message received");
+        
+        if(iDataCom.getMyPublicUserProfile() != null){        
             List<String> myUsersId = new ArrayList(KnownIPController.getInstance().getHashMap().keySet());
             List<LightPublicUser> myUsersProfile = new ArrayList(iDataCom.getConnectedUsers());
 
@@ -69,16 +70,16 @@ public class M_Bleu extends Message {
                 }
             }
 
-        // Envoi message rouge à ceux non déjà présents dans nos joueurs connectés
+            // Envoi message rouge à tout le monde sauf nous. 
             for (Map.Entry<String, Inet4Address> entry : this.hashMapReceived.entrySet()) {
-            if (!entry.getKey().equals(iDataCom.getMyPublicUserProfile().getId())
-                    && !myUsersId.contains(entry.getKey())) {
+                if (!entry.getKey().equals(iDataCom.getMyPublicUserProfile().getId())) {
+                    if(!myUsersId.contains(entry.getKey())) {                  
+                        newPairs.put(entry.getKey(), entry.getValue());
+                    }
                     M_Rouge mRouge = new M_Rouge(iDataCom.getMyPublicUserProfile(), tmpHash, tmp, iDataCom.getGameList());
                     Sender os = new Sender(entry.getValue().getHostAddress(), KnownIPController.getInstance().getPort(), mRouge);
                     Thread thread = new Thread(os);
                     thread.start();
-
-                newPairs.put(entry.getKey(), entry.getValue());
                 }
             }
 
@@ -103,4 +104,5 @@ public class M_Bleu extends Message {
                 iDataCom.addConnectedUser(key);
             }
         }
+    }
 }

Battleship/src/main/java/com/utclo23/com/messages/M_RemoveGame.java

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.utclo23.com.messages;
+
+import com.utclo23.data.facade.IDataCom;
+import com.utclo23.data.structure.PublicUser;
+
+/**
+ * M_LeaveGame is a Message generated when a user wants to leave a game.
+ * @author Thibault CHICHE
+ */
+public class M_RemoveGame extends Message {
+    private final String idGame;
+    /**
+     * Constructor.
+     * @param user is the message's sender
+     * @param idGame is the id of the game to remove
+     */
+    public M_RemoveGame(PublicUser user, String idGame){
+        super(user);
+        this.idGame = idGame;
+    }
+    
+    @Override
+    public void callback(IDataCom iDataCom){
+        iDataCom.removeGame(idGame);
+    }
+}

Battleship/src/main/java/com/utclo23/data/configuration/Configuration.java

@@ -14,15 +14,16 @@ import java.io.File;
  */
 public class Configuration {
 
-    public Configuration() {
-    }
+   
     
     /**
      * directory of saved profiles
      */
-    public final static String SAVE_DIR = System.getProperty("user.home")+File.separator+"MyData";
-    public final static int WIDTH  = 10;
-    public final static int HEIGHT = 10;
+    public static final String SAVE_DIR = System.getProperty("user.home")+File.separator+"MyData";
+    public static final int WIDTH  = 10;
+    public static final int HEIGHT = 10;
+    public static final String PLAYER = "player";
+    public static final String SPECTATOR = "spectator";
     
     
 }

Battleship/src/main/java/com/utclo23/data/facade/IDataCom.java

@@ -7,8 +7,6 @@ package com.utclo23.data.facade;
 
 import com.utclo23.data.module.DataException;
 import com.utclo23.data.structure.*;
-import java.net.NetworkInterface;
-import java.rmi.server.UID;
 import java.util.List;
 
 /**
@@ -17,21 +15,96 @@ import java.util.List;
  */
 public interface IDataCom {
    
+    /**
+     *
+     * @param game
+     */
     public void addNewGame(StatGame game);
+    public void removeGame(String id);
+    /**
+     *
+     * @param ships
+     */
     public void setEnnemyShips(List<Ship> ships);
+
+    /**
+     *
+     * @param mine
+     */
     public void forwardCoordinates(Mine mine);
+
+    /**
+     *
+     */
     public void opponentHasLeftGame();
+
+    /**
+     *
+     */
     public void connectionLostWithOpponent();
+
+    /**
+     *
+     * @param user
+     */
     public void addConnectedUser(LightPublicUser user);
+
+    /**
+     *
+     * @param user
+     */
     public void removeConnectedUser(LightPublicUser user);
+
+    /**
+     *
+     * @param msg
+     */
     public void forwardMessage(Message msg);
+
+    /**
+     *
+     * @return
+     */
     public PublicUser getMyPublicUserProfile();
 
+    /**
+     *
+     * @param user
+     * @param id
+     * @param role
+     * @throws DataException
+     */
     public void updateGameList(LightPublicUser user, String id, String role) throws DataException;
+
+    /**
+     *
+     * @return
+     */
     public List<StatGame> getGameList();
+
+    /**
+     *
+     * @return
+     */
     public List<LightPublicUser> getConnectedUsers();
+
+    /**
+     *
+     * @throws DataException
+     */
     public void connectionImpossible() throws DataException;
+
+    /**
+     *
+     * @param game
+     * @throws DataException
+     */
     public void receptionGame(Game game) throws DataException;
+
+    /**
+     *
+     * @param profile
+     */
     public void receivePublicUserProfile(PublicUser profile);
 
 }

Battleship/src/main/java/com/utclo23/data/facade/IDataIHMMain.java

@@ -8,7 +8,6 @@ package com.utclo23.data.facade;
 import com.utclo23.data.module.DataException;
 import com.utclo23.data.structure.*;
 import java.net.InterfaceAddress;
-import java.rmi.server.UID;
 import java.util.List;
 import java.util.Date;
 
@@ -18,37 +17,192 @@ import java.util.Date;
  */
 public interface IDataIHMMain {
 
+    /**
+     *
+     * @param playerName
+     * @param password
+     * @param firstName
+     * @param lastName
+     * @param birthDate
+     * @param imageFile
+     * @throws DataException
+     */
     public void createUser(String playerName, String password, String firstName, String lastName, Date birthDate, String imageFile) throws DataException;
+
+    /**
+     *
+     * @param password
+     * @param firstName
+     * @param lastName
+     * @param birthDate
+     * @param imageFile
+     * @throws DataException
+     */
     public void updateUser(String password, String firstName, String lastName, Date birthDate, String imageFile) throws DataException;
+
+    /**
+     *
+     * @param id
+     */
     public void askPublicUserProfile(String id);
     
+    /**
+     *
+     * @return
+     */
     public List<StatGame> getGameList();
     
+    /**
+     *
+     * @param name
+     * @param computerMode
+     * @param spectator
+     * @param spectatorChat
+     * @param type
+     * @return
+     * @throws DataException
+     */
     public Game createGame(String name, boolean computerMode, boolean spectator, boolean spectatorChat, GameType type) throws DataException;
+
+    /**
+     *
+     * @param username
+     * @param password
+     * @throws DataException
+     */
     public void signin(String username, String password) throws DataException;
-    public void signOut() throws Exception;
+
+    /**
+     *
+     * @throws DataException
+     */
+    public void signOut() throws DataException;
+
+    /**
+     *
+     * @return
+     */
     public List<LightPublicUser> getConnectedUsers();
+
+    /**
+     *
+     * @return
+     */
     public PublicUser getMyPublicUserProfile();
 
+    /**
+     *
+     * @return
+     */
     public Owner getMyOwnerProfile();
     
+    /**
+     *
+     * @return
+     */
     public List<String> getIPDiscovery();
+
+    /**
+     *
+     * @param discoveryNodes
+     * @throws DataException
+     */
     public void setIPDiscovery(List<String> discoveryNodes) throws DataException;
     
+    /**
+     *
+     * @param id
+     * @param role
+     */
     public void gameConnectionRequestGame(String id, String role);
 
+    /**
+     *
+     * @param netinterface
+     */
+    public void setNetworkInterface(InterfaceAddress netinterface);
      
-    public void setNetworkInterface(InterfaceAddress net_interface) ;
-     
+    /**
+     *
+     * @param playername
+     * @throws DataException
+     */
     public void updatePlayername(String playername) throws DataException;
+
+    /**
+     *
+     * @param firstname
+     * @throws DataException
+     */
     public void updateFirstname(String firstname) throws DataException;
+
+    /**
+     *
+     * @param lastname
+     * @throws DataException
+     */
     public void updateLastname(String lastname) throws DataException;
+
+    /**
+     *
+     * @param birthdate
+     * @throws DataException
+     */
     public void updateBirthdate(Date birthdate) throws DataException;
+
+    /**
+     *
+     * @param fileImage
+     * @throws DataException
+     */
     public void updateFileImage(String fileImage) throws DataException;
+
+    /**
+     *
+     * @param password
+     * @throws DataException
+     */
     public void updatePassword(String password) throws DataException;
 
-    public int getNumberVictories() throws DataException;
-    public int getNumberDefeats() throws DataException;
-    public int getNumberAbandons() throws DataException;
+    /**
+     *
+     * @return
+     * @throws DataException
+     */
+    public int getNumberVictoriesClassic() throws DataException;
+
+    /**
+     *
+     * @return
+     * @throws DataException
+     */
+    public int getNumberDefeatsClassic() throws DataException;
+
+    /**
+     *
+     * @return
+     * @throws DataException
+     */
+    public int getNumberAbandonsClassic() throws DataException;
    
+    /**
+     *
+     * @return
+     * @throws DataException
+     */
+    public int getNumberVictoriesBelgian() throws DataException;
+
+    /**
+     *
+     * @return
+     * @throws DataException
+     */
+    public int getNumberDefeatsBelgian() throws DataException;
+
+    /**
+     *
+     * @return
+     * @throws DataException
+     */
+    public int getNumberAbandonsBelgian() throws DataException;
 }

Battleship/src/main/java/com/utclo23/data/facade/IDataIHMTable.java

@@ -7,27 +7,78 @@ package com.utclo23.data.facade;
 
 import com.utclo23.data.module.DataException;
 import com.utclo23.data.structure.*;
-import java.rmi.server.UID;
 import java.util.List;
 import javafx.util.Pair;
 
-import java.io.IOException;
 
 /**
  *
  * @author Davy
  */
 public interface IDataIHMTable {
+
+    /**
+     *
+     * @return
+     * @throws DataException
+     */
     public List<Ship> getTemplateShips() throws DataException;
+
+    /**
+     *
+     * @param ship
+     * @throws DataException
+     */
     public void setShip(Ship ship) throws DataException;
     
+    /**
+     *
+     * @param coords
+     * @param isAttack
+     * @param playerWhoPutTheMine
+     * @return
+     */
     public Pair<Integer, Ship> attack(Coordinate coords, boolean isAttack, Player playerWhoPutTheMine);
+
+    /**
+     *
+     */
     public void leaveGame();
 
+    /**
+     *
+     * @param gameid
+     * @return
+     */
     public List<Ship> getInitialBoardFromGameId(String gameid);
+
+    /**
+     *
+     * @return
+     */
     public List<Event> getPreviousBoard();
+
+    /**
+     *
+     * @return
+     */
     public List<Event> getNextBoard();
+
+    /**
+     *
+     * @param text
+     */