diff options
| author | Mickael ADAM | 2017-01-06 10:45:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2017-01-11 14:09:05 +0000 |
| commit | 23ef1c58724606b5bb176e8fe20e66ae5bc42722 (patch) | |
| tree | b5e97689b3520ebc6ce7e89fad768d21b39f68f7 /plugins/infra/ui | |
| parent | 56eaaf363e2565ac48be1f3ba3199e64e639da5e (diff) | |
| download | org.eclipse.papyrus-23ef1c58724606b5bb176e8fe20e66ae5bc42722.tar.gz org.eclipse.papyrus-23ef1c58724606b5bb176e8fe20e66ae5bc42722.tar.xz org.eclipse.papyrus-23ef1c58724606b5bb176e8fe20e66ae5bc42722.zip | |
Bug 509228 - Outline view remain empty when a diagram is open
- remove code from 7310db0b3b2e8ee805fedf4bfd16baf438c89332 Bug 443799.
Change-Id: Ica5ef696d8d9fe8fb7350530b381674e98a2b2cd
Signed-off-by: Mickael ADAM <mickael.adam@ALL4TEC.net>
Diffstat (limited to 'plugins/infra/ui')
| -rw-r--r-- | plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePage.java | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePage.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePage.java index 1132eed1fd5..ac289a55a09 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePage.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePage.java @@ -691,18 +691,17 @@ public class NestedEditorDelegatedOutlinePage extends Page implements IPapyrusCo return; } - if(activeRec!=null){ activeRec = pageRec; - Control pageControl = activeRec.contentOutlinePage.getControl(); - if (pageControl != null && !pageControl.isDisposed()) { - PageSite pageSite = (PageSite) activeRec.getPageSite(); - // Verify that the page control is not disposed - // If we are closing, it may have already been disposed - sashEditorPageBook.showPage(pageControl); - getSite().setActivePageSite(pageSite); - } + if (activeRec != null) { + Control pageControl = activeRec.contentOutlinePage.getControl(); + if (pageControl != null && !pageControl.isDisposed()) { + PageSite pageSite = (PageSite) activeRec.getPageSite(); + // Verify that the page control is not disposed + // If we are closing, it may have already been disposed + sashEditorPageBook.showPage(pageControl); + getSite().setActivePageSite(pageSite); + } } - } /** |