Skip to content

Make FileSystemResourceManager.storeHistory() not static #2592

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

Merged
trancexpress merged 1 commit into from
Mar 26, 2026
+6 −5
Merged

Make FileSystemResourceManager.storeHistory() not static #2592

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion ...es/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/DeleteVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.eclipse.core.filesystem.provider.FileInfo;
import org.eclipse.core.internal.resources.ICoreConstants;
import org.eclipse.core.internal.resources.Resource;
import org.eclipse.core.internal.resources.Workspace;
import org.eclipse.core.internal.utils.Messages;
import org.eclipse.core.internal.utils.Policy;
import org.eclipse.core.resources.*;
Expand Down Expand Up @@ -126,7 +127,7 @@ private void recursiveKeepHistory(IHistoryStore store, UnifiedTreeNode node) {
if (info == null) {
info = new FileInfo(node.getLocalName());
}
if (FileSystemResourceManager.storeHistory(node.getResource())) {
if (((Workspace) target.getWorkspace()).getFileSystemManager().storeHistory(target)) {
store.addState(target.getFullPath(), node.getStore(), info, true);
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...se.core.resources/src/org/eclipse/core/internal/localstore/FileSystemResourceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1357,7 +1357,7 @@ private void prepareWrite(IFile target, IFileInfo fileInfo, int updateFlags, boo
}
// add entry to History Store.
if (BitMask.isSet(updateFlags, IResource.KEEP_HISTORY) && fileInfo.exists()
&& FileSystemResourceManager.storeHistory(target)) {
&& storeHistory(target)) {
// never move to the history store, because then the file is missing if write
// fails
getHistoryStore().addState(target.getFullPath(), store, fileInfo, false);
Expand Down Expand Up @@ -1495,8 +1495,8 @@ public void writeSilently(IProject target) throws CoreException {
getWorkspace().getMetaArea().clearOldDescription(target);
}

public static boolean storeHistory(IResource file) {
WorkspaceDescription description = ((Workspace) file.getWorkspace()).internalGetDescription();
public boolean storeHistory(IResource file) {
WorkspaceDescription description = workspace.internalGetDescription();
return description.isKeepDerivedState() || !file.isDerived();
}

Expand Down
2 changes: 1 addition & 1 deletion ...dles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ResourceTree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public ResourceTree(FileSystemResourceManager localManager, ILock lock, MultiSta
*/
@Override
public void addToLocalHistory(IFile file) {
if (!FileSystemResourceManager.storeHistory(file)) {
if (!localManager.storeHistory(file)) {
return;
}
Assert.isLegal(isValid);
Expand Down
Loading