Skip to content

Narrow down scheduling rule in JavaDebugOptionsManager.updateBreakpointMessages() #873

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
trancexpress wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −56
Open

Narrow down scheduling rule in JavaDebugOptionsManager.updateBreakpointMessages() #873

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
71 changes: 15 additions & 56 deletions org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugOptionsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,27 @@


import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.StringTokenizer;

import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IMarkerDelta;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceRuleFactory;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.ICoreRunnable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.jobs.MultiRule;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.debug.core.DebugEvent;
Expand Down Expand Up @@ -900,58 +899,15 @@ public void run(IProgressMonitor monitor) throws CoreException {
}
};

final ISchedulingRule modifyWorkspaceRule = modifyWorkspaceRule();

ISchedulingRule currentRule = Job.getJobManager().currentRule();
if (currentRule != null && currentRule.contains(modifyWorkspaceRule)) {
try {
ResourcesPlugin.getWorkspace().run(runnable, null, 0, null);
} catch (CoreException e) {
JDIDebugUIPlugin.log(e);
}
} else {
UpdateBreakpointMessagesJob updateBreakpointMessagesJob = new UpdateBreakpointMessagesJob(modifyWorkspaceRule, runnable);
updateBreakpointMessagesJob.schedule();
}
}

private static ISchedulingRule modifyWorkspaceRule() {
IWorkspace workspace = ResourcesPlugin.getWorkspace();
IWorkspaceRoot workspaceRoot = workspace.getRoot();
IResourceRuleFactory rootFactory = workspace.getRuleFactory();
ISchedulingRule modifyWorkspaceRule = rootFactory.modifyRule(workspaceRoot);
return modifyWorkspaceRule;
}

private static class UpdateBreakpointMessagesJob extends Job {

private final ISchedulingRule rule;
private final ICoreRunnable runnable;

UpdateBreakpointMessagesJob(ISchedulingRule rule, ICoreRunnable runnable) {
super("Updating breakpoint messages"); //$NON-NLS-1$
this.rule = rule;
this.runnable = runnable;
}

@Override
protected IStatus run(IProgressMonitor monitor) {
if (monitor.isCanceled()) {
return Status.CANCEL_STATUS;
}
try {
ResourcesPlugin.getWorkspace().run(runnable, rule, 0, monitor);
} catch (CoreException e) {
String errorMessage = "Failed to update breakpoint messages"; //$NON-NLS-1$
IStatus errorStatus = new Status(IStatus.ERROR, IJavaDebugUIConstants.PLUGIN_ID, errorMessage, e);
return errorStatus;
}
return Status.OK_STATUS;
}

@Override
public boolean belongsTo(Object family) {
return JavaDebugOptionsManager.class == family;
try {
ISchedulingRule rule = MultiRule.combine(Arrays.stream(breakpoints)
.map(IBreakpoint::getMarker).filter(Objects::nonNull)
.map(IMarker::getResource).filter(Objects::nonNull)
.map(JavaDebugOptionsManager::getMarkerRule)
.toArray(ISchedulingRule[]::new));
ResourcesPlugin.getWorkspace().run(runnable, rule, 0, null);
} catch (CoreException e) {
JDIDebugUIPlugin.log(e);
}
}

Expand Down Expand Up @@ -1003,4 +959,7 @@ protected void variableViewSettingsChanged() {
}
}

private static ISchedulingRule getMarkerRule(IResource resource) {
return ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(resource);
}
}
Loading