dbeaver/pro#2680 Workbench restart in pref dialog fix (#33269)

Co-authored-by: kseniaguzeeva <[email protected]>
dbeaver · May 22, 2024 · f13cd34 · f13cd34
1 parent 542aec9
commit f13cd34
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/...kiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageDatabaseUserInterface.java b/...kiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageDatabaseUserInterface.java
@@ -32,7 +32,6 @@
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.IWorkbenchPropertyPage;
-import org.eclipse.ui.PlatformUI;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
@@ -319,7 +318,7 @@ public boolean performOk()
  getShell(),
  "Restart " + GeneralUtils.getProductName(),
  "You need to restart " + GeneralUtils.getProductName() + " to perform actual language change.\nDo you want to restart?")) {
- UIUtils.asyncExec(() -> PlatformUI.getWorkbench().restart());
+ restartWorkbenchOnPrefChange();
  }
  }
  } catch (DBException e) {

diff --git a/....ui.editors.connection/src/org/jkiss/dbeaver/ui/preferences/PrefPageDriversClasspath.java b/....ui.editors.connection/src/org/jkiss/dbeaver/ui/preferences/PrefPageDriversClasspath.java
@@ -25,7 +25,6 @@
 import org.eclipse.swt.widgets.*;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.ModelPreferences;
@@ -180,7 +179,7 @@ public boolean performOk() {
  );
 
  if (restart) {
- UIUtils.asyncExec(() -> PlatformUI.getWorkbench().restart());
+ restartWorkbenchOnPrefChange();
  }
  }
 

diff --git a/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/preferences/AbstractPrefPage.java b/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/preferences/AbstractPrefPage.java
@@ -19,8 +19,10 @@
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.jface.window.Window;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.PlatformUI;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.internal.UIMessages;
@@ -51,4 +53,15 @@ void disableButtons() {
  protected boolean hasAccessToPage() {
  return true;
  }
+
+ protected void restartWorkbenchOnPrefChange() {
+ Runnable restarter = () -> PlatformUI.getWorkbench().restart();
+ if (getContainer() instanceof Window window) {
+ window.getShell().addDisposeListener(e ->
+ UIUtils.asyncExec(restarter));
+ window.close();
+ } else {
+ restarter.run();
+ }
+ }
 }