Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Daussy2017-12-26 15:29:59 +0000
committerArthur Daussy2017-12-26 15:35:29 +0000
commit85b08b199179af8607af2033bd1db0657ce117aa (patch)
tree5d3e9e76c36b1e273f3f1a80c762650306ead1ae
parentcafcf9f5178a7d68aa4d94841da20685ac2bc545 (diff)
downloadorg.eclipse.emf.compare-85b08b199179af8607af2033bd1db0657ce117aa.tar.gz
org.eclipse.emf.compare-85b08b199179af8607af2033bd1db0657ce117aa.tar.xz
org.eclipse.emf.compare-85b08b199179af8607af2033bd1db0657ce117aa.zip
[529212] Dispose EMFCompareColor
Bug: 529212 Change-Id: I66b9f6dfe4f258a3354f0da22df1e025e3aa7b37 Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java
index e3190d626..3ae062f8c 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java
@@ -795,6 +795,9 @@ public abstract class EMFCompareContentMergeViewer extends ContentMergeViewer im
if (fAdapterFactoryContentProvider != null) {
fAdapterFactoryContentProvider.setAdapterFactory(null);
}
+ if (fColors != null) {
+ fColors.dispose();
+ }
super.handleDispose(event);
}

Back to the top