repositories
/
Persons_Comparator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Country+Region add flag
[Persons_Comparator.git]
/
src
/
Country.java
diff --git
a/src/Country.java
b/src/Country.java
index cb672731751803f73034a76dd3e55280c5637c8d..2516c2bfdc4172b41d9f5da9b4fc5fdb207bee7e 100644
(file)
--- a/
src/Country.java
+++ b/
src/Country.java
@@
-1,17
+1,16
@@
-import javax.swing.*;
-
public class Country {
private String name;
private String region;
private double lat;
private double lng;
public class Country {
private String name;
private String region;
private double lat;
private double lng;
- private
ImageIcon
flag;
+ private
String
flag;
- public Country(String name, String region, double lat, double lng) {
+ public Country(String name, String region, double lat, double lng
, String flag
) {
setName(name);
setRegion(region);
setLat(lat);
setLng(lng);
setName(name);
setRegion(region);
setLat(lat);
setLng(lng);
+ setFlag(flag);
}
public void setName(String name) {
}
public void setName(String name) {
@@
-42,6
+41,14
@@
public class Country {
return lng;
}
return lng;
}
+ public void setFlag(String flag) {
+ this.flag = flag;
+ }
+
+ public String getFlag() {
+ return flag;
+ }
+
public int distanceTo(Country country) {
if ((this.lat == country.lat) && (this.lng == country.lng)) {
return 0;
public int distanceTo(Country country) {
if ((this.lat == country.lat) && (this.lng == country.lng)) {
return 0;
@@
-64,6
+71,7
@@
public class Country {
", region='" + region + '\'' +
", lat=" + lat +
", lng=" + lng +
", region='" + region + '\'' +
", lat=" + lat +
", lng=" + lng +
+ ", flag=" + flag +
'}';
}
}
'}';
}
}