Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Xenos2015-11-18 17:15:47 +0000
committerStefan Xenos2015-11-18 17:15:47 +0000
commit4f7347ad95f46708e499bbd4c971ee5d7a41bcce (patch)
treeadc6393c66597bcbcd01071af58a310dfa6e8953 /bundles/org.eclipse.compare/compare
parent9836ac9baef038e06d816f4b7fb3ef8847ffbb72 (diff)
downloadeclipse.platform.team-4f7347ad95f46708e499bbd4c971ee5d7a41bcce.tar.gz
eclipse.platform.team-4f7347ad95f46708e499bbd4c971ee5d7a41bcce.tar.xz
eclipse.platform.team-4f7347ad95f46708e499bbd4c971ee5d7a41bcce.zip
Bug 448968 - NPE in ContentMergeViewer$ContentMergeViewerLayout.layout
Further improvements to the diagnostic logging. Change-Id: I03875fad063e251c08f84268ff57dec78d405336 Signed-off-by: Stefan Xenos <sxenos@gmail.com>
Diffstat (limited to 'bundles/org.eclipse.compare/compare')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java14
1 files changed, 11 insertions, 3 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 837b89c14..f874e7ed0 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
@@ -124,11 +124,14 @@ public abstract class ContentMergeViewer extends ContentViewer
if (fLeftLabel == null) {
if (composite.isDisposed()) {
- CompareUIPlugin.log(new IllegalArgumentException("Attempted to perform a layout on a disposed composite")); //$NON-NLS-1$
+ CompareUIPlugin
+ .log(new IllegalArgumentException("Attempted to perform a layout on a disposed composite")); //$NON-NLS-1$
}
if (Policy.debugContentMergeViewer) {
- logTrace("found bad label. fComposite.isDisposed() = " + fComposite.isDisposed() //$NON-NLS-1$//$NON-NLS-2$
- + composite.isDisposed());
+ logTrace("found bad label. Layout = " + System.identityHashCode(this) + ". composite = " //$NON-NLS-1$//$NON-NLS-2$
+ + System.identityHashCode(composite) + ". fComposite = " //$NON-NLS-1$
+ + System.identityHashCode(fComposite) + ". fComposite.isDisposed() = " //$NON-NLS-1$
+ + fComposite.isDisposed()); //$NON-NLS-2$
logStackTrace();
}
// Help to find out the cause for bug 449558
@@ -822,6 +825,11 @@ public abstract class ContentMergeViewer extends ContentViewer
hookControl(fComposite); // hook help & dispose listener
fComposite.setLayout(new ContentMergeViewerLayout());
+ if (Policy.debugContentMergeViewer) {
+ logTrace("Created composite " + System.identityHashCode(fComposite) + " with layout " //$NON-NLS-1$//$NON-NLS-2$
+ + System.identityHashCode(fComposite.getLayout()));
+ logStackTrace();
+ }
int style= SWT.SHADOW_OUT;
fAncestorLabel= new CLabel(fComposite, style | Window.getDefaultOrientation());

Back to the top