Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Xenos2015-11-19 20:32:46 +0000
committerStefan Xenos2015-11-19 20:32:46 +0000
commit28a1e3f7f144725c55d0d20a3f21c5fba506fc6d (patch)
tree3248326cdbb8957b7ba7a3b89a599d4ae1cde2d1 /bundles/org.eclipse.compare/compare
parent4f7347ad95f46708e499bbd4c971ee5d7a41bcce (diff)
downloadeclipse.platform.team-28a1e3f7f144725c55d0d20a3f21c5fba506fc6d.tar.gz
eclipse.platform.team-28a1e3f7f144725c55d0d20a3f21c5fba506fc6d.tar.xz
eclipse.platform.team-28a1e3f7f144725c55d0d20a3f21c5fba506fc6d.zip
Bug 448968 - NPE in ContentMergeViewer$ContentMergeViewerLayout.layout
Further improvements to the diagnostic logging. Change-Id: I5b788a9d7e470ebb913c9c69f46c28e2c88af3fd 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.java11
1 files changed, 9 insertions, 2 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 f874e7ed0..81cd5603b 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
@@ -799,6 +799,13 @@ public abstract class ContentMergeViewer extends ContentViewer
}
}
+ protected void hookControl(Control control) {
+ if (Policy.debugContentMergeViewer) {
+ logTrace("Attached dispose listener to control " + System.identityHashCode(control)); //$NON-NLS-1$
+ }
+ super.hookControl(control);
+ }
+
//---- layout & SWT control creation
/**
@@ -836,7 +843,7 @@ public abstract class ContentMergeViewer extends ContentViewer
fLeftLabel= new CLabel(fComposite, style | Window.getDefaultOrientation());
if (Policy.debugContentMergeViewer) {
- logTrace("fLeftLabel initialized");
+ logTrace("fLeftLabel initialized"); //$NON-NLS-1$
logStackTrace();
}
@@ -1020,7 +1027,7 @@ public abstract class ContentMergeViewer extends ContentViewer
fAncestorLabel= null;
fLeftLabel= null;
if (Policy.debugContentMergeViewer) {
- logTrace("handleDispose(...) - fLeftLabel = null");
+ logTrace("handleDispose(...) - fLeftLabel = null. event.widget = " + System.identityHashCode(event.widget)); //$NON-NLS-1$
logStackTrace();
}
fDirectionLabel= null;

Back to the top