Upstream merges and a few code cleanups

This commit is contained in:
MattBDev
2019-05-30 16:07:30 -04:00
parent 5ae8f20b73
commit aea5b68ced
17 changed files with 102 additions and 89 deletions

View File

@ -71,12 +71,7 @@ public class MainUtil {
if (suggestions.getClass() != ArrayList.class) {
suggestions = new ArrayList<>(suggestions);
}
Iterator<String> iter = suggestions.iterator();
while (iter.hasNext()) {
if (!iter.next().startsWith(prefix)) {
iter.remove();
}
}
suggestions.removeIf(s -> !s.startsWith(prefix));
return suggestions;
}
@ -917,11 +912,11 @@ public class MainUtil {
if (directory.exists()) {
File[] files = directory.listFiles();
if (null != files) {
for (int i = 0; i < files.length; i++) {
if (files[i].isDirectory()) {
iterateFiles(files[i], task);
for (File file : files) {
if (file.isDirectory()) {
iterateFiles(file, task);
} else {
task.accept(files[i]);
task.accept(file);
}
}
}