Skip to content

Bugfix for #2250 #4461

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
nettozahler wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bugfix for #2250 #4461

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
24 changes: 24 additions & 0 deletions ...sources/src/org/eclipse/ui/internal/navigator/workingsets/WorkingSetsContentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@

import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceChangeEvent;
import org.eclipse.core.resources.IResourceChangeListener;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.Adapters;
import org.eclipse.core.runtime.IAdaptable;
Expand Down Expand Up @@ -86,6 +89,24 @@ public class WorkingSetsContentProvider implements ICommonContentProvider {
}
};

private final IResourceChangeListener resourceChangeListener = event -> {
IResourceDelta delta = event.getDelta();
if (delta == null || !hasProjectChanges(delta)) {
return;
}

PlatformUI.getWorkbench().getDisplay().asyncExec(() -> {
if (helper != null && viewer != null && !viewer.getControl().isDisposed()) {
helper.refreshWorkingSetTreeState();
viewer.refresh();
}
});
};

private boolean hasProjectChanges(IResourceDelta delta) {
return delta.getAffectedChildren(IResourceDelta.ADDED | IResourceDelta.REMOVED, IResource.PROJECT).length > 0;
}

@Override
public void init(ICommonContentExtensionSite aConfig) {
NavigatorContentService cs = (NavigatorContentService) aConfig.getService();
Expand All @@ -99,6 +120,8 @@ public void init(ICommonContentExtensionSite aConfig) {
workingSetManager = PlatformUI.getWorkbench().getWorkingSetManager();
workingSetManager.addPropertyChangeListener(workingSetManagerListener);

ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener,
IResourceChangeEvent.POST_CHANGE);
}

@Override
Expand Down Expand Up @@ -175,6 +198,7 @@ public void dispose() {
helper = null;
extensionStateModel.removePropertyChangeListener(rootModeListener);
workingSetManager.removePropertyChangeListener(workingSetManagerListener);
ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
}

@Override
Expand Down