Preference pages refactoring

plugins/org.jkiss.dbeaver.core.application/plugin.properties

@@ -40,7 +40,7 @@ pref.page.name.sql.completion=SQL Completion
 pref.page.name.sql.format=SQL Formatting
 pref.page.name.sql.execute=SQL Processing
 pref.page.name.sql.editor=SQL Editor
-pref.page.name.data.editor=Data Editor
+pref.page.name.entity.editor=Database Editor
 pref.page.name.binary.editor=Binary Editor
 pref.page.name.drivers=Drivers
 pref.page.name.connectionTypes=Connection Types

plugins/org.jkiss.dbeaver.core.application/plugin.xml

@@ -225,6 +225,9 @@
         <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.connectionTypes" class="org.jkiss.dbeaver.ui.preferences.PrefPageConnectionTypes" name="%pref.page.name.connectionTypes"/>
         <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.navigator" class="org.jkiss.dbeaver.ui.preferences.PrefPageDatabaseNavigator" name="%pref.page.name.navigator"/>
 
+        <page category="org.eclipse.ui.preferencePages.Editors" id="org.jkiss.dbeaver.preferences.main.entityeditor" class="org.jkiss.dbeaver.ui.preferences.PrefPageEntityEditor" name="%pref.page.name.entity.editor">
+            <keywordReference id="org.jkiss.dbeaver.core.keyword.pref.editor.entity"/>
+        </page>
         <page category="org.eclipse.ui.preferencePages.Editors" id="org.jkiss.dbeaver.preferences.main.sqleditor" class="org.jkiss.dbeaver.ui.preferences.PrefPageSQLEditor" name="%pref.page.name.sql.editor">
             <keywordReference id="org.jkiss.dbeaver.core.keyword.pref.editor.sql"/>
         </page>

plugins/org.jkiss.dbeaver.core.application/plugin_de.properties

@@ -26,7 +26,6 @@ pref.page.name.binary.editor          = Bin\u00E4reditor
 pref.page.name.colors.and.fonts       = Farben und Schriftart
 pref.page.name.confirmations          = Best\u00E4tigungen
 pref.page.name.connectionTypes        = Verbindungstypen
-pref.page.name.data.editor            = Daten-Editor
 pref.page.name.data.formats           = Datumsformate
 pref.page.name.db.configuration       = Datenbank
 pref.page.name.db.editors             = Editoren

plugins/org.jkiss.dbeaver.core.application/plugin_it.properties

@@ -18,7 +18,6 @@ pref.page.name.appearance       = Aspetto
 pref.page.name.binary.editor    = Editor Binario
 pref.page.name.colors.and.fonts = Colori e Font
 pref.page.name.confirmations    = Conferme
-pref.page.name.data.editor      = Editor Contenuto
 pref.page.name.data.formats     = Formati dei Dati
 pref.page.name.db.configuration = Database
 pref.page.name.db.editors       = Editor

plugins/org.jkiss.dbeaver.core.application/plugin_ru.properties

@@ -26,7 +26,6 @@ pref.page.name.binary.editor          = \u0414\u0432\u043E\u0438\u0447\u043D\u04
 pref.page.name.colors.and.fonts       = \u0426\u0432\u0435\u0442\u0430 \u0438 \u0448\u0440\u0438\u0444\u0442\u044B
 pref.page.name.confirmations          = \u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u044F
 pref.page.name.connectionTypes        = \u0422\u0438\u043F\u044B \u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0439
-pref.page.name.data.editor            = \u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u0434\u0430\u043D\u043D\u044B\u0445
 pref.page.name.data.formats           = \u0424\u043E\u0440\u043C\u0430\u0442\u044B \u0434\u0430\u043D\u043D\u044B\u0445
 pref.page.name.db.configuration       = \u0411\u0430\u0437\u044B \u0434\u0430\u043D\u043D\u044B\u0445
 pref.page.name.db.editors             = \u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u044B

plugins/org.jkiss.dbeaver.core.application/plugin_zh.properties

@@ -18,7 +18,6 @@ pref.page.name.appearance       = \u5916\u89C2
 pref.page.name.binary.editor    = \u4E8C\u8FDB\u5236\u7F16\u8F91\u5668
 pref.page.name.colors.and.fonts = \u989C\u8272\u548C\u5B57\u4F53
 pref.page.name.confirmations    = \u786E\u8BA4
