From 9de19224178428f317ba27183ce30d46df99a82c Mon Sep 17 00:00:00 2001
From: E208633A <jolan.renoux@etu.univ-nantes.fr>
Date: Mon, 21 Jun 2021 11:02:08 +0200
Subject: [PATCH] jolan
---
.idea/battleship-student-project-2021.iml | 16 +++++++++++++++
src/info1/ships/NavyFleet.java | 24 +++++++++++------------
2 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/.idea/battleship-student-project-2021.iml b/.idea/battleship-student-project-2021.iml
index dace735..9f0a4e7 100644
--- a/.idea/battleship-student-project-2021.iml
+++ b/.idea/battleship-student-project-2021.iml
@@ -41,5 +41,21 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library" scope="TEST">
+ <library name="JUnit5.4">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.m2/repository/org/junit/jupiter/junit-jupiter/5.4.2/junit-jupiter-5.4.2.jar!/" />
+ <root url="jar://$USER_HOME$/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.4.2/junit-jupiter-api-5.4.2.jar!/" />
+ <root url="jar://$USER_HOME$/.m2/repository/org/apiguardian/apiguardian-api/1.0.0/apiguardian-api-1.0.0.jar!/" />
+ <root url="jar://$USER_HOME$/.m2/repository/org/opentest4j/opentest4j/1.1.1/opentest4j-1.1.1.jar!/" />
+ <root url="jar://$USER_HOME$/.m2/repository/org/junit/platform/junit-platform-commons/1.4.2/junit-platform-commons-1.4.2.jar!/" />
+ <root url="jar://$USER_HOME$/.m2/repository/org/junit/jupiter/junit-jupiter-params/5.4.2/junit-jupiter-params-5.4.2.jar!/" />
+ <root url="jar://$USER_HOME$/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.4.2/junit-jupiter-engine-5.4.2.jar!/" />
+ <root url="jar://$USER_HOME$/.m2/repository/org/junit/platform/junit-platform-engine/1.4.2/junit-platform-engine-1.4.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
</component>
</module>
\ No newline at end of file
diff --git a/src/info1/ships/NavyFleet.java b/src/info1/ships/NavyFleet.java
index 676ec5a..445e9d9 100644
--- a/src/info1/ships/NavyFleet.java
+++ b/src/info1/ships/NavyFleet.java
@@ -1,5 +1,8 @@
package info1.ships;
+import com.sun.tools.classfile.Opcode;
+
+import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -9,29 +12,24 @@ import java.util.Set;
public class NavyFleet implements INavyFleet {
- private Ship fleet[4];
-
-
-
+ ArrayList<ShipCategory> fleet;
/**
* NB : LA SIGNATURE DU CONSTRUCTEUR DOIT ETRE RESPECTEE
*
* Construit une nouvelle flotte
*/
- public NavyFleet(Ship s1,Ship s2,Ship s3,Ship s4,Ship s5) {
-
- this.fleet[0]=s1;
- this.fleet[1]=s2;
- this.fleet[2]=s3;
- this.fleet[3]=s4;
- this.fleet[4]=s5;
+ public NavyFleet() {
+ fleet = new ArrayList<ShipCategory>();
}
@Override
public int remainingSize() {
- // TODO
- return -1;
+ int tot = 20;
+ for (ship : fleet){
+ tot = tot - ship.getSize() ;
+ }
+ return tot;
}
@Override
--
GitLab