diff options
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java')
| -rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java index e7d47260d..1398708a9 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java @@ -48,8 +48,6 @@ import org.eclipse.jface.text.Region; import org.eclipse.jface.text.TextUtilities; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.progress.IProgressService; /** * A document merger manages the differences between two documents @@ -574,11 +572,10 @@ public class DocumentMerger { } monitor.done(); }; - IProgressService progressService= PlatformUI.getWorkbench().getProgressService(); RangeDifference[] e= null; try { - progressService.run(true, true, runnable); + Utilities.executeRunnable(runnable); e= (RangeDifference[]) result[0]; } catch (InvocationTargetException ex) { throw new CoreException(new Status(IStatus.ERROR, CompareUIPlugin.PLUGIN_ID, 0, CompareMessages.DocumentMerger_3, ex.getTargetException())); |