-pref.page.name.data.editor      = \u5185\u5BB9\u7F16\u8F91\u5668
 pref.page.name.data.formats     = \u6570\u636E\u683C\u5F0F
 pref.page.name.db.editors       = \u7F16\u8F91\u5668
 pref.page.name.db.ui            = \u63A5\u53E3

plugins/org.jkiss.dbeaver.core.eclipse/plugin.properties

@@ -30,7 +30,7 @@ pref.page.name.sql.completion=SQL Completion
 pref.page.name.sql.format=SQL Formatting
 pref.page.name.sql.editor=SQL Editor
 pref.page.name.sql.templates = Templates
-pref.page.name.data.editor=Data Editor
+pref.page.name.entity.editor=Database Editor
 pref.page.name.binary.editor=Binary Editor
 pref.page.name.db.ui=Interface
 pref.page.name.drivers=Drivers

plugins/org.jkiss.dbeaver.core.eclipse/plugin.xml

@@ -67,6 +67,9 @@
         <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.navigator" class="org.jkiss.dbeaver.ui.preferences.PrefPageDatabaseNavigator" name="%pref.page.name.navigator"/>
         <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.main.confirmations" class="org.jkiss.dbeaver.ui.preferences.PrefPageConfirmations" name="%pref.page.name.confirmations"/>
 
+        <page category="org.eclipse.ui.preferencePages.Editors" id="org.jkiss.dbeaver.preferences.main.entityeditor" class="org.jkiss.dbeaver.ui.preferences.PrefPageEntityEditor" name="%pref.page.name.entity.editor">
+            <keywordReference id="org.jkiss.dbeaver.core.keyword.pref.editor.entity"/>
+        </page>
         <page category="org.eclipse.ui.preferencePages.Editors" id="org.jkiss.dbeaver.preferences.main.sqleditor" class="org.jkiss.dbeaver.ui.preferences.PrefPageSQLEditor" name="%pref.page.name.sql.editor">
             <keywordReference id="org.jkiss.dbeaver.core.keyword.pref.editor.sql"/>
         </page>

plugins/org.jkiss.dbeaver.core.eclipse/plugin_de.properties

@@ -22,7 +22,6 @@ menu.navigate = Navigation
 pref.page.name.binary.editor          = Bin\u00E4reditor
 pref.page.name.confirmations          = Best\u00E4tigungen
 pref.page.name.connectionTypes        = Verbindungstypen
-pref.page.name.data.editor            = Dateneditor
 pref.page.name.data.formats           = Datenformate
 pref.page.name.db.configuration       = DBeaver
 pref.page.name.db.editors             = Editoren

plugins/org.jkiss.dbeaver.core.eclipse/plugin_ru.properties

@@ -23,7 +23,6 @@ pref.page.name.data.formats=\u0424\u043E\u0440\u043C\u0430\u0442\u044B \u0434\u0
 pref.page.name.query.manager=\u041C\u0435\u043D\u0435\u0434\u0436\u0435\u0440 \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432
 pref.page.name.db.editors=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u044B
 pref.page.name.sql.editor=SQL \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440
-pref.page.name.data.editor=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u0434\u0430\u043D\u043D\u044B\u0445
 pref.page.name.binary.editor=\u0414\u0432\u043E\u0438\u0447\u043D\u044B\u0439 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440
 pref.page.name.db.ui=\u0418\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441
 pref.page.name.drivers=\u0414\u0440\u0430\u0439\u0432\u0435\u0440\u044B

plugins/org.jkiss.dbeaver.core/plugin.xml

@@ -2202,6 +2202,14 @@
                 </or>
             </enabledWhen>
         </page>
+        <page class="org.jkiss.dbeaver.ui.preferences.PrefPageEntityEditor" id="org.jkiss.dbeaver.preferences.main.entityeditor" name="Database Editor">
+            <enabledWhen>
+                <or>
+                    <instanceof value="org.jkiss.dbeaver.model.navigator.DBNDataSource"/>
+                    <adapt type="org.jkiss.dbeaver.model.DBPDataSourceContainer"/>
+                </or>
+            </enabledWhen>
+        </page>
         <page class="org.jkiss.dbeaver.ui.preferences.PrefPageSQLEditor" id="org.jkiss.dbeaver.preferences.main.sqleditor" name="SQL Editor">
             <enabledWhen>
                 <or>
