Merge pull request #75 from vmarchaud/master

last merge was not a good idea : rewrite PokemonFamilyMap

Author: Grover-c13

src/main/java/com/pokegoapi/api/pokemon/PokemonFamilyMap.java

@@ -7,15 +7,14 @@
 import java.util.EnumMap;
 
 public class PokemonFamilyMap {
-	private static EnumMap<PokemonId, PokemonFamilyId> map;
+	
+	private static EnumMap<PokemonId, PokemonFamilyId> map = new EnumMap<PokemonId, PokemonFamilyId>(PokemonId.class);
 
-
-	private static void registerValues() {
-		map = new EnumMap<PokemonId, PokemonFamilyId>(PokemonId.class);
+	static {
 		map.put(PokemonId.BULBASAUR, PokemonFamilyId.FAMILY_BULBASAUR);
 		map.put(PokemonId.IVYSAUR, PokemonFamilyId.FAMILY_BULBASAUR);
 		map.put(PokemonId.VENUSAUR, PokemonFamilyId.FAMILY_BULBASAUR);
-		map.put(PokemonId.CHARMANDER, PokemonFamilyId.FAMILY_CHARMANDER);
+		map.put(PokemonId.CHARMENDER, PokemonFamilyId.FAMILY_CHARMANDER);
 		map.put(PokemonId.CHARMELEON, PokemonFamilyId.FAMILY_CHARMANDER);
 		map.put(PokemonId.CHARIZARD, PokemonFamilyId.FAMILY_CHARMANDER);
 		map.put(PokemonId.SQUIRTLE, PokemonFamilyId.FAMILY_SQUIRTLE);
@@ -39,14 +38,14 @@ private static void registerValues() {
 		map.put(PokemonId.PIKACHU, PokemonFamilyId.FAMILY_PIKACHU);
 		map.put(PokemonId.RAICHU, PokemonFamilyId.FAMILY_PIKACHU);
 		map.put(PokemonId.SANDSHREW, PokemonFamilyId.FAMILY_SANDSHREW);
-		map.put(PokemonId.SANDSLASH, PokemonFamilyId.FAMILY_SANDSHREW);
-		map.put(PokemonId.NIDORAN_FEMALE, PokemonFamilyId.FAMILY_NIDORAN_FEMALE);
-		map.put(PokemonId.NIDORINA, PokemonFamilyId.FAMILY_NIDORAN_FEMALE);
-		map.put(PokemonId.NIDOQUEEN, PokemonFamilyId.FAMILY_NIDORAN_FEMALE);
-		map.put(PokemonId.NIDORAN_MALE, PokemonFamilyId.FAMILY_NIDORAN_MALE);
-		map.put(PokemonId.NIDORINO, PokemonFamilyId.FAMILY_NIDORAN_MALE);
-		map.put(PokemonId.NIDOKING, PokemonFamilyId.FAMILY_NIDORAN_MALE);
-		map.put(PokemonId.CLEFAIRY, PokemonFamilyId.FAMILY_CLEFAIRY);
+		map.put(PokemonId.SANDLASH, PokemonFamilyId.FAMILY_SANDSHREW);
+		map.put(PokemonId.NIDORAN_FEMALE, PokemonFamilyId.FAMILY_NIDORAN);
+		map.put(PokemonId.NIDORINA, PokemonFamilyId.FAMILY_NIDORAN);
+		map.put(PokemonId.NIDOQUEEN, PokemonFamilyId.FAMILY_NIDORAN);
+		map.put(PokemonId.NIDORAN_MALE, PokemonFamilyId.FAMILY_NIDORAN2);
+		map.put(PokemonId.NIDORINO, PokemonFamilyId.FAMILY_NIDORAN2);
+		map.put(PokemonId.NIDOKING, PokemonFamilyId.FAMILY_NIDORAN2);
+		map.put(PokemonId.CLEFARY, PokemonFamilyId.FAMILY_CLEFAIRY);
 		map.put(PokemonId.CLEFABLE, PokemonFamilyId.FAMILY_CLEFAIRY);
 		map.put(PokemonId.VULPIX, PokemonFamilyId.FAMILY_VULPIX);
 		map.put(PokemonId.NINETALES, PokemonFamilyId.FAMILY_VULPIX);
@@ -76,16 +75,16 @@ private static void registerValues() {
 		map.put(PokemonId.POLIWRATH, PokemonFamilyId.FAMILY_POLIWAG);
 		map.put(PokemonId.ABRA, PokemonFamilyId.FAMILY_ABRA);
 		map.put(PokemonId.KADABRA, PokemonFamilyId.FAMILY_ABRA);
-		map.put(PokemonId.ALAKAZAM, PokemonFamilyId.FAMILY_ABRA);
+		map.put(PokemonId.ALAKHAZAM, PokemonFamilyId.FAMILY_ABRA);
 		map.put(PokemonId.MACHOP, PokemonFamilyId.FAMILY_MACHOP);
 		map.put(PokemonId.MACHOKE, PokemonFamilyId.FAMILY_MACHOP);
 		map.put(PokemonId.MACHAMP, PokemonFamilyId.FAMILY_MACHOP);
 		map.put(PokemonId.BELLSPROUT, PokemonFamilyId.FAMILY_BELLSPROUT);
 		map.put(PokemonId.WEEPINBELL, PokemonFamilyId.FAMILY_BELLSPROUT);
-		map.put(PokemonId.VICTREEBEL, PokemonFamilyId.FAMILY_BELLSPROUT);
+		map.put(PokemonId.VICTREEBELL, PokemonFamilyId.FAMILY_BELLSPROUT);
 		map.put(PokemonId.TENTACOOL, PokemonFamilyId.FAMILY_TENTACOOL);
 		map.put(PokemonId.TENTACRUEL, PokemonFamilyId.FAMILY_TENTACOOL);
-		map.put(PokemonId.GEODUDE, PokemonFamilyId.FAMILY_GEODUDE);
+		map.put(PokemonId.GEODUGE, PokemonFamilyId.FAMILY_GEODUDE);
 		map.put(PokemonId.GRAVELER, PokemonFamilyId.FAMILY_GEODUDE);
 		map.put(PokemonId.GOLEM, PokemonFamilyId.FAMILY_GEODUDE);
 		map.put(PokemonId.PONYTA, PokemonFamilyId.FAMILY_PONYTA);
@@ -168,12 +167,8 @@ private static void registerValues() {
 	}
 
 	public static PokemonFamilyId getFamily(PokemonId id) {
-		if (map == null) {
-			registerValues();
-		}
-
 		return map.get(id);
 	}
 
 
-}
+}