jolan fleet avancement2

src/info1/ships/NavyFleet.java

@@ -38,7 +38,7 @@ public class NavyFleet implements INavyFleet {
 
     @Override
     public int add(IShip ship) {
-        if(isinfleet(ship))
+        if(fleet.contains(ship))
             return -2;
         else if(remainingSize() - ship.getSize() < 0)
             return -1;
@@ -48,14 +48,6 @@ public class NavyFleet implements INavyFleet {
         }
     }
 
-    public boolean isinfleet(IShip shipp){
-        for (IShip ship : fleet){
-            if(ship.equals(shipp))
-                return true;
-        }
-        return false;
-    }
-
     @Override
     public List<IShip> getShips() {
         //TODO trie
@@ -64,19 +56,19 @@ public class NavyFleet implements INavyFleet {
 
     @Override
     public Set<IShip> getShips(ShipCategory shipCategory) {
-        // TODO
+        // TODO ?
         return null;
     }
 
     @Override
     public boolean isBelgianConfiguration() {
-        // TODO
+        // TODO verifier: 1 cuirassee(5), 1 croiseur(4), 2 contre torpille(3), 1 torpilleur(2)
         return false;
     }
 
     @Override
     public boolean isFrenchConfiguration() {
-        // TODO
+        // TODO verifier 1 cuirassee(5), 2 croiseur(4), 3 torpilleur(2), 4 sous marin(1)
         return false;
     }