Bring back connection folder setting

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

@@ -29,10 +29,7 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.*;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.core.CoreMessages;
-import org.jkiss.dbeaver.model.DBPDataSourceContainer;
-import org.jkiss.dbeaver.model.DBPDataSourceFolder;
-import org.jkiss.dbeaver.model.DBPDataSourcePermission;
-import org.jkiss.dbeaver.model.DBPDataSourceProvider;
+import org.jkiss.dbeaver.model.*;
 import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
 import org.jkiss.dbeaver.model.connection.DBPConnectionType;
 import org.jkiss.dbeaver.model.navigator.DBNBrowseSettings;
@@ -47,6 +44,7 @@ import org.jkiss.dbeaver.registry.DataSourceProviderRegistry;
 import org.jkiss.dbeaver.ui.IHelpContextIds;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.controls.CSmartCombo;
+import org.jkiss.dbeaver.ui.internal.UINavigatorMessages;
 import org.jkiss.dbeaver.ui.navigator.dialogs.EditObjectFilterDialog;
 import org.jkiss.dbeaver.ui.preferences.PrefPageConnectionTypes;
 import org.jkiss.utils.CommonUtils;
@@ -79,7 +77,7 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
     private Text connectionNameText;
     private CSmartCombo<DBPConnectionType> connectionTypeCombo;
     private Combo navigatorSettingsCombo;
-    //private Combo connectionFolderCombo;
+    private Combo connectionFolderCombo;
     private Text descriptionText;
 
     private boolean connectionNameChanged = false;
@@ -156,14 +154,12 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
                 connectionTypeCombo.select(conConfig.getConnectionType());
                 updateNavigatorSettingsPreset();
 
-                /*
                 dataSourceFolder = dataSourceDescriptor.getFolder();
                 if (dataSourceDescriptor.getFolder() == null) {
                     connectionFolderCombo.select(0);
                 } else {
                     connectionFolderCombo.select(connectionFolders.indexOf(dataSourceFolder));
                 }
-*/
 
                 if (dataSourceDescriptor.getDescription() != null) {
                     descriptionText.setText(dataSourceDescriptor.getDescription());
@@ -176,13 +172,11 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
         } else {
             // Default settings
             connectionTypeCombo.select(0);
-/*
             if (dataSourceFolder != null) {
                 connectionFolderCombo.select(connectionFolders.indexOf(dataSourceFolder));
             } else {
                 connectionFolderCombo.select(0);
             }
-*/
 
             readOnlyConnection.setSelection(false);
         }
@@ -370,7 +364,6 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
                 });
             }
 
-    /*
             {
                 UIUtils.createControlLabel(miscGroup, CoreMessages.dialog_connection_wizard_final_label_connection_folder);
 
@@ -386,7 +379,6 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
                     }
                 });
             }
-    */
 
             {
                 Label descLabel = UIUtils.createControlLabel(miscGroup, CoreMessages.dialog_connection_wizard_description);
@@ -526,7 +518,6 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
         }
     }
 
-/*
     private void loadConnectionFolders()
     {
         connectionFolderCombo.removeAll();
@@ -550,7 +541,6 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
             loadConnectionFolder(level + 1, child);
         }
     }
-*/
 
     @Override
     public boolean isPageComplete()
@@ -568,7 +558,7 @@ class ConnectionPageGeneral extends ConnectionWizardPage {
 
         String name = connectionNameChanged ? connectionNameText.getText() : generateConnectionName(getWizard().getPageSettings());
         dataSource.setName(name);
-        //dataSource.setFolder(dataSourceFolder);
+        dataSource.setFolder(dataSourceFolder);
 
         if (connectionTypeCombo.getSelectionIndex() >= 0) {
             confConfig.setConnectionType(connectionTypeCombo.getItem(connectionTypeCombo.getSelectionIndex()));