repositories
/
Persons_Comparator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master'
[Persons_Comparator.git]
/
src
/
Origin.java
diff --git
a/src/Origin.java
b/src/Origin.java
index aa63762a374c74d7592626a4c34c4db0a4e14d1e..41b5b360d04fde925e347932b8bd01b6d4063137 100644
(file)
--- a/
src/Origin.java
+++ b/
src/Origin.java
@@
-1,18
+1,19
@@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.Arrays;
-public class Origin
implements Comparable<Origin>
{
+public class Origin {
private String continent = "Unknown";
private String country;
private String continent = "Unknown";
private String country;
- private String
continents[]
= {"Africa", "Americas", "Asia", "Europe", "Oceania"};
+ private String
[] continents
= {"Africa", "Americas", "Asia", "Europe", "Oceania"};
private String[][] content2DArray = {
{"Mali"}, /* Africa */
{"United States of America", "Brasil", "Mexico"}, /* Americas */
{"India"}, /* Asia */
private String[][] content2DArray = {
{"Mali"}, /* Africa */
{"United States of America", "Brasil", "Mexico"}, /* Americas */
{"India"}, /* Asia */
- {"France", "
Germany", "United Kingdom", "Belgium", "Norway"} /* Europe */,
+ {"France", "
Italie", "Germany", "United Kingdom", "Belgium", "Norway"}, /* Europe */
{"Australia"} /* Oceania */
};
{"Australia"} /* Oceania */
};
+
Origin() {
}
Origin() {
}
@@
-49,7
+50,7
@@
public class Origin implements Comparable<Origin> {
return stringArrayList.toArray(rtArray);
}
return stringArrayList.toArray(rtArray);
}
- p
rivate
String getContinentFromCountry(String country) {
+ p
ublic
String getContinentFromCountry(String country) {
int continentKey = -1;
for (int i = 0; i < content2DArray.length; i++) {
if (Arrays.asList(content2DArray[i]).indexOf(country) != -1) {
int continentKey = -1;
for (int i = 0; i < content2DArray.length; i++) {
if (Arrays.asList(content2DArray[i]).indexOf(country) != -1) {
@@
-62,8
+63,7
@@
public class Origin implements Comparable<Origin> {
return "Unknown";
}
return "Unknown";
}
- @Override
- public int compareTo(Origin origin) {
+ public int distanceTo(Origin origin) {
return 0;
}
}
return 0;
}
}