mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-01 06:05:24 +02:00
Code Issues Wiki Activity

[206561] Added call to RequestMonitor.cancel() when the view model is found to be canceled, to avoid an assertion error in RequestMonitor.

Browse source
This commit is contained in:
Pawel Piech 2008-04-30 19:14:19 +00:00
parent 6a50faf14a
commit d36e8f3b7c
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/VMViewerUpdate.java
View file

@ -150,11 +150,7 @@ public class VMViewerUpdate implements IViewerUpdate {
public TreePath getElementPath() { return fElementPath; } public TreePath getElementPath() { return fElementPath; }
public IPresentationContext getPresentationContext() { return fPresentationContext; } public IPresentationContext getPresentationContext() { return fPresentationContext; }
public IStatus getStatus() { return fRequestMonitor.getStatus(); } public IStatus getStatus() { return fRequestMonitor.getStatus(); }
public void setStatus(IStatus status) { public void setStatus(IStatus status) { fRequestMonitor.setStatus(status); }
if ( isCanceled() ) {
fRequestMonitor.cancel();
}
fRequestMonitor.setStatus(status); }
public boolean isCanceled() { public boolean isCanceled() {
if (fClientUpdate != null) { if (fClientUpdate != null) {
@ -174,6 +170,7 @@ public class VMViewerUpdate implements IViewerUpdate {
public void done() { public void done() {
try { try {
if ( isCanceled() ) { if ( isCanceled() ) {
fRequestMonitor.cancel();
fRequestMonitor.setStatus(new Status( IStatus.CANCEL, DsfUIPlugin.PLUGIN_ID," Update was cancelled") ); //$NON-NLS-1$ fRequestMonitor.setStatus(new Status( IStatus.CANCEL, DsfUIPlugin.PLUGIN_ID," Update was cancelled") ); //$NON-NLS-1$
} }
fRequestMonitor.done(); fRequestMonitor.done();