no message
This commit is contained in:
@@ -373,6 +373,12 @@ public class Utils {
|
||||
file.getAbsolutePath()
|
||||
;
|
||||
}
|
||||
public static boolean containsLine(Vector<String> list, String line, int max_index) {
|
||||
int last_index = -1;
|
||||
for (int i = 0; i < list.size(); ++i)
|
||||
if (list.get(i).equals(line)) last_index = i;
|
||||
return (last_index >= max_index);
|
||||
}
|
||||
public static String compareTexts(String master, String slave) {
|
||||
Vector<String> lines = new Vector<>(Arrays.asList(master.split("\n")));
|
||||
Vector<String> slavelines = new Vector<>(Arrays.asList(slave.split("\n")));
|
||||
@@ -380,7 +386,7 @@ public class Utils {
|
||||
int old_j = 0;
|
||||
int j = 0;
|
||||
for (int i = 0; i < lines.size(); ++i) {
|
||||
if (UI.Contains(slavelines, lines.get(i), old_j)) {
|
||||
if (containsLine(slavelines, lines.get(i), old_j)) {
|
||||
for (int k = old_j; k < slavelines.size(); ++k) {
|
||||
j = k;
|
||||
if (lines.get(i).equals(slavelines.get(k))) {
|
||||
|
||||
Reference in New Issue
Block a user