Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2007-04-18 17:55:51 +0000
committerMichael Valenta2007-04-18 17:55:51 +0000
commit567a4ef99a8f422ac5a9f2563ab907e39fe04564 (patch)
tree9d2ccf0c7a4f904c71c2daf0e1fc77684c4e8926 /bundles/org.eclipse.compare
parentb2bd97617786b2ca48059a8bba88503ce1f37a75 (diff)
downloadeclipse.platform.team-567a4ef99a8f422ac5a9f2563ab907e39fe04564.tar.gz
eclipse.platform.team-567a4ef99a8f422ac5a9f2563ab907e39fe04564.tar.xz
eclipse.platform.team-567a4ef99a8f422ac5a9f2563ab907e39fe04564.zip
Bug 183014 Failure in Nightly build
Diffstat (limited to 'bundles/org.eclipse.compare')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java3
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java3
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java3
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java3
4 files changed, 8 insertions, 4 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
index d9d52bcb1..f82efada1 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
@@ -894,7 +894,8 @@ public abstract class ContentMergeViewer extends ContentViewer
*/
protected void handleDispose(DisposeEvent event) {
- fHandlerService.dispose();
+ if (fHandlerService != null)
+ fHandlerService.dispose();
Object input= getInput();
if (input instanceof ICompareInput) {
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index ed38923fc..c9a3b9a26 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -1708,7 +1708,8 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable {
*/
protected void handleDispose(DisposeEvent event) {
- fHandlerService.dispose();
+ if (fHandlerService != null)
+ fHandlerService.dispose();
Object input= getInput();
removeFromDocumentManager(ANCESTOR_CONTRIBUTOR, input);
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
index d9d52bcb1..f82efada1 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
@@ -894,7 +894,8 @@ public abstract class ContentMergeViewer extends ContentViewer
*/
protected void handleDispose(DisposeEvent event) {
- fHandlerService.dispose();
+ if (fHandlerService != null)
+ fHandlerService.dispose();
Object input= getInput();
if (input instanceof ICompareInput) {
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index ed38923fc..c9a3b9a26 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -1708,7 +1708,8 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable {
*/
protected void handleDispose(DisposeEvent event) {
- fHandlerService.dispose();
+ if (fHandlerService != null)
+ fHandlerService.dispose();
Object input= getInput();
removeFromDocumentManager(ANCESTOR_CONTRIBUTOR, input);

Back to the top