Renamed aviaryMap
This commit is contained in:
parent
a986819960
commit
bf90ebce49
@ -2,6 +2,7 @@ package model;
|
|||||||
|
|
||||||
import animals.Animal;
|
import animals.Animal;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
public class Aviary<A extends Animal>{
|
public class Aviary<A extends Animal>{
|
||||||
|
|
||||||
@ -19,30 +20,30 @@ public class Aviary<A extends Animal>{
|
|||||||
this.size = size;
|
this.size = size;
|
||||||
}
|
}
|
||||||
|
|
||||||
private HashMap<String, A> map = new HashMap<>();
|
private Map<String, A> aviaryMap = new HashMap<>();
|
||||||
|
|
||||||
public void addAnimal(A animal){
|
public void addAnimal(A animal){
|
||||||
if (animal.getSize() != this.size){
|
if (animal.getSize() != this.size){
|
||||||
throw new WrongSizeException("Размер животного - " + animal.getSize() + ", не подходит размеру вальера - " + this.size);
|
throw new WrongSizeException("Размер животного - " + animal.getSize() + ", не подходит размеру вальера - " + this.size);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
map.put(animal.getName(), animal);
|
aviaryMap.put(animal.getName(), animal);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public A getAnimal(String name){
|
public A getAnimal(String name){
|
||||||
return map.get(name);
|
return aviaryMap.get(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean removeAnimal(String name){
|
public boolean removeAnimal(String name){
|
||||||
return map.remove(name, getAnimal(name));
|
return aviaryMap.remove(name, getAnimal(name));
|
||||||
}
|
}
|
||||||
|
|
||||||
public HashMap<String, A> getMap() {
|
public Map<String, A> getAviaryMap() {
|
||||||
return map;
|
return aviaryMap;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setMap(HashMap<String, A> map) {
|
public void setAviaryMap(HashMap<String, A> aviaryMap) {
|
||||||
this.map = map;
|
this.aviaryMap = aviaryMap;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user