Skip to content

Stop one project's tree file name from protecting another's stale file #2982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vogella wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Stop one project's tree file name from protecting another's stale file #2982

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions ...ndles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/SaveManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,30 +708,33 @@ protected void removeUnusedSafeTables() {
}

protected void removeUnusedTreeFiles() {
FilenameFilter filter = (dir, name) -> name.endsWith(LocalMetaArea.F_TREE);
// root resource
List<String> valuables = new ArrayList<>(10);
IPath location = workspace.getMetaArea().getTreeLocationFor(workspace.getRoot(), false);
valuables.add(location.lastSegment());
java.io.File target = location.toFile().getParentFile();
FilenameFilter filter = (dir, name) -> name.endsWith(LocalMetaArea.F_TREE);
String[] candidates = target.list(filter);
if (candidates != null) {
removeFiles(target, candidates, valuables);
}
removeUnusedTreeFiles(location, filter);

// projects
IProject[] projects = workspace.getRoot().getProjects(IContainer.INCLUDE_HIDDEN);
for (IProject project : projects) {
location = workspace.getMetaArea().getTreeLocationFor(project, false);
valuables.add(location.lastSegment());
target = location.toFile().getParentFile();
candidates = target.list(filter);
if (candidates != null) {
removeFiles(target, candidates, valuables);
}
removeUnusedTreeFiles(workspace.getMetaArea().getTreeLocationFor(project, false), filter);
}
}

/**
* Deletes every tree file next to the given one, which is the tree file still in
* use for that resource.
*/
private void removeUnusedTreeFiles(IPath treeLocation, FilenameFilter filter) {
java.io.File target = treeLocation.toFile().getParentFile();
String[] candidates = target.list(filter);
if (candidates == null) {
return;
}
List<String> valuables = new ArrayList<>(1);
valuables.add(treeLocation.lastSegment());
removeFiles(target, candidates, valuables);
}

protected void reportSnapshotRequestor() {
if (snapshotRequestor != null) {
Policy.log(snapshotRequestor);
Expand Down
Loading