#20602 load controls for extra pages

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageSettings.java

@@ -158,7 +158,6 @@ private IDataSourceConnectionEditor getOriginalConnectionEditor() {
  public void activatePage() {
  if (connectionEditor == null) {
  createProviderPage(getControl().getParent());
- //UIUtils.resizeShell(getWizard().getContainer().getShell());
  }
 
  Control control = getControl();
@@ -192,6 +191,31 @@ public void activatePage() {
  //getContainer().updateTitleBar();
  }
 
+ private void createAdditionalRequiredPages() {
+ if (connectionEditor instanceof IDialogPageProvider dialogPageProvider) {
+ IDialogPage[] requiredDialogPages = dialogPageProvider.getRequiredDialogPages();
+ // potentially n^2 but we don't have a lot of required pages...
+ if (requiredDialogPages != null) {
+ for (IDialogPage requiredDialogPage : requiredDialogPages) {
+ for (CTabItem item : tabFolder.getItems()) {
+ if (item.getData().equals(requiredDialogPage)) {
+ Composite panel = (Composite) item.getControl();
+ try {
+ panel.setRedraw(false);
+ requiredDialogPage.createControl(panel);
+ Dialog.applyDialogFont(panel);
+ panel.layout(true, true);
+ requiredDialogPage.setVisible(false);
+ } finally {
+ panel.setRedraw(true);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
  @Override
  public void deactivatePage() {
  DataSourceDescriptor connectionInfo = getActiveDataSource();
@@ -334,6 +358,7 @@ public void widgetSelected(SelectionEvent e) {
  setErrorMessage("Can't create settings dialog: " + ex.getMessage());
  }
  parent.layout();
+ createAdditionalRequiredPages();
  }
 
  @NotNull
@@ -367,8 +392,7 @@ private ToolBar createChevron(@NotNull List<IDialogPage> pages) {
  }
 
  private boolean confirmTabClose(@NotNull CTabItem item) {
- if (item.getData() instanceof ConnectionPageNetworkHandler) {
- final ConnectionPageNetworkHandler page = (ConnectionPageNetworkHandler) item.getData();
+ if (item.getData() instanceof ConnectionPageNetworkHandler page) {
  final NetworkHandlerDescriptor descriptor = page.getHandlerDescriptor();
 
  final int decision = ConfirmationDialog.confirmAction(
@@ -504,7 +528,7 @@ public void updateButtons() {
 
  @Override
  public boolean openDriverEditor() {
- DriverEditDialog dialog = new DriverEditDialog(wizard.getShell(), (DriverDescriptor) this.getDriver());
+ DriverEditDialog dialog = new DriverEditDialog(wizard.getShell(), this.getDriver());
  return dialog.open() == IDialogConstants.OK_ID;
  }
 

plugins/org.jkiss.dbeaver.ext.oracle.ui/src/org/jkiss/dbeaver/ext/oracle/ui/views/OracleConnectionPage.java

@@ -25,6 +25,7 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.*;
 import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.ext.oracle.model.OracleConstants;
 import org.jkiss.dbeaver.ext.oracle.model.auth.OracleAuthModelDatabaseNative;
 import org.jkiss.dbeaver.ext.oracle.model.auth.OracleAuthOS;
@@ -72,7 +73,8 @@ public class OracleConnectionPage extends ConnectionPageWithAuth implements IDia
  private TextWithOpenFolder tnsPathText;
 
  private boolean activated = false;
- private Image logoImage;
+ private final Image logoImage;
+ private OracleConnectionExtraPage oracleConnectionExtraPage;
 
  public OracleConnectionPage() {
  logoImage = createImage("icons/oracle_logo.png"); //$NON-NLS-1
@@ -450,12 +452,17 @@ public void widgetDefaultSelected(SelectionEvent e) {
  }
 
  @Override
- public IDialogPage[] getDialogPages(boolean extrasOnly, boolean forceCreate)
- {
- return new IDialogPage[] {
- new OracleConnectionExtraPage(),
+ public IDialogPage[] getDialogPages(boolean extrasOnly, boolean forceCreate) {
+  oracleConnectionExtraPage = new OracleConnectionExtraPage();
+ return new IDialogPage[]{
+ oracleConnectionExtraPage,
  new DriverPropertiesDialogPage(this),
  };
  }
 
+ @Nullable
+ @Override
+ public IDialogPage[] getRequiredDialogPages() {
+ return new IDialogPage[]{oracleConnectionExtraPage};
+ }
 }

plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/ui/PostgreConnectionPage.java

@@ -28,6 +28,7 @@
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
+import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.ext.postgresql.PostgreConstants;
 import org.jkiss.dbeaver.ext.postgresql.PostgreMessages;
 import org.jkiss.dbeaver.ext.postgresql.PostgreUtils;
@@ -54,14 +55,15 @@
  * PostgreConnectionPage
  */
 public class PostgreConnectionPage extends ConnectionPageWithAuth implements IDialogPageProvider {
- 
+
  private Text urlText;
  private Text hostText;
  private Text portText;
  private Text dbText;
  private Text roleText; //TODO: make it a combo and fill it with appropriate roles
  private ClientHomesSelector homesSelector;
  private boolean activated = false;
+ private PostgreConnectionPageAdvanced postgreConnectionPageAdvanced;
 
  @Override
  public void dispose() {
@@ -299,12 +301,19 @@ public void saveSettings(DBPDataSourceContainer dataSource) {
 
  @Override
  public IDialogPage[] getDialogPages(boolean extrasOnly, boolean forceCreate) {
- return new IDialogPage[] {
- new PostgreConnectionPageAdvanced(),
+ postgreConnectionPageAdvanced = new PostgreConnectionPageAdvanced();
+ return new IDialogPage[]{
+ postgreConnectionPageAdvanced,
  new DriverPropertiesDialogPage(this)
  };
  }
-
+
+ @Nullable
+ @Override
+ public IDialogPage[] getRequiredDialogPages() {
+ return new IDialogPage[]{postgreConnectionPageAdvanced};
+ }
+
  private void updateUrl() {
  DBPDataSourceContainer dataSourceContainer = site.getActiveDataSource();
  saveSettings(dataSourceContainer);

plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/IDialogPageProvider.java

@@ -28,4 +28,17 @@ public interface IDialogPageProvider {
  @Nullable
  IDialogPage[] getDialogPages(boolean extrasOnly, boolean forceCreate);
 
+ /**
+ * Pages what should be saved during creation, even if they were
+ * never opened
+ *
+ * @return array of IDialogPage[] to create at the initialisation,
+ * null if no additional pages should be created.
+ */
+ @Nullable
+ default IDialogPage[] getRequiredDialogPages() {
+ return null;
+ }
+
+
 }