Merge branch 'master' of /home/sylvain/IdeaProjects/Persons_Comparator with conflicts.

[Persons_Comparator.git] / src / Region.java

diff --git a/src/Region.java b/src/Region.java
index 6522496a9c8bb9bfd9c598a56d1c276e3385e99e..1deb36d938721e772dba6902620f455859b13f58 100644 (file)
--- a/src/Region.java
+++ b/src/Region.java
@@ -1,39 +1,15 @@
-import com.google.gson.Gson;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-public class Region {
-    private String continent;
-    private String pays;
-    public Region(){
+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 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 + ".txt");
-            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;
     }
 }