diff options
| author | Andre Weinand | 2002-01-29 17:57:39 +0000 |
|---|---|---|
| committer | Andre Weinand | 2002-01-29 17:57:39 +0000 |
| commit | db0577c09b7f656b30f2702dfff8cbf021bec972 (patch) | |
| tree | c5e6678e85fc8d88457cee90538248ae7d354453 /bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer | |
| parent | 081842ff46505d180d56ae9355107aa3dc8f6dc1 (diff) | |
| download | eclipse.platform.team-db0577c09b7f656b30f2702dfff8cbf021bec972.tar.gz eclipse.platform.team-db0577c09b7f656b30f2702dfff8cbf021bec972.tar.xz eclipse.platform.team-db0577c09b7f656b30f2702dfff8cbf021bec972.zip | |
small fix for a NPEv20020129
Diffstat (limited to 'bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer')
| -rw-r--r-- | bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java | 10 |
1 files changed, 6 insertions, 4 deletions
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 a0f6077d6..0a17565a3 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 @@ -1515,10 +1515,12 @@ public class TextMergeViewer extends ContentMergeViewer { }
}
- if (fCurrentDiff != null && isThreeWay() && !fIgnoreAncestor) {
- fDirectionLabel.setImage(fCurrentDiff.getImage());
- } else {
- fDirectionLabel.setImage(null);
+ if (fDirectionLabel != null) {
+ if (fCurrentDiff != null && isThreeWay() && !fIgnoreAncestor) {
+ fDirectionLabel.setImage(fCurrentDiff.getImage());
+ } else {
+ fDirectionLabel.setImage(null);
+ }
}
if (fCopyDiffLeftToRightItem != null)
|