diff options
| author | Michael Valenta | 2007-01-25 18:27:11 +0000 |
|---|---|---|
| committer | Michael Valenta | 2007-01-25 18:27:11 +0000 |
| commit | b075b0630fb6d0d9faa811b53e6f1d1fd1617df3 (patch) | |
| tree | ae80ce8199c0b4b0855f8dca2567a021fcdfbc18 | |
| parent | 30cca63a99fc698b396609ba3d82bfb3df140712 (diff) | |
| download | eclipse.platform.team-b075b0630fb6d0d9faa811b53e6f1d1fd1617df3.tar.gz eclipse.platform.team-b075b0630fb6d0d9faa811b53e6f1d1fd1617df3.tar.xz eclipse.platform.team-b075b0630fb6d0d9faa811b53e6f1d1fd1617df3.zip | |
Fix uses of SubMonitor convert
5 files changed, 10 insertions, 5 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Worker.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Worker.java index 51c424215..95963107b 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Worker.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Worker.java @@ -78,7 +78,8 @@ public class Worker implements IRunnableWithProgress { work.clear(); } finally { isWorking = false; - pm.done(); + if (monitor!= null) + monitor.done(); currentMonitor = null; currentTask = null; } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java index b9244c339..8d3316d49 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java @@ -29,7 +29,8 @@ import org.eclipse.core.runtime.*; lcs.longestCommonSubsequence(monitor.newChild(95)); return lcs.getDifferences(monitor.newChild(5)); } finally { - monitor.done(); + if (pm != null) + pm.done(); } } diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Worker.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Worker.java index 51c424215..95963107b 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Worker.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Worker.java @@ -78,7 +78,8 @@ public class Worker implements IRunnableWithProgress { work.clear(); } finally { isWorking = false; - pm.done(); + if (monitor!= null) + monitor.done(); currentMonitor = null; currentTask = null; } diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java index b9244c339..8d3316d49 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java @@ -29,7 +29,8 @@ import org.eclipse.core.runtime.*; lcs.longestCommonSubsequence(monitor.newChild(95)); return lcs.getDifferences(monitor.newChild(5)); } finally { - monitor.done(); + if (pm != null) + pm.done(); } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceDiffCompareInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceDiffCompareInput.java index 2948189b1..d2d9a3ab4 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceDiffCompareInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceDiffCompareInput.java @@ -144,7 +144,8 @@ public class ResourceDiffCompareInput extends AbstractCompareInput implements IS FileRevisionTypedElement fste = (FileRevisionTypedElement) right; fste.cacheContents(sm.newChild(50)); } - sm.done(); + if (monitor != null) + monitor.done(); } /** |