Entity editors refresh fix

Former-commit-id: 4d529d4c

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerRefresh.java

@@ -27,6 +27,7 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.jobs.JobChangeAdapter;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.jkiss.dbeaver.Log;
@@ -36,6 +37,7 @@ import org.jkiss.dbeaver.model.runtime.AbstractJob;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.ui.IRefreshablePart;
 import org.jkiss.dbeaver.ui.UIUtils;
+import org.jkiss.dbeaver.ui.editors.IDatabaseEditorInput;
 import org.jkiss.dbeaver.ui.navigator.INavigatorModelView;
 
 import java.util.*;
@@ -71,6 +73,13 @@ public class NavigatorHandlerRefresh extends AbstractHandler {
         final ISelection selection = HandlerUtil.getCurrentSelection(event);
 
         DBNNode rootNode = navigatorView.getRootNode();
+        if (rootNode == null) {
+            if (workbenchPart instanceof IEditorPart) {
+                if (((IEditorPart) workbenchPart).getEditorInput() instanceof IDatabaseEditorInput) {
+                    rootNode = ((IDatabaseEditorInput) ((IEditorPart) workbenchPart).getEditorInput()).getNavigatorNode();
+                }
+            }
+        }
         if (rootNode != null && rootNode.getParentNode() instanceof DBNDatabaseNode) {
             refreshObjects.add(rootNode);
         } else if (selection instanceof IStructuredSelection) {

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/EntityEditorContributor.java

@@ -92,6 +92,7 @@ public class EntityEditorContributor extends MultiPageEditorActionBarContributor
         manager.add(ActionUtils.makeCommandContribution(workbenchWindow, IWorkbenchCommandConstants.FILE_REVERT, "Revert", UIIcon.RESET, "Revert changes", true));
         manager.add(ActionUtils.makeCommandContribution(workbenchWindow, IWorkbenchCommandConstants.EDIT_UNDO));
         manager.add(ActionUtils.makeCommandContribution(workbenchWindow, IWorkbenchCommandConstants.EDIT_REDO));
+        manager.add(ActionUtils.makeCommandContribution(workbenchWindow, IWorkbenchCommandConstants.FILE_REFRESH));
 
 /*
         manager.add(new Separator());