|
|
|
@ -16,10 +16,6 @@ public class Site {
|
|
|
|
|
@NotNull
|
|
|
|
|
String location;
|
|
|
|
|
|
|
|
|
|
String latitude;
|
|
|
|
|
|
|
|
|
|
String longitude;
|
|
|
|
|
|
|
|
|
|
public String getCountry() {
|
|
|
|
|
return country;
|
|
|
|
|
}
|
|
|
|
@ -36,30 +32,12 @@ public class Site {
|
|
|
|
|
this.location = location;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public String getLatitude() {
|
|
|
|
|
return latitude;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void setLatitude(String latitude) {
|
|
|
|
|
this.latitude = latitude;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public String getLongitude() {
|
|
|
|
|
return longitude;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void setLongitude(String longitude) {
|
|
|
|
|
this.longitude = longitude;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public int hashCode() {
|
|
|
|
|
final int prime = 31;
|
|
|
|
|
int result = 1;
|
|
|
|
|
result = prime * result + ((country == null) ? 0 : country.hashCode());
|
|
|
|
|
result = prime * result + ((latitude == null) ? 0 : latitude.hashCode());
|
|
|
|
|
result = prime * result + ((location == null) ? 0 : location.hashCode());
|
|
|
|
|
result = prime * result + ((longitude == null) ? 0 : longitude.hashCode());
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -77,24 +55,12 @@ public class Site {
|
|
|
|
|
return false;
|
|
|
|
|
} else if (!country.equals(other.country))
|
|
|
|
|
return false;
|
|
|
|
|
if (latitude == null) {
|
|
|
|
|
if (other.latitude != null)
|
|
|
|
|
return false;
|
|
|
|
|
} else if (!latitude.equals(other.latitude))
|
|
|
|
|
return false;
|
|
|
|
|
if (location == null) {
|
|
|
|
|
if (other.location != null)
|
|
|
|
|
return false;
|
|
|
|
|
} else if (!location.equals(other.location))
|
|
|
|
|
return false;
|
|
|
|
|
if (longitude == null) {
|
|
|
|
|
if (other.longitude != null)
|
|
|
|
|
return false;
|
|
|
|
|
} else if (!longitude.equals(other.longitude))
|
|
|
|
|
return false;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|