Валидатор говорит, что я имена файлов не считываю.
package com.javarush.task.task19.task1916;
import java.io.*;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/*
Отслеживаем изменения
*/
public class Solution {
public static List<LineItem> lines = new ArrayList<LineItem>();
public static void main(String[] args) throws IOException {
BufferedReader filenameReader = new BufferedReader(new InputStreamReader(System.in));
List<String> fileContent1 = readFile(filenameReader.readLine());
List<String> fileContent2 = readFile(filenameReader.readLine());
filenameReader.close();
lines = mergeLists(fileContent1, fileContent2);
lines.forEach(System.out::println);
}
private static List<String> readFile(String filename) throws IOException {
List<String> lines;
BufferedReader reader = new BufferedReader(new FileReader(filename));
lines = reader.lines().collect(Collectors.toList());
reader.close();
return lines;
}
private static List<LineItem> mergeLists(List<String> fileContent1, List<String> fileContent2) {
List<String> list1 = new ArrayList<>(fileContent1);
List<String> list2 = new ArrayList<>(fileContent2);
List<LineItem> merged = new ArrayList<>();
while (true) {
if (list1.isEmpty()) {
merged.add(new LineItem(Type.ADDED, list2.remove(0)));
break;
} else if (list2.isEmpty()) {
merged.add(new LineItem(Type.REMOVED, list1.remove(0)));
break;
}
if (list1.get(0).equals(list2.get(0))) {
merged.add(new LineItem(Type.SAME, list1.get(0)));
list1.remove(0);
list2.remove(0);
} else if (list1.get(0).equals(list2.get(1))) {
merged.add(new LineItem(Type.ADDED, list2.get(0)));
list2.remove(0);
} else {
merged.add(new LineItem(Type.REMOVED, list1.get(0)));
list1.remove(0);
}
}
return merged;
}
public static enum Type {
ADDED {
@Override
public String toString() {
return "ADDED ";
}
}, //добавлена новая строка
REMOVED {
@Override
public String toString() {
return "REMOVED ";
}
}, //удалена строка
SAME {
@Override
public String toString() {
return "SAME ";
}
} //без изменений
}
public static class LineItem {
public Type type;
public String line;
public LineItem(Type type, String line) {
this.type = type;
this.line = line;
}
@Override
public String toString() {
return type.toString() + line;
}
}
}