Merge pull request #3 from nguyenj-c/ZooFinal

Zoo final
nguyenj-c · Dec 23, 2021 · c5d6671 · c5d6671
2 parents 3eb1dd7 + f4a66f5
commit c5d6671
Show file tree

Hide file tree

Showing 125 changed files with 9,308 additions and 3,297 deletions.
diff --git a/..._Beta/Projet_Zoo/bin/Animaux/Aigles.class → ...tophe/Projet_Zoo/bin/Animaux/Aigles.class b/..._Beta/Projet_Zoo/bin/Animaux/Aigles.class → ...tophe/Projet_Zoo/bin/Animaux/Aigles.class
diff --git a/...ojet_Zoo/bin/Animaux/AnimalRegistry.class → ...ojet_Zoo/bin/Animaux/AnimalRegistry.class b/...ojet_Zoo/bin/Animaux/AnimalRegistry.class → ...ojet_Zoo/bin/Animaux/AnimalRegistry.class
diff --git a/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Animaux/Animaux.class b/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Animaux/Animaux.class
diff --git a/...eta/Projet_Zoo/bin/Animaux/Baleines.class → ...phe/Projet_Zoo/bin/Animaux/Baleines.class b/...eta/Projet_Zoo/bin/Animaux/Baleines.class → ...phe/Projet_Zoo/bin/Animaux/Baleines.class
diff --git a/..._Zoo/bin/Animaux/Especes/Mammiferes.class → ..._Zoo/bin/Animaux/Especes/Mammiferes.class b/..._Zoo/bin/Animaux/Especes/Mammiferes.class → ..._Zoo/bin/Animaux/Especes/Mammiferes.class
diff --git a/...ojet_Zoo/bin/Animaux/Especes/Marins.class → ...ojet_Zoo/bin/Animaux/Especes/Marins.class b/...ojet_Zoo/bin/Animaux/Especes/Marins.class → ...ojet_Zoo/bin/Animaux/Especes/Marins.class
diff --git a/...jet_Zoo/bin/Animaux/Especes/Volants.class → ...jet_Zoo/bin/Animaux/Especes/Volants.class b/...jet_Zoo/bin/Animaux/Especes/Volants.class → ...jet_Zoo/bin/Animaux/Especes/Volants.class
diff --git a/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Animaux/Loups.class b/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Animaux/Loups.class
diff --git a/...ps_Beta/Projet_Zoo/bin/Animaux/Ours.class → ...istophe/Projet_Zoo/bin/Animaux/Ours.class b/...ps_Beta/Projet_Zoo/bin/Animaux/Ours.class → ...istophe/Projet_Zoo/bin/Animaux/Ours.class
diff --git a/...ta/Projet_Zoo/bin/Animaux/Pingouins.class → ...he/Projet_Zoo/bin/Animaux/Pingouins.class b/...ta/Projet_Zoo/bin/Animaux/Pingouins.class → ...he/Projet_Zoo/bin/Animaux/Pingouins.class
diff --git a/...jet_Zoo/bin/Animaux/Poissons_Rouges.class → ...jet_Zoo/bin/Animaux/Poissons_Rouges.class b/...jet_Zoo/bin/Animaux/Poissons_Rouges.class → ...jet_Zoo/bin/Animaux/Poissons_Rouges.class
diff --git a/...Beta/Projet_Zoo/bin/Animaux/Requins.class → ...ophe/Projet_Zoo/bin/Animaux/Requins.class b/...Beta/Projet_Zoo/bin/Animaux/Requins.class → ...ophe/Projet_Zoo/bin/Animaux/Requins.class
diff --git a/...nimaux/SimulationLoups/ColonieLoups.class → ...nimaux/SimulationLoups/ColonieLoups.class b/...nimaux/SimulationLoups/ColonieLoups.class → ...nimaux/SimulationLoups/ColonieLoups.class
diff --git a/...Animaux/SimulationLoups/CoupleLoups.class → ...Animaux/SimulationLoups/CoupleLoups.class b/...Animaux/SimulationLoups/CoupleLoups.class → ...Animaux/SimulationLoups/CoupleLoups.class
diff --git a/...oups_Beta/Projet_Zoo/bin/Zoo/assets.class → ...n/Animaux/SimulationLoups/LoupsSpec.class b/...oups_Beta/Projet_Zoo/bin/Zoo/assets.class → ...n/Animaux/SimulationLoups/LoupsSpec.class
diff --git a/.../Animaux/SimulationLoups/MeuteLoups.class → .../Animaux/SimulationLoups/MeuteLoups.class b/.../Animaux/SimulationLoups/MeuteLoups.class → .../Animaux/SimulationLoups/MeuteLoups.class
diff --git a/..._Beta/Projet_Zoo/bin/Animaux/Tigres.class → ...tophe/Projet_Zoo/bin/Animaux/Tigres.class b/..._Beta/Projet_Zoo/bin/Animaux/Tigres.class → ...tophe/Projet_Zoo/bin/Animaux/Tigres.class
diff --git a/...Zoo/bin/Enclos/Enclos$degreProprete.class → ...Zoo/bin/Enclos/Enclos$degreProprete.class b/...Zoo/bin/Enclos/Enclos$degreProprete.class → ...Zoo/bin/Enclos/Enclos$degreProprete.class
diff --git a/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Enclos/Enclos.class b/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Enclos/Enclos.class
diff --git a/...rojet_Zoo/bin/Enclos/EnclosAquarium.class → ...rojet_Zoo/bin/Enclos/EnclosAquarium.class b/...rojet_Zoo/bin/Enclos/EnclosAquarium.class → ...rojet_Zoo/bin/Enclos/EnclosAquarium.class
diff --git a/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Enclos/EnclosLoups.class b/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Enclos/EnclosLoups.class
diff --git a/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Enclos/EnclosRegistry.class b/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Enclos/EnclosRegistry.class
diff --git a/...rojet_Zoo/bin/Enclos/EnclosVolieres.class → ...rojet_Zoo/bin/Enclos/EnclosVolieres.class b/...rojet_Zoo/bin/Enclos/EnclosVolieres.class → ...rojet_Zoo/bin/Enclos/EnclosVolieres.class
diff --git a/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Game/Menu/menuAnimaux.class b/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Game/Menu/menuAnimaux.class
diff --git a/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Game/Menu/menuEmploye.class b/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Game/Menu/menuEmploye.class
diff --git a/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Game/Menu/menuEnclos.class b/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Game/Menu/menuEnclos.class
diff --git a/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Game/Menu/menuLoups.class b/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Game/Menu/menuLoups.class
diff --git a/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Game/Menu/menuZoo.class b/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Game/Menu/menuZoo.class
diff --git a/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Game/initGame.class b/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Game/initGame.class
diff --git a/...Loups_Beta/Projet_Zoo/bin/Game/main.class → ...Christophe/Projet_Zoo/bin/Game/main.class b/...Loups_Beta/Projet_Zoo/bin/Game/main.class → ...Christophe/Projet_Zoo/bin/Game/main.class
diff --git a/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Zoo/Employe.class b/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Zoo/Employe.class
diff --git a/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Zoo/Zoo.class b/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/Zoo/Zoo.class
diff --git a/...ups_Beta/Projet_Zoo/bin/module-info.class → ...ristophe/Projet_Zoo/bin/module-info.class b/...ups_Beta/Projet_Zoo/bin/module-info.class → ...ristophe/Projet_Zoo/bin/module-info.class
diff --git a/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/test/test.class b/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/bin/test/test.class
diff --git a/...s_Beta/Projet_Zoo/src/Animaux/Aigles.java → ...stophe/Projet_Zoo/src/Animaux/Aigles.java b/...s_Beta/Projet_Zoo/src/Animaux/Aigles.java → ...stophe/Projet_Zoo/src/Animaux/Aigles.java
@@ -10,7 +10,8 @@ public class Aigles extends Animaux implements Volants {
 
 	/**
 	 * Constructeur d'aigles
-	 * @param name
+	 *
+	 * @param name de l'aigle
 	 */
 	public Aigles(String name) {
 		super(name);
@@ -21,9 +22,9 @@ public Aigles(String name) {
 	 */
 	@Override
 	public void reproduire() {
-		if(this.isSexe() == false) {
+		if (!this.isSexe()) {
 			System.out.println("Je ponds un oeuf");
-		}else {
+		} else {
 			System.out.println("Je peux pas pondre car je suis un male");
 		}
 	}
@@ -38,9 +39,12 @@ public void deplacement() {
 
 	/**
 	 * Espèce de l'animal
-	 * @return string
+	 *
+	 * @return String
 	 */
 	@Override
-	public String getSpecies() {return "Aigle";}
+	public String getSpecies() {
+		return "Aigle";
+	}
 
 }
diff --git a/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/src/Animaux/AnimalRegistry.java b/Khalil_Mohamed-Nguyen_Jean-Christophe/Projet_Zoo/src/Animaux/AnimalRegistry.java
@@ -0,0 +1,56 @@
+/**
+ * @author Nguyen, Khalil
+ *
+ */
+package Animaux;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public final class AnimalRegistry {
+
+	private static final Map<Class<? extends Animaux>, List<Animaux>> ANIMAL_REGISTRY = new HashMap<>();
+
+	/**
+	 * Ajoute l'animal au registre
+	 *
+	 * @param animal à enregistrer
+	 */
+	public static void registerAnimal(Animaux animal) {
+		if (animal == null)
+			return;
+
+		assertClassExists(animal.getClass());
+		ANIMAL_REGISTRY.get(animal.getClass()).add(animal);
+	}
+
+	/**
+	 * Enlève l'animal du registre
+	 *
+	 * @param animal à supprimer du registre
+	 */
+	public static void unregisterAnimal(Animaux animal) {
+		if (animal != null && ANIMAL_REGISTRY.containsKey(animal.getClass())) {
+			ANIMAL_REGISTRY.get(animal.getClass()).remove(animal);
+		}
+	}
+
+	private static void assertClassExists(Class<? extends Animaux> especes) {
+		ANIMAL_REGISTRY.putIfAbsent(especes, new ArrayList<>());
+	}
+
+	/**
+	 * Renvoie la liste d'animaux par classe
+	 *
+	 * @param especes type d'animaux
+	 * @return List
+	 */
+	public static List<Animaux> getRegisteredAnimalsByClass(Class<? extends Animaux> especes) {
+		if (especes != null && ANIMAL_REGISTRY.containsKey(especes)) {
+			return ANIMAL_REGISTRY.get(especes);
+		}
+		return null;
+	}
+}