Merge remote-tracking branch 'origin/master' into master

# Conflicts:
#	src/info1/ships/Ship.java

src/info1/ships/Ship.java

@@ -76,20 +76,9 @@ public abstract class Ship implements IShip {
 
     @Override
     public String toString() {
-
-
-
-
-        /*"{\"bateau\":\"cruiser\"," +
-                "\"coordonnees\":[{\"x\":4,\"y\":9}," +
-                "{\"x\":5,\"y\":9}," +
-                "{\"x\":6,\"y\":9}]}",
-                jObj.toString()
-
-
-        return "bateau:" + this.name + "," + "coordonnees:[{x:" + this.cord1.getX() + ",y:" + this.cord1.getY() + "}," ;
-        */
-        return null;
+        if (cord1.toString().equals(cord2.toString()))
+            return this.name + cord1.toString();
+        return this.name + cord1.toString() + cord2.toString();
     }
 
     @Override
@@ -97,9 +86,7 @@ public abstract class Ship implements IShip {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         Ship ship = (Ship) o;
-        return Objects.equals(name, ship.name) &&
-                Objects.equals(cord1, ship.cord1) &&
-                Objects.equals(cord2, ship.cord2);
+        return Objects.equals(name, ship.name) && Objects.equals(cord1, ship.cord1) && Objects.equals(cord2, ship.cord2);
     }
 
     @Override