@@ -2551,6 +2559,7 @@
         <keyword id="org.jkiss.dbeaver.core.keyword.pref.editor.content" label="lob blob clob"/>
         <keyword id="org.jkiss.dbeaver.core.keyword.pref.editor.erd" label="erd diagram"/>
         <keyword id="org.jkiss.dbeaver.core.keyword.pref.editor.sql" label="sql script commit fetch timeout"/>
+        <keyword id="org.jkiss.dbeaver.core.keyword.pref.editor.entity" label="object entity schema catalog table package column"/>
         <keyword id="org.jkiss.dbeaver.core.keyword.pref.ui.general" label="update http proxy"/>
     </extension>
 

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

@@ -130,6 +130,7 @@ public class EditConnectionWizard extends ConnectionWizard
         rsPage.addSubPage(new PrefPageResultSetBinaries(), "Binaries", "Binary data representation");
         rsPage.addSubPage(new PrefPageDataFormat(), "Data Formatting", "Data formatting preferences");
         rsPage.addSubPage(new PrefPageResultSetPresentation(), "Presentation", "ResultSets UI & presentation");
+        addPreferencePage(new PrefPageEntityEditor(), "Database Editor", "Database object editor settings");
         WizardPrefPage sqlPage = addPreferencePage(new PrefPageSQLEditor(), "SQL Editor", "SQL editor settings");
         sqlPage.addSubPage(new PrefPageSQLExecute(), "SQL Processing", "SQL processing settings");
     }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageDatabaseGeneral.java

@@ -48,8 +48,6 @@ public class PrefPageDatabaseGeneral extends AbstractPrefPage implements IWorkbe
     private Button longOperationsCheck;
     private Spinner longOperationsTimeout;
 
-    private Button keepEditorsOnRestart;
-    private Button refreshEditorOnOpen;
     private Combo defaultResourceEncoding;
 
     public PrefPageDatabaseGeneral()
@@ -90,16 +88,6 @@ public class PrefPageDatabaseGeneral extends AbstractPrefPage implements IWorkbe
             }
         }
 
-        // Editors settings
-        {
-            Group groupEditors = UIUtils.createControlGroup(composite, CoreMessages.pref_page_ui_general_group_editors, 1, GridData.VERTICAL_ALIGN_BEGINNING, 0);
-
-            keepEditorsOnRestart = UIUtils.createCheckbox(groupEditors, CoreMessages.pref_page_ui_general_keep_database_editors, false);
-            keepEditorsOnRestart.setToolTipText("Remembers open editors (e.g. table editors) and reopens them after DBeaver restart.");
-
-            refreshEditorOnOpen = UIUtils.createCheckbox(groupEditors, CoreMessages.pref_page_ui_general_refresh_editor_on_open, false);
-            refreshEditorOnOpen.setToolTipText("Refreshes object from database every time you open this object's editor.\nYou may need this option if your database structure changes frequently (e.g. by SQL scripts).");
-        }
         {
             // Resources
             Group groupResources = UIUtils.createControlGroup(composite, "Resources", 2, GridData.VERTICAL_ALIGN_BEGINNING, 0);
@@ -124,8 +112,6 @@ public class PrefPageDatabaseGeneral extends AbstractPrefPage implements IWorkbe
         longOperationsCheck.setSelection(store.getBoolean(DBeaverPreferences.AGENT_LONG_OPERATION_NOTIFY));
         longOperationsTimeout.setSelection(store.getInt(DBeaverPreferences.AGENT_LONG_OPERATION_TIMEOUT));
 
-        keepEditorsOnRestart.setSelection(store.getBoolean(DBeaverPreferences.UI_KEEP_DATABASE_EDITORS));
-        refreshEditorOnOpen.setSelection(store.getBoolean(DBeaverPreferences.NAVIGATOR_REFRESH_EDITORS_ON_OPEN));
         defaultResourceEncoding.setText(store.getString(DBeaverPreferences.DEFAULT_RESOURCE_ENCODING));
     }
 
