X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FRegion.java;h=927cffa53a15daa6d1ff67d68f54ff132e869cff;hb=6b0be432abf9ffbdae9e2183804fca170fa5e136;hp=6522496a9c8bb9bfd9c598a56d1c276e3385e99e;hpb=0af858cfb196b69dc0b3dd38e02df153bfe232f0;p=Persons_Comparator.git

diff --git a/src/Region.java b/src/Region.java
index 6522496..927cffa 100644
--- a/src/Region.java
+++ b/src/Region.java
@@ -4,35 +4,34 @@ import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.TreeMap;
 
-public class Region {
-    private String continent;
-    private String pays;
-    public Region(){
-
+public class Region extends TreeMap<String, ArrayList<Country>> {
 
+    public Region() {
     }
+
     @SuppressWarnings("SpellCheckingInspection")
-    public void lectureOrigine(String continent, String pays){
+    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);
+        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;
+            while ((ligne = buff.readLine()) != null) {
+                contenu += ligne;
             }
             buff.close();
-        }
-        catch (Exception e){
+        } catch (Exception e) {
             System.out.println(e.toString());
         }
-        System.out.println("les information du pays" + pays +" du fichier est : "+contenu);
+        System.out.println("les information du pays" + pays + " du fichier est : " + contenu);
         // maintenant je veux deserialiser
-        Origin coords3 = gson.fromJson(contenu,Origin.class);
+        Origin coords3 = gson.fromJson(contenu, Origin.class);
         //Coordonnees co = gson.fromJson(json,Coordonnees.class);
         System.out.println("Resultat = " + coords3);
     }