external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove empty dirs after migration. tree conflicts still exist, but at least they won't get in the way

Browse Source
This commit is contained in:
myk
2013-03-17 06:07:28 +00:00
parent 75788ab933
commit 32984b9f41
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/forge/view/FView.java
View File

@@ -219,16 +219,29 @@ public enum FView {
// will populate remainingFiles with remaining files if not null, returns whether any files have
// been added to remainingFiles (or would have been added if remainingFiles is null)
// directories listed in profileDirs will not be searched
// removes empty directories to reduce tree conflicts
private static boolean _addRemainingFiles(List<File> remainingFiles, List<File> dirRoots, Set<File> profileDirs) {
Deque<File> stack = new LinkedList<File>(dirRoots);
Set<File> seenDirs = new HashSet<File>();
boolean ret = false;
while (!stack.isEmpty()) {
File cur = stack.pop();
File cur = stack.peek();
if (profileDirs.contains(cur)) {
// don't search active profile dirs
// don't touch active profile dirs
stack.pop();
continue;
}
if (seenDirs.contains(cur)) {
cur = stack.pop();
if (cur.exists()) {
// remove empty dir (will fail if not empty)
cur.delete();
}
continue;
}
seenDirs.add(cur);
File[] curListing = cur.listFiles();
if (null == curListing) {
continue;