Merge remote-tracking branch 'origin/master'

diff --git a/src/Country.java b/src/Country.java
index 0dffb2ccd4537d9501d41536eef1b2c2fb64dc1b..08c4da2a88fad39e7be1945a93f02bb4a998d7d1 100644 (file)
--- a/src/Country.java
+++ b/src/Country.java
@@ -36,7 +36,7 @@ public class Country {
         private String pt;
         private String nl;
         private String hr;
-        private String fa;
+
 
         // Getter Methods
 
@@ -76,9 +76,7 @@ public class Country {
             return hr;
         }
 
-        public String getFa() {
-            return fa;
-        }
+
 
         // Setter Methods
 
@@ -118,9 +116,7 @@ public class Country {
             this.hr = hr;
         }
 
-        public void setFa(String fa) {
-            this.fa = fa;
-        }
+
     }
 
 

diff --git a/src/Origin.java b/src/Origin.java
index c02dd28a1f4b777de433777a5e5452b8a6702f31..41b5b360d04fde925e347932b8bd01b6d4063137 100644 (file)
--- a/src/Origin.java
+++ b/src/Origin.java
@@ -13,6 +13,7 @@ public class Origin {
             {"Australia"} /* Oceania */
     };
 
+
     Origin() {
     }
 

diff --git a/src/Region.java b/src/Region.java
index 927cffa53a15daa6d1ff67d68f54ff132e869cff..1deb36d938721e772dba6902620f455859b13f58 100644 (file)
--- a/src/Region.java
+++ b/src/Region.java
@@ -1,38 +1,15 @@
-import com.google.gson.Gson;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.TreeMap;
 
 public class Region extends TreeMap<String, ArrayList<Country>> {
+    private List<Country> country;
 
-    public Region() {
+    public void setCountry(List<Country> origins) {
+        this.country = country;
     }
 
-    @SuppressWarnings("SpellCheckingInspection")
-    public void lectureOrigine(String continent, String pays) {
-        Gson gson = new Gson();
-        Region r = new Region();
-        String contenu = "";
-        try {
-            InputStream flux = new FileInputStream(continent + ".json");
-            InputStreamReader lecture = new InputStreamReader(flux);
-            BufferedReader buff = new BufferedReader(lecture);
-            String ligne;
-            while ((ligne = buff.readLine()) != null) {
-                contenu += ligne;
-            }
-            buff.close();
-        } catch (Exception e) {
-            System.out.println(e.toString());
-        }
-        System.out.println("les information du pays" + pays + " du fichier est : " + contenu);
-        // maintenant je veux deserialiser
-        Origin coords3 = gson.fromJson(contenu, Origin.class);
-        //Coordonnees co = gson.fromJson(json,Coordonnees.class);
-        System.out.println("Resultat = " + coords3);
+    public List<Country> getCountry() {
+        return country;
     }
 }