Add Try With Resources

Author: JJ27

src/com/codefortomorrow/advanced/chapter14/solutions/Lexico.java

@@ -16,47 +16,22 @@
 public class Lexico {
 
     public static void main(String[] args) {
-        BufferedReader br = null;
-        BufferedReader br2 = null;
-        try {
-            br = new BufferedReader(new FileReader("f1.txt"));
-            br2 = new BufferedReader(new FileReader("f2.txt"));
-
-<<<<<<< HEAD
-      String line1 = br.readLine();
-      String line2 = br2.readLine();
-      int c = line1.compareTo(line2);
-      while (c == 0){
-        line1 = br.readLine();
-        line2 = br2.readLine();
-        c = line1.compareTo(line2);
-      }
-      if(c > 0)
-        System.out.println("File 2");
-      else
-        System.out.println("File 1");
-  } catch(IOException e){
-    e.printStackTrace();
-  } finally{
-    br.close();
-    br2.close();
-  }
-  }
-=======
+        try(BufferedReader br = new BufferedReader(new FileReader("f1.txt"));
+        BufferedReader br2 = new BufferedReader(new FileReader("f2.txt"));) {
             String line1 = br.readLine();
             String line2 = br2.readLine();
             int c = line1.compareTo(line2);
-            while (c == 0) {
-                line1 = br.readLine();
-                line2 = br2.readLine();
-                c = line1.compareTo(line2);
+            while (c == 0){
+              line1 = br.readLine();
+              line2 = br2.readLine();
+              c = line1.compareTo(line2);
             }
-            if (c > 0) System.out.println("File 2"); else System.out.println(
-                "File 1"
-            );
-        } catch (IOException e) {
-            e.printStackTrace();
+            if(c > 0)
+              System.out.println("File 2");
+            else
+              System.out.println("File 1");
+        } catch(IOException e){
+          e.printStackTrace();
         }
     }
->>>>>>> 7e8c2fe0ebe2b7a31da0266f78e9388b466656c3
 }