diff --git a/src/main/java/model/Aviary.java b/src/main/java/model/Aviary.java index fd81716..2ed58b3 100644 --- a/src/main/java/model/Aviary.java +++ b/src/main/java/model/Aviary.java @@ -2,6 +2,7 @@ package model; import animals.Animal; import java.util.HashMap; +import java.util.Map; public class Aviary{ @@ -19,30 +20,30 @@ public class Aviary{ this.size = size; } - private HashMap map = new HashMap<>(); + private Map aviaryMap = new HashMap<>(); public void addAnimal(A animal){ if (animal.getSize() != this.size){ throw new WrongSizeException("Размер животного - " + animal.getSize() + ", не подходит размеру вальера - " + this.size); } else { - map.put(animal.getName(), animal); + aviaryMap.put(animal.getName(), animal); } } public A getAnimal(String name){ - return map.get(name); + return aviaryMap.get(name); } public boolean removeAnimal(String name){ - return map.remove(name, getAnimal(name)); + return aviaryMap.remove(name, getAnimal(name)); } - public HashMap getMap() { - return map; + public Map getAviaryMap() { + return aviaryMap; } - public void setMap(HashMap map) { - this.map = map; + public void setAviaryMap(HashMap aviaryMap) { + this.aviaryMap = aviaryMap; } }