From 23ef1c58724606b5bb176e8fe20e66ae5bc42722 Mon Sep 17 00:00:00 2001 From: Mickael ADAM Date: Fri, 6 Jan 2017 11:45:55 +0100 Subject: 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 --- .../NestedEditorDelegatedOutlinePage.java | 19 +++++++++---------- 1 file 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); + } } - } /** -- cgit v1.2.3