From: Jérôme Benoit <jerome.benoit@piment-noir.org>
Date: Mon, 14 Jan 2019 10:45:44 +0000 (+0100)
Subject: Add country envelope class.
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=3ae9566eea151fe7560c6b06b07718c83132c75f;p=Persons_Comparator.git

Add country envelope class.

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
---

diff --git a/src/Country.java b/src/Country.java
new file mode 100644
index 0000000..0dffb2c
--- /dev/null
+++ b/src/Country.java
@@ -0,0 +1,251 @@
+import java.util.ArrayList;
+
+public class Country {
+    private String name;
+    ArrayList<Object> topLevelDomain = new ArrayList<Object>();
+    private String alpha2Code;
+    private String alpha3Code;
+    ArrayList<Object> callingCodes = new ArrayList<Object>();
+    private String capital;
+    ArrayList<Object> altSpellings = new ArrayList<Object>();
+    private String region;
+    private String subregion;
+    private float population;
+    ArrayList<Object> latlng = new ArrayList<Object>();
+    private String demonym;
+    private float area;
+    private float gini;
+    ArrayList<Object> timezones = new ArrayList<Object>();
+    ArrayList<Object> borders = new ArrayList<Object>();
+    private String nativeName;
+    private String numericCode;
+    ArrayList<Object> currencies = new ArrayList<Object>();
+    ArrayList<Object> languages = new ArrayList<Object>();
+    Translations TranslationsObject;
+    private String flag;
+    ArrayList<Object> regionalBlocs = new ArrayList<Object>();
+    private String cioc;
+
+    public class Translations {
+        private String de;
+        private String es;
+        private String fr;
+        private String ja;
+        private String it;
+        private String br;
+        private String pt;
+        private String nl;
+        private String hr;
+        private String fa;
+
+        // Getter Methods
+
+        public String getDe() {
+            return de;
+        }
+
+        public String getEs() {
+            return es;
+        }
+
+        public String getFr() {
+            return fr;
+        }
+
+        public String getJa() {
+            return ja;
+        }
+
+        public String getIt() {
+            return it;
+        }
+
+        public String getBr() {
+            return br;
+        }
+
+        public String getPt() {
+            return pt;
+        }
+
+        public String getNl() {
+            return nl;
+        }
+
+        public String getHr() {
+            return hr;
+        }
+
+        public String getFa() {
+            return fa;
+        }
+
+        // Setter Methods
+
+        public void setDe(String de) {
+            this.de = de;
+        }
+
+        public void setEs(String es) {
+            this.es = es;
+        }
+
+        public void setFr(String fr) {
+            this.fr = fr;
+        }
+
+        public void setJa(String ja) {
+            this.ja = ja;
+        }
+
+        public void setIt(String it) {
+            this.it = it;
+        }
+
+        public void setBr(String br) {
+            this.br = br;
+        }
+
+        public void setPt(String pt) {
+            this.pt = pt;
+        }
+
+        public void setNl(String nl) {
+            this.nl = nl;
+        }
+
+        public void setHr(String hr) {
+            this.hr = hr;
+        }
+
+        public void setFa(String fa) {
+            this.fa = fa;
+        }
+    }
+
+
+    // Getter Methods
+
+    public String getName() {
+        return name;
+    }
+
+    public String getAlpha2Code() {
+        return alpha2Code;
+    }
+
+    public String getAlpha3Code() {
+        return alpha3Code;
+    }
+
+    public String getCapital() {
+        return capital;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public String getSubregion() {
+        return subregion;
+    }
+
+    public float getPopulation() {
+        return population;
+    }
+
+    public String getDemonym() {
+        return demonym;
+    }
+
+    public float getArea() {
+        return area;
+    }
+
+    public float getGini() {
+        return gini;
+    }
+
+    public String getNativeName() {
+        return nativeName;
+    }
+
+    public String getNumericCode() {
+        return numericCode;
+    }
+
+    public Translations getTranslations() {
+        return TranslationsObject;
+    }
+
+    public String getFlag() {
+        return flag;
+    }
+
+    public String getCioc() {
+        return cioc;
+    }
+
+    // Setter Methods
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setAlpha2Code(String alpha2Code) {
+        this.alpha2Code = alpha2Code;
+    }
+
+    public void setAlpha3Code(String alpha3Code) {
+        this.alpha3Code = alpha3Code;
+    }
+
+    public void setCapital(String capital) {
+        this.capital = capital;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public void setSubregion(String subregion) {
+        this.subregion = subregion;
+    }
+
+    public void setPopulation(float population) {
+        this.population = population;
+    }
+
+    public void setDemonym(String demonym) {
+        this.demonym = demonym;
+    }
+
+    public void setArea(float area) {
+        this.area = area;
+    }
+
+    public void setGini(float gini) {
+        this.gini = gini;
+    }
+
+    public void setNativeName(String nativeName) {
+        this.nativeName = nativeName;
+    }
+
+    public void setNumericCode(String numericCode) {
+        this.numericCode = numericCode;
+    }
+
+    public void setTranslations(Translations translationsObject) {
+        this.TranslationsObject = translationsObject;
+    }
+
+    public void setFlag(String flag) {
+        this.flag = flag;
+    }
+
+    public void setCioc(String cioc) {
+        this.cioc = cioc;
+    }
+}
+
diff --git a/src/Region.java b/src/Region.java
index 4fd0143..43e8521 100644
--- a/src/Region.java
+++ b/src/Region.java
@@ -18,7 +18,7 @@ public class Region {
         Region r = new Region();
         String contenu = "";
         try {
-            InputStream flux = new FileInputStream(continent + ".txt");
+            InputStream flux = new FileInputStream(continent + ".json");
             InputStreamReader lecture = new InputStreamReader(flux);
             BufferedReader buff = new BufferedReader(lecture);
             String ligne;