@@ -139,8 +125,6 @@ public class PrefPageDatabaseGeneral extends AbstractPrefPage implements IWorkbe
         store.setValue(DBeaverPreferences.AGENT_LONG_OPERATION_NOTIFY, longOperationsCheck.getSelection());
         store.setValue(DBeaverPreferences.AGENT_LONG_OPERATION_TIMEOUT, longOperationsTimeout.getSelection());
 
-        store.setValue(DBeaverPreferences.UI_KEEP_DATABASE_EDITORS, keepEditorsOnRestart.getSelection());
-        store.setValue(DBeaverPreferences.NAVIGATOR_REFRESH_EDITORS_ON_OPEN, refreshEditorOnOpen.getSelection());
         store.setValue(DBeaverPreferences.DEFAULT_RESOURCE_ENCODING, defaultResourceEncoding.getText());
 
         PrefUtils.savePreferenceStore(store);

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageDatabaseNavigator.java

@@ -46,7 +46,6 @@ public class PrefPageDatabaseNavigator extends AbstractPrefPage implements IWork
     private Button sortCaseInsensitiveCheck;
     private Button sortFoldersFirstCheck;
     private Button groupByDriverCheck;
-    private Button editorFullName;
     private Button syncEditorDataSourceWithNavigator;
     private Combo doubleClickBehavior;
 
@@ -83,9 +82,6 @@ public class PrefPageDatabaseNavigator extends AbstractPrefPage implements IWork
             groupByDriverCheck.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, true, false, 2, 1));
             groupByDriverCheck.setEnabled(false);
 
-            editorFullName = UIUtils.createCheckbox(navigatorGroup, "Show full object names in editors", false);
-            editorFullName.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, true, false, 2, 1));
-
             syncEditorDataSourceWithNavigator = UIUtils.createCheckbox(navigatorGroup, "Auto-sync editor connection with navigator selection", false);
             syncEditorDataSourceWithNavigator.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, true, false, 2, 1));
             syncEditorDataSourceWithNavigator.setToolTipText("Automatically sets editor (e.g. SQL editor) connection from selected navigator node.\nMakes sense if you need to change active connection/schema frequently.");
@@ -111,7 +107,6 @@ public class PrefPageDatabaseNavigator extends AbstractPrefPage implements IWork
         sortCaseInsensitiveCheck.setSelection(store.getBoolean(DBeaverPreferences.NAVIGATOR_SORT_ALPHABETICALLY));
         sortFoldersFirstCheck.setSelection(store.getBoolean(DBeaverPreferences.NAVIGATOR_SORT_FOLDERS_FIRST));
         groupByDriverCheck.setSelection(store.getBoolean(DBeaverPreferences.NAVIGATOR_GROUP_BY_DRIVER));
-        editorFullName.setSelection(store.getBoolean(DBeaverPreferences.NAVIGATOR_EDITOR_FULL_NAME));
         syncEditorDataSourceWithNavigator.setSelection(store.getBoolean(DBeaverPreferences.NAVIGATOR_SYNC_EDITOR_DATASOURCE));
         doubleClickBehavior.select(
             NavigatorViewBase.DoubleClickBehavior.valueOf(store.getString(DBeaverPreferences.NAVIGATOR_CONNECTION_DOUBLE_CLICK)).ordinal());
@@ -126,7 +121,6 @@ public class PrefPageDatabaseNavigator extends AbstractPrefPage implements IWork
         store.setValue(DBeaverPreferences.NAVIGATOR_SORT_ALPHABETICALLY, sortCaseInsensitiveCheck.getSelection());
         store.setValue(DBeaverPreferences.NAVIGATOR_SORT_FOLDERS_FIRST, sortFoldersFirstCheck.getSelection());
         store.setValue(DBeaverPreferences.NAVIGATOR_GROUP_BY_DRIVER, groupByDriverCheck.getSelection());
-        store.setValue(DBeaverPreferences.NAVIGATOR_EDITOR_FULL_NAME, editorFullName.getSelection());
         store.setValue(DBeaverPreferences.NAVIGATOR_SYNC_EDITOR_DATASOURCE, syncEditorDataSourceWithNavigator.getSelection());
         store.setValue(DBeaverPreferences.NAVIGATOR_CONNECTION_DOUBLE_CLICK,
             CommonUtils.fromOrdinal(NavigatorViewBase.DoubleClickBehavior.class, doubleClickBehavior.getSelectionIndex()).name());

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageEntityEditor.java

