diff options
| author | Tomasz Zarna | 2010-03-04 16:26:05 +0000 |
|---|---|---|
| committer | Tomasz Zarna | 2010-03-04 16:26:05 +0000 |
| commit | 1632d875dd0109735cacd2a374d04afe9248151c (patch) | |
| tree | 5bef6151d757e9609c777226362a39074a224d1b /bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java | |
| parent | 5ba9981fc36d6d3614d696562ca512d2c78c1f43 (diff) | |
| download | eclipse.platform.team-1632d875dd0109735cacd2a374d04afe9248151c.tar.gz eclipse.platform.team-1632d875dd0109735cacd2a374d04afe9248151c.tar.xz eclipse.platform.team-1632d875dd0109735cacd2a374d04afe9248151c.zip | |
bug 273951: [Edit] NPE on "Override and update"
Diffstat (limited to 'bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java')
| -rw-r--r-- | bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java index a764aa518..52e62fd0b 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java @@ -775,11 +775,15 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang Object input= fStructureInputPane.getInput(); if (input != null) internalSetContentPaneInput(input); + if (!Utilities.okToUse(fStructurePane1) || !Utilities.okToUse(fStructurePane2)) + return; fStructurePane2.setInput(null); // clear downstream pane fStructurePane1.setInput(null); } else { Object input= getElement(selection); internalSetContentPaneInput(input); + if (!Utilities.okToUse(fStructurePane1) || !Utilities.okToUse(fStructurePane2)) + return; if (structureCompareOnSingleClick() || hasUnusableContentViewer()) fStructurePane1.setInput(input); fStructurePane2.setInput(null); // clear downstream pane |