Bug 505988 - [Project Explorer] Navigation buttons disappear after working set switchI20180330-2000

TreeViewerFrameSource should handle P_RESET event similar to P_CURRENT_FRAME

Change-Id: Ie9aa204ab76c9cbfa0c6f54ad8b1c8a8fbf50b64
Signed-off-by: Dawid Pakuła <zulus@w3des.net>

2 files changed, 4 insertions, 3 deletions

diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorActionGroup.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorActionGroup.java
index a050a408126..b6b1cbe74ce 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorActionGroup.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorActionGroup.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2015 IBM Corporation and others.
+ * Copyright (c) 2003, 2018 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -115,6 +115,7 @@ public class CommonNavigatorActionGroup extends ActionGroup implements IMementoA
 				commonNavigator.updateTitle();
 				IActionBars actionBars= commonNavigator.getViewSite().getActionBars();
 				updateToolBar(actionBars.getToolBarManager());
+				actionBars.updateActionBars();
 			}
 		});
 
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/TreeViewerFrameSource.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/TreeViewerFrameSource.java
index df833510ec4..039f182c642 100755
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/TreeViewerFrameSource.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/TreeViewerFrameSource.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -167,7 +167,7 @@ public class TreeViewerFrameSource implements IFrameSource {
      * Calls <code>frameChanged</code> when the current frame changes.
      */
     protected void handlePropertyChange(PropertyChangeEvent event) {
-        if (FrameList.P_CURRENT_FRAME.equals(event.getProperty())) {
+        if (FrameList.P_CURRENT_FRAME.equals(event.getProperty()) || FrameList.P_RESET.equals(event.getProperty())) {
             frameChanged((TreeFrame) event.getNewValue());
         }
     }