+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2016 Serge Rieder (serge@jkiss.org)
+ * Copyright (C) 2011-2012 Eugene Fradkin (eugene.fradkin@gmail.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License (version 2)
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+package org.jkiss.dbeaver.ui.preferences;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.eclipse.ui.IWorkbenchPropertyPage;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.DBeaverPreferences;
+import org.jkiss.dbeaver.core.CoreMessages;
+import org.jkiss.dbeaver.core.DBeaverCore;
+import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
+import org.jkiss.dbeaver.ui.UIUtils;
+import org.jkiss.dbeaver.utils.PrefUtils;
+
+/**
+ * PrefPageEntityEditor
+ */
+public class PrefPageEntityEditor extends AbstractPrefPage implements IWorkbenchPreferencePage, IWorkbenchPropertyPage
+{
+    public static final String PAGE_ID = "org.jkiss.dbeaver.preferences.main.entityEditor"; //$NON-NLS-1$
+
+    private Button keepEditorsOnRestart;
+    private Button refreshEditorOnOpen;
+    private Button editorFullName;
+
+    public PrefPageEntityEditor()
+    {
+        super();
+        setPreferenceStore(new PreferenceStoreDelegate(DBeaverCore.getGlobalPreferenceStore()));
+    }
+
+    @Override
+    public void init(IWorkbench workbench)
+    {
+
+    }
+
+    @Override
+    protected Control createContents(Composite parent)
+    {
+        Composite composite = UIUtils.createPlaceholder(parent, 1, 5);
+
+        // Editors settings
+        {
+            Group groupEditors = UIUtils.createControlGroup(composite, CoreMessages.pref_page_ui_general_group_editors, 1, GridData.VERTICAL_ALIGN_BEGINNING, 0);
+
+            keepEditorsOnRestart = UIUtils.createCheckbox(groupEditors, CoreMessages.pref_page_ui_general_keep_database_editors, false);
+            keepEditorsOnRestart.setToolTipText("Remembers open editors (e.g. table editors) and reopens them after DBeaver restart.");
+
+            refreshEditorOnOpen = UIUtils.createCheckbox(groupEditors, CoreMessages.pref_page_ui_general_refresh_editor_on_open, false);
+            refreshEditorOnOpen.setToolTipText("Refreshes object from database every time you open this object's editor.\nYou may need this option if your database structure changes frequently (e.g. by SQL scripts).");
+
+            editorFullName = UIUtils.createCheckbox(groupEditors, "Show full object names in editors", false);
+            editorFullName.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, true, false, 2, 1));
+
+        }
+
+        performDefaults();
+
+        return composite;
+    }
+
+    @Override
+    protected void performDefaults()
+    {
+        DBPPreferenceStore store = DBeaverCore.getGlobalPreferenceStore();
+
+        keepEditorsOnRestart.setSelection(store.getBoolean(DBeaverPreferences.UI_KEEP_DATABASE_EDITORS));
+        refreshEditorOnOpen.setSelection(store.getBoolean(DBeaverPreferences.NAVIGATOR_REFRESH_EDITORS_ON_OPEN));
+        editorFullName.setSelection(store.getBoolean(DBeaverPreferences.NAVIGATOR_EDITOR_FULL_NAME));
+    }
+
+    @Override
+    public boolean performOk()
+    {
+        DBPPreferenceStore store = DBeaverCore.getGlobalPreferenceStore();
+
+        store.setValue(DBeaverPreferences.UI_KEEP_DATABASE_EDITORS, keepEditorsOnRestart.getSelection());
+        store.setValue(DBeaverPreferences.NAVIGATOR_REFRESH_EDITORS_ON_OPEN, refreshEditorOnOpen.getSelection());
+        store.setValue(DBeaverPreferences.NAVIGATOR_EDITOR_FULL_NAME, editorFullName.getSelection());
+
+        PrefUtils.savePreferenceStore(store);
+
+        return true;
+    }
+
+    @Nullable
+    @Override
+    public IAdaptable getElement()
+    {
+        return null;
+    }
+
+    @Override
+    public void setElement(IAdaptable element)
+    {
+    }
+
+}
\ No newline at end of file