#10 XML editor plugin, data managers model refactoring

features/org.jkiss.dbeaver.core.feature/feature.xml

@@ -54,6 +54,7 @@
     <plugin id="org.jkiss.dbeaver.ui.editors.hex" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ui.editors.image" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ui.editors.sql" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ui.editors.xml" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ui.navigator" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.erd" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.ui.colortheme" download-size="0" install-size="0" version="0.0.0" unpack="false"/>

plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF

@@ -36,15 +36,12 @@ Export-Package: org.jkiss.dbeaver,
  org.jkiss.dbeaver.ui.data.dialogs,
  org.jkiss.dbeaver.ui.data.editors,
  org.jkiss.dbeaver.ui.data.managers,
- org.jkiss.dbeaver.ui.data.managers.stream,
- org.jkiss.dbeaver.ui.data.registry,
  org.jkiss.dbeaver.ui.dialogs,
  org.jkiss.dbeaver.ui.dialogs.connection,
  org.jkiss.dbeaver.ui.dialogs.driver,
  org.jkiss.dbeaver.ui.dialogs.net,
  org.jkiss.dbeaver.ui.dialogs.tools,
  org.jkiss.dbeaver.ui.e4,
- org.jkiss.dbeaver.ui.editors.content,
  org.jkiss.dbeaver.ui.editors.data,
  org.jkiss.dbeaver.ui.editors.sql,
  org.jkiss.dbeaver.ui.editors.sql.convert,
@@ -61,7 +58,6 @@ Export-Package: org.jkiss.dbeaver,
  org.jkiss.dbeaver.ui.editors.sql.syntax.tokens,
  org.jkiss.dbeaver.ui.editors.sql.templates,
  org.jkiss.dbeaver.ui.editors.sql.util,
- org.jkiss.dbeaver.ui.editors.xml,
  org.jkiss.dbeaver.ui.perspective,
  org.jkiss.dbeaver.ui.preferences,
  org.jkiss.dbeaver.ui.resources,

plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle.properties

@@ -388,9 +388,6 @@ meta.org.jkiss.dbeaver.registry.DriverDescriptor.name.name=Driver Name
 meta.org.jkiss.dbeaver.registry.DriverDescriptor.description.name=Description
 meta.org.jkiss.dbeaver.registry.DriverDescriptor.driverClassName.name=Driver Class
 meta.org.jkiss.dbeaver.registry.DriverDescriptor.sampleURL.name=URL
-meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.type.name=Type
-meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.name.name=Name
-meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.columns.name=Columns
 meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.name.name=Name
 meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.foundRows.name=Rows Found (>=)
 

plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_de.properties

@@ -468,9 +468,6 @@ meta.org.jkiss.dbeaver.registry.DriverDescriptor.description.name             =
 meta.org.jkiss.dbeaver.registry.DriverDescriptor.driverClassName.name         = Treiberklasse
 meta.org.jkiss.dbeaver.registry.DriverDescriptor.name.name                    = Treibername
 meta.org.jkiss.dbeaver.registry.DriverDescriptor.sampleURL.name               = URL
-meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.columns.name    = Spalten
-meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.name.name       = Name
-meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.type.name       = Typ
 meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.foundRows.name         = Gefundene Zeilen (>=)
 meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.name.name              = Name
 

plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_fr.properties

@@ -353,9 +353,6 @@ meta.org.jkiss.dbeaver.registry.DriverDescriptor.description.name
 meta.org.jkiss.dbeaver.registry.DriverDescriptor.driverClassName.name                       = Classe de pilote
 meta.org.jkiss.dbeaver.registry.DriverDescriptor.name.name                                  = Nom du pilote
 meta.org.jkiss.dbeaver.registry.DriverDescriptor.sampleURL.name                             = URL
-meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.columns.name                  = Colonnes
-meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.name.name                     = Nom
-meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.type.name                     = Type
 meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.foundRows.name                       = Lignes trouv\u00E9es (>=)
 meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.name.name                            = Nom
 

plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_ja.properties

@@ -367,9 +367,6 @@ meta.org.jkiss.dbeaver.registry.DriverDescriptor.name.name=\u30C9\u30E9\u30A4\u3
 meta.org.jkiss.dbeaver.registry.DriverDescriptor.description.name=\u8AAC\u660E
 meta.org.jkiss.dbeaver.registry.DriverDescriptor.driverClassName.name=\u30C9\u30E9\u30A4\u30D0\u30FC\u30AF\u30E9\u30B9
 meta.org.jkiss.dbeaver.registry.DriverDescriptor.sampleURL.name=URL
-meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.type.name=\u30BF\u30A4\u30D7
-meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.name.name=\u540D
-meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.columns.name=\u5217
 meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.name.name=\u540D
 meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.foundRows.name=\u898B\u3064\u304B\u3063\u305F\u884C\uFF08>\uFF09
 

plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_ru.properties

@@ -279,9 +279,6 @@ meta.org.jkiss.dbeaver.registry.DriverDescriptor.description.name             =
 meta.org.jkiss.dbeaver.registry.DriverDescriptor.driverClassName.name         = \u041A\u043B\u0430\u0441\u0441 \u0414\u0440\u0430\u0439\u0432\u0435\u0440\u0430
 meta.org.jkiss.dbeaver.registry.DriverDescriptor.name.name                    = \u0418\u043C\u044F \u0414\u0440\u0430\u0439\u0432\u0435\u0440\u0430
 meta.org.jkiss.dbeaver.registry.DriverDescriptor.sampleURL.name               = URL
-meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.columns.name    = \u041A\u043E\u043B\u043E\u043D\u043A\u0438
-meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.name.name       = \u0418\u043C\u044F
-meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.type.name       = \u0422\u0438\u043F
 
 search.page.label.db.fulltext = \u041F\u043E\u043B\u043D\u043E\u0442\u0435\u043A\u0441\u0442\u043E\u0432\u044B\u0439 \u043F\u043E\u0438\u0441\u043A \u0411\u0414
 search.page.label.db.metadata = \u041F\u043E\u0438\u0441\u043A \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432 \u0411\u0414

plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_zh.properties

@@ -467,9 +467,6 @@ meta.org.jkiss.dbeaver.registry.DriverDescriptor.description.name             =
 meta.org.jkiss.dbeaver.registry.DriverDescriptor.driverClassName.name         = \u9A71\u52A8\u7C7B
 meta.org.jkiss.dbeaver.registry.DriverDescriptor.name.name                    = \u9A71\u52A8\u540D\u79F0
 meta.org.jkiss.dbeaver.registry.DriverDescriptor.sampleURL.name               = URL
-meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.columns.name    = \u5B57\u6BB5
-meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.name.name       = \u540D\u79F0
-meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.type.name       = \u7C7B\u578B
 meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.foundRows.name         = \u627E\u5230\u7684\u884C(>=)
 meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.name.name              = \u540D\u79F0
 

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

@@ -3626,10 +3626,9 @@
             <supports kind="ROWID"/>
         </manager>
 -->
-        <streamManager class="org.jkiss.dbeaver.ui.data.managers.stream.TextStreamValueManager" id="plaintext" label="Text" primaryMime="text/plain"
-            description="Plain text" icon="platform:/plugin/org.jkiss.dbeaver.model/icons/types/text.png"/>
-        <streamManager class="org.jkiss.dbeaver.ui.data.managers.stream.XMLStreamValueManager" id="xml" label="XML" primaryMime="text/xml"
-            description="XML" icon="platform:/plugin/org.jkiss.dbeaver.model/icons/types/xml.png"/>
+        <manager class="org.jkiss.dbeaver.ui.data.managers.DefaultValueManager" id="DefaultValueManager">
+        </manager>
+
     </extension>
 
     <extension point="org.jkiss.dbeaver.resourceHandler">

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java

@@ -149,7 +149,6 @@ public class CoreMessages extends NLS {
 	public static String controls_client_homes_panel_label_path;
 	public static String controls_client_homes_panel_label_product_name;
 	public static String controls_client_homes_panel_label_product_version;
-	public static String controls_column_info_panel_property_key;
 	public static String controls_driver_tree_column_connections;
 	public static String controls_driver_tree_column_name;
 	public static String controls_itemlist_action_copy;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties

@@ -124,7 +124,6 @@ controls_client_homes_panel_label_name = Name
 controls_client_homes_panel_label_path = Path
 controls_client_homes_panel_label_product_name = Product Name
 controls_client_homes_panel_label_product_version = Product Version
-controls_column_info_panel_property_key = Key
 controls_connection_properties_action_add_property = Add new property
 controls_connection_properties_action_remove_property = Remove property
 controls_connection_properties_category_user_properties = User Properties

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_de.properties

@@ -204,8 +204,6 @@ controls_client_homes_panel_label_product_name = Produktname
 
 controls_client_homes_panel_label_product_version = Produktversion
 
-controls_column_info_panel_property_key = Schl\u00FCssel
-
 controls_connection_properties_action_add_property = Neue Eigenschaft hinzuf\u00FCgen
 
 controls_connection_properties_action_remove_property = Eigenschaft entfernen

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_fr.properties

@@ -153,8 +153,6 @@ controls_client_homes_panel_label_product_name = Nom du produit
 
 controls_client_homes_panel_label_product_version = Version du produit
 
-controls_column_info_panel_property_key = Clef
-
 controls_connection_properties_action_add_property = Ajouter une nouvelle propri\u00E9t\u00E9
 
 controls_connection_properties_action_remove_property = Supprimer la propri\u00E9t\u00E9

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_ja.properties

@@ -116,7 +116,6 @@ controls_client_homes_panel_label_name =\u540D
 controls_client_homes_panel_label_path =\u30D1\u30B9
 controls_client_homes_panel_label_product_name =\u5546\u54C1\u540D
 controls_client_homes_panel_label_product_version =\u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3
-controls_column_info_panel_property_key =\u30AD\u30FC
 controls_connection_properties_action_add_property =\u65B0\u3057\u3044\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8FFD\u52A0\u3059\u308B
 controls_connection_properties_action_remove_property =\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u524A\u9664
 controls_connection_properties_category_user_properties =\u30E6\u30FC\u30B6\u30FC\u306E\u30D7\u30ED\u30D1\u30C6\u30A3

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_ru.properties

@@ -1015,7 +1015,6 @@ controls_client_homes_panel_button_remove_home=\u0423\u0434\u0430\u043B\u0438\u0
 controls_client_homes_panel_confirm_remove_home_text=\u0412\u044B \u0443\u0432\u0435\u0440\u0435\u043D\u044B, \u0447\u0442\u043E \u0445\u043E\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u043A\u043B\u0438\u0435\u043D\u0442\u0430 "{0}"?
 controls_client_homes_panel_confirm_remove_home_title=\u0423\u0434\u0430\u043B\u0435\u043D\u0438\u0435 \u043A\u043B\u0438\u0435\u043D\u0442\u0430
 controls_client_homes_panel_dialog_title=\u041A\u043B\u0438\u0435\u043D\u0442\u044B \u0411\u0414
-controls_column_info_panel_property_key=\u041A\u043B\u044E\u0447
 controls_driver_tree_column_connections=\u0421\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u044F
 controls_driver_tree_column_name=\u0418\u043C\u044F
 controls_rs_pump_job_name=\u0427\u0442\u0435\u043D\u0438\u0435 \u0434\u0430\u043D\u043D\u044B\u0445

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_zh.properties

@@ -204,8 +204,6 @@ controls_client_homes_panel_label_product_name = \u4EA7\u54C1\u540D\u79F0
 
 controls_client_homes_panel_label_product_version = \u4EA7\u54C1\u7248\u672C
 
-controls_column_info_panel_property_key = \u952E
-
 controls_connection_properties_action_add_property = \u6DFB\u52A0\u65B0\u5C5E\u6027
 
 controls_connection_properties_action_remove_property = \u5220\u9664\u5C5E\u6027

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/dialogs/ValueViewDialog.java

@@ -44,7 +44,7 @@ import org.jkiss.dbeaver.runtime.DBWorkbench;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.data.*;
 import org.jkiss.dbeaver.ui.data.managers.BaseValueManager;
-import org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel;
+import org.jkiss.dbeaver.ui.controls.ColumnInfoPanel;
 import org.jkiss.utils.CommonUtils;
 
 /**

plugins/org.jkiss.dbeaver.ui.editors.data/META-INF/MANIFEST.MF

@@ -12,11 +12,21 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.core.expressions,
  org.eclipse.ui,
+ org.eclipse.jface.text,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.workbench.texteditor,
  org.jkiss.dbeaver.model,
  org.jkiss.dbeaver.ui,
  org.jkiss.dbeaver.ui.editors.base,
  org.jkiss.dbeaver.ui.navigator
 Bundle-ClassPath: .
-Export-Package: org.jkiss.dbeaver.ui.controls.lightgrid,
+Export-Package: org.jkiss.dbeaver.ui.controls,
+ org.jkiss.dbeaver.ui.controls.lightgrid,
  org.jkiss.dbeaver.ui.data,
+ org.jkiss.dbeaver.ui.data.managers,
+ org.jkiss.dbeaver.ui.data.managers.stream,
+ org.jkiss.dbeaver.ui.data.registry,
+ org.jkiss.dbeaver.ui.editors.content,
  org.jkiss.dbeaver.ui.editors.data
+

plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle.properties

 Bundle-Vendor = DBeaver Corp
 Bundle-Name = DBeaver UI Editors - Data
 
+meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.type.name=Type
+meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name=Name
+meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name=Columns

plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_de.properties

+meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name    = Spalten
+meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name       = Name
+meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.type.name       = Typ

plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_fr.properties

+meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name                  = Colonnes
+meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name                     = Nom
+meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.type.name                     = Type

plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_ja.properties

+meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.type.name=\u30BF\u30A4\u30D7
+meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name=\u540D
+meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name=\u5217

plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_ru.properties

+meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name    = \u041A\u043E\u043B\u043E\u043D\u043A\u0438
+meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name       = \u0418\u043C\u044F
+meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.type.name       = \u0422\u0438\u043F

plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_zh.properties

+meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name    = \u5B57\u6BB5
+meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name       = \u540D\u79F0
+meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.type.name       = \u7C7B\u578B

plugins/org.jkiss.dbeaver.ui.editors.data/plugin.xml

@@ -3,5 +3,10 @@
 
 <plugin>
 
+    <extension point="org.jkiss.dbeaver.dataManager">
+        <streamManager class="org.jkiss.dbeaver.ui.data.managers.stream.TextStreamValueManager" id="plaintext" label="Text" primaryMime="text/plain"
+                       description="Plain text" icon="platform:/plugin/org.jkiss.dbeaver.model/icons/types/text.png"/>
+    </extension>
+
 
 </plugin>

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/ColumnInfoPanel.java → plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/ColumnInfoPanel.java

@@ -15,14 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ui.dialogs;
+package org.jkiss.dbeaver.ui.controls;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
-import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.model.DBConstants;
 import org.jkiss.dbeaver.model.DBPNamedObject;
 import org.jkiss.dbeaver.model.DBPObject;
@@ -34,6 +33,7 @@ import org.jkiss.dbeaver.runtime.properties.PropertyCollector;
 import org.jkiss.dbeaver.ui.data.IAttributeController;
 import org.jkiss.dbeaver.ui.data.IRowController;
 import org.jkiss.dbeaver.ui.data.IValueController;
+import org.jkiss.dbeaver.ui.editors.data.internal.DataEditorsMessages;
 import org.jkiss.dbeaver.ui.properties.PropertyTreeViewer;
 
 import java.util.ArrayList;
@@ -63,7 +63,7 @@ public class ColumnInfoPanel extends Composite {
             infoItem.addProperty(
                 null,
                 "Key",
-                CoreMessages.controls_column_info_panel_property_key,
+                DataEditorsMessages.controls_column_info_panel_property_key,
                 new CellKeyInfo(valueController.getRowController(), rowIdentifier)
             );
         }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/managers/stream/AbstractTextPanelEditor.java → plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/managers/AbstractTextPanelEditor.java

@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ui.data.managers.stream;
+package org.jkiss.dbeaver.ui.data.managers;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IContributionManager;
 import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.text.IUndoManager;
 import org.eclipse.jface.text.TextViewer;
 import org.eclipse.jface.text.source.ISourceViewer;
@@ -31,19 +32,18 @@ import org.eclipse.ui.PartInitException;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
-import org.jkiss.dbeaver.model.DBPDataKind;
 import org.jkiss.dbeaver.model.DBPMessageType;
 import org.jkiss.dbeaver.model.data.DBDContent;
 import org.jkiss.dbeaver.model.exec.DBCException;
 import org.jkiss.dbeaver.model.impl.StringContentStorage;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.ui.UIUtils;
-import org.jkiss.dbeaver.ui.controls.resultset.panel.valueviewer.ValueViewerPanel;
 import org.jkiss.dbeaver.ui.data.IStreamValueEditor;
 import org.jkiss.dbeaver.ui.data.IValueController;
 import org.jkiss.dbeaver.ui.editors.StringEditorInput;
 import org.jkiss.dbeaver.ui.editors.SubEditorSite;
 import org.jkiss.dbeaver.ui.editors.content.ContentEditorInput;
+import org.jkiss.dbeaver.ui.editors.data.internal.DataEditorsActivator;
 import org.jkiss.dbeaver.ui.editors.text.BaseTextEditor;
 import org.jkiss.dbeaver.utils.RuntimeUtils;
 
@@ -97,7 +97,7 @@ public abstract class AbstractTextPanelEditor<EDITOR extends BaseTextEditor> imp
                     boolean newWW = !editorControl.getWordWrap();
                     setChecked(newWW);
                     editorControl.setWordWrap(newWW);
-                    ValueViewerPanel.getPanelSettings().put(PREF_TEXT_EDITOR_WORD_WRAP, newWW);
+                    getPanelSettings().put(PREF_TEXT_EDITOR_WORD_WRAP, newWW);
                 }
             };
             wwAction.setChecked(editorControl.getWordWrap());
@@ -109,13 +109,13 @@ public abstract class AbstractTextPanelEditor<EDITOR extends BaseTextEditor> imp
             final Action afAction = new Action("Auto Format", Action.AS_CHECK_BOX) {
                 @Override
                 public void run() {
-                    boolean newAF = !ValueViewerPanel.getPanelSettings().getBoolean(PREF_TEXT_EDITOR_AUTO_FORMAT);
+                    boolean newAF = !getPanelSettings().getBoolean(PREF_TEXT_EDITOR_AUTO_FORMAT);
                     setChecked(newAF);
-                    ValueViewerPanel.getPanelSettings().put(PREF_TEXT_EDITOR_AUTO_FORMAT, newAF);
+                    getPanelSettings().put(PREF_TEXT_EDITOR_AUTO_FORMAT, newAF);
                     applyEditorStyle();
                 }
             };
-            afAction.setChecked(ValueViewerPanel.getPanelSettings().getBoolean(PREF_TEXT_EDITOR_AUTO_FORMAT));
+            afAction.setChecked(getPanelSettings().getBoolean(PREF_TEXT_EDITOR_AUTO_FORMAT));
             manager.add(afAction);
         }
     }
@@ -125,7 +125,7 @@ public abstract class AbstractTextPanelEditor<EDITOR extends BaseTextEditor> imp
     }
 
     private void initEditorSettings(StyledText control) {
-        boolean wwEnabled = ValueViewerPanel.getPanelSettings().getBoolean(PREF_TEXT_EDITOR_WORD_WRAP);
+        boolean wwEnabled = getPanelSettings().getBoolean(PREF_TEXT_EDITOR_WORD_WRAP);
         if (wwEnabled != control.getWordWrap()) {
             control.setWordWrap(wwEnabled);
         }
@@ -133,7 +133,7 @@ public abstract class AbstractTextPanelEditor<EDITOR extends BaseTextEditor> imp
 
     private void applyEditorStyle() {
         BaseTextEditor textEditor = getTextEditor();
-        if (textEditor != null && ValueViewerPanel.getPanelSettings().getBoolean(PREF_TEXT_EDITOR_AUTO_FORMAT)) {
+        if (textEditor != null && getPanelSettings().getBoolean(PREF_TEXT_EDITOR_AUTO_FORMAT)) {
             try {
                 if (textEditor.getViewer().canDoOperation(ISourceViewer.FORMAT)) {
                     textEditor.getViewer().doOperation(ISourceViewer.FORMAT);
@@ -205,4 +205,15 @@ public abstract class AbstractTextPanelEditor<EDITOR extends BaseTextEditor> imp
         }
     }
 
+    private static IDialogSettings viewerSettings;
+
+    public static IDialogSettings getPanelSettings() {
+        if (viewerSettings == null) {
+            viewerSettings = UIUtils.getSettingsSection(
+                DataEditorsActivator.getDefault().getDialogSettings(),
+                AbstractTextPanelEditor.class.getSimpleName());
+        }
+        return viewerSettings;
+    }
+
 }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/managers/stream/TextEditorPart.java → plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/managers/stream/TextEditorPart.java

@@ -27,7 +27,6 @@ import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.DBeaverIcons;
 import org.jkiss.dbeaver.ui.editors.text.BaseTextEditor;
 import org.jkiss.dbeaver.ui.editors.text.FileRefDocumentProvider;
-import org.jkiss.dbeaver.ui.editors.xml.XMLSourceViewerConfiguration;
 
 /**
  * CONTENT text editor

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/managers/stream/TextPanelEditor.java → plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/managers/stream/TextPanelEditor.java

@@ -17,7 +17,7 @@
 package org.jkiss.dbeaver.ui.data.managers.stream;
 
 import org.jkiss.dbeaver.ui.data.IValueController;
-import org.jkiss.dbeaver.ui.editors.text.BaseTextEditor;
+import org.jkiss.dbeaver.ui.data.managers.AbstractTextPanelEditor;
 
 /**
 * TextPanelEditor

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/registry/StreamValueManagerDescriptor.java → plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/registry/StreamValueManagerDescriptor.java

@@ -20,7 +20,6 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.model.DBPImage;
 import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
-import org.jkiss.dbeaver.registry.RegistryConstants;
 import org.jkiss.dbeaver.ui.data.IStreamValueManager;
 import org.jkiss.utils.ArrayUtils;
 import org.jkiss.utils.CommonUtils;
@@ -48,11 +47,11 @@ public class StreamValueManagerDescriptor extends AbstractDescriptor
     {
         super(config);
 
-        this.id = config.getAttribute(RegistryConstants.ATTR_ID);
-        this.implType = new ObjectType(config.getAttribute(RegistryConstants.ATTR_CLASS));
-        this.label = config.getAttribute(RegistryConstants.ATTR_LABEL);
-        this.description = config.getAttribute(RegistryConstants.ATTR_DESCRIPTION);
-        this.icon = iconToImage(config.getAttribute(RegistryConstants.ATTR_ICON));
+        this.id = config.getAttribute("id");
+        this.implType = new ObjectType(config.getAttribute("class"));
+        this.label = config.getAttribute("label");
+        this.description = config.getAttribute("description");
+        this.icon = iconToImage(config.getAttribute("icon"));
 
         this.primaryMime = config.getAttribute(ATTR_PRIMARY_MIME);
         String supportedMimeString = config.getAttribute(ATTR_SUPPORTED_MIME);

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/registry/ValueManagerDescriptor.java → plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/registry/ValueManagerDescriptor.java

@@ -22,12 +22,11 @@ import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.DBPDataKind;
 import org.jkiss.dbeaver.model.DBPDataSource;
+import org.jkiss.dbeaver.model.connection.DBPDriver;
 import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
 import org.jkiss.dbeaver.model.struct.DBSDataType;
 import org.jkiss.dbeaver.model.struct.DBSTypedObject;
 import org.jkiss.dbeaver.model.struct.DBSTypedObjectEx;
-import org.jkiss.dbeaver.registry.RegistryConstants;
-import org.jkiss.dbeaver.registry.driver.DriverDescriptor;
 import org.jkiss.dbeaver.ui.data.IValueManager;
 import org.jkiss.utils.CommonUtils;
 
@@ -68,8 +67,8 @@ public class ValueManagerDescriptor extends AbstractDescriptor
     {
         super(config);
 
-        this.id = config.getAttribute(RegistryConstants.ATTR_ID);
-        this.implType = new ObjectType(config.getAttribute(RegistryConstants.ATTR_CLASS));
+        this.id = config.getAttribute("id");
+        this.implType = new ObjectType(config.getAttribute("class"));
 
         IConfigurationElement[] typeElements = config.getChildren(TAG_SUPPORTS);
         for (IConfigurationElement typeElement : typeElements) {
@@ -128,7 +127,7 @@ public class ValueManagerDescriptor extends AbstractDescriptor
         final DBPDataKind dataKind = typedObject.getDataKind();
         for (SupportInfo info : supportInfos) {
             if (dataSource != null && info.dataSource != null) {
-                DriverDescriptor driver = (DriverDescriptor) dataSource.getContainer().getDriver();
+                DBPDriver driver = dataSource.getContainer().getDriver();
                 if (!info.dataSource.equals(driver.getProviderId()) && !info.dataSource.equals(dataSource.getClass().getName())) {
                     continue;
                 }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/registry/ValueManagerRegistry.java → plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/registry/ValueManagerRegistry.java

@@ -28,7 +28,6 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSTypedObject;
 import org.jkiss.dbeaver.ui.data.IStreamValueManager;
 import org.jkiss.dbeaver.ui.data.IValueManager;
-import org.jkiss.dbeaver.ui.data.managers.DefaultValueManager;
 import org.jkiss.utils.CommonUtils;
 import org.jkiss.utils.MimeType;
 
@@ -80,7 +79,7 @@ public class ValueManagerRegistry {
             manager = findManager(dataSource, dataKind, valueType, false, false);
         }
         if (manager == null) {
-            manager = DefaultValueManager.INSTANCE;
+            throw new IllegalStateException("Can't find default data manager for " + dataKind);
         }
         return manager;
     }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/content/ContentEditor.java → plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/content/ContentEditor.java

@@ -40,17 +40,17 @@ import org.jkiss.dbeaver.model.runtime.DefaultProgressMonitor;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
 import org.jkiss.dbeaver.ui.IRefreshablePart;
 import org.jkiss.dbeaver.ui.UIUtils;
-import org.jkiss.dbeaver.ui.controls.resultset.IResultSetContainer;
+import org.jkiss.dbeaver.ui.controls.ColumnInfoPanel;
 import org.jkiss.dbeaver.ui.data.IStreamValueManager;
 import org.jkiss.dbeaver.ui.data.IValueController;
 import org.jkiss.dbeaver.ui.data.IValueEditorStandalone;
 import org.jkiss.dbeaver.ui.data.managers.stream.TextStreamValueManager;
 import org.jkiss.dbeaver.ui.data.registry.StreamValueManagerDescriptor;
 import org.jkiss.dbeaver.ui.data.registry.ValueManagerRegistry;
-import org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel;
 import org.jkiss.dbeaver.ui.dialogs.DialogUtils;
 import org.jkiss.dbeaver.ui.editors.MultiPageAbstractEditor;
 import org.jkiss.dbeaver.ui.editors.entity.EntityEditor;
+import org.jkiss.dbeaver.ui.editors.entity.IEntityDataContainer;
 
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
@@ -261,7 +261,7 @@ public class ContentEditor extends MultiPageAbstractEditor implements IValueEdit
                 if (parentEditorSite instanceof MultiPageEditorSite) {
                     parentEditor = ((MultiPageEditorSite) parentEditorSite).getMultiPageEditor();
                     if (parentEditor instanceof EntityEditor) {
-                        ((EntityEditor) parentEditor).setActiveEditor(IResultSetContainer.class);
+                        ((EntityEditor) parentEditor).setActiveEditor(IEntityDataContainer.class);
                     }
                 } else {
                     parentEditor = parentEditorSite.getPart();

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/content/ContentEditorInput.java → plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/content/ContentEditorInput.java

@@ -27,7 +27,6 @@ import org.eclipse.ui.editors.text.IEncodingSupport;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
-import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.model.DBPContextProvider;
 import org.jkiss.dbeaver.model.DBValueFormatting;
@@ -43,6 +42,7 @@ import org.jkiss.dbeaver.model.impl.StringContentStorage;
 import org.jkiss.dbeaver.model.impl.TemporaryContentStorage;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.runtime.DefaultProgressMonitor;
+import org.jkiss.dbeaver.runtime.DBWorkbench;
 import org.jkiss.dbeaver.runtime.LocalFileStorage;
 import org.jkiss.dbeaver.ui.DBeaverIcons;
 import org.jkiss.dbeaver.ui.IRefreshablePart;
@@ -201,7 +201,7 @@ public class ContentEditorInput implements IPathEditorInput, IStatefulEditorInpu
                         valueId = valueController.getValueName();
                     }
 
-                    contentFile = ContentUtils.createTempContentFile(monitor, DBeaverCore.getInstance(), valueId);
+                    contentFile = ContentUtils.createTempContentFile(monitor, DBWorkbench.getPlatform(), valueId);
                 }
 
                 // Write value to file
@@ -282,7 +282,7 @@ public class ContentEditorInput implements IPathEditorInput, IStatefulEditorInpu
             if (value instanceof DBDContent) {
                 ((DBDContent)value).updateContents(
                     new DefaultProgressMonitor(monitor),
-                    new ExternalContentStorage(DBeaverCore.getInstance(), extFile));
+                    new ExternalContentStorage(DBWorkbench.getPlatform(), extFile));
             } else {
                 updateStringValueFromFile(extFile);
             }
@@ -368,7 +368,7 @@ public class ContentEditorInput implements IPathEditorInput, IStatefulEditorInpu
                 }
             } else {
                 // Create new storage and pass it to content
-                storage = new TemporaryContentStorage(DBeaverCore.getInstance(), contentFile, fileCharset);
+                storage = new TemporaryContentStorage(DBWorkbench.getPlatform(), contentFile, fileCharset);
                 contentDetached = content.updateContents(monitor, storage);
             }
         } else if (stringStorage != null) {

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsMessages.java

@@ -24,6 +24,7 @@ public class DataEditorsMessages extends NLS {
 
 	public static String grid_tooltip_sort_by_column;
 	public static String grid_tooltip_filter_by_column;
+    public static String controls_column_info_panel_property_key;
 
     static {
 		// initialize resource bundle

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources.properties

 grid_tooltip_sort_by_column = Sort by column
 grid_tooltip_filter_by_column = Filter by column value
 
+controls_column_info_panel_property_key = Key

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_de.properties

 grid_tooltip_filter_by_column = Filtern mit Spaltenwert
 grid_tooltip_sort_by_column = Sortieren mit Spalte
+
+controls_column_info_panel_property_key = Schl\u00FCssel
+

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_fr.properties

 grid_tooltip_sort_by_column = Trier par colonne
 grid_tooltip_filter_by_column = Filtrer par la valeur de colonne
+
+controls_column_info_panel_property_key = Clef

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_ja.properties

+controls_column_info_panel_property_key =\u30AD\u30FC

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_ru.properties

 grid_tooltip_sort_by_column = \u0421\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u043A\u0430 \u043F\u043E \u043A\u043E\u043B\u043E\u043D\u043A\u0435
 grid_tooltip_filter_by_column = \u0424\u0438\u043B\u044C\u0442\u0440 \u043F\u043E \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044E \u043A\u043E\u043B\u043E\u043D\u043A\u0438
+
+controls_column_info_panel_property_key=\u041A\u043B\u044E\u0447

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_zh.properties

 grid_tooltip_filter_by_column = \u6309\u5217\u503C\u8FC7\u6EE4
 grid_tooltip_sort_by_column = \u6309\u5217\u8FC7\u6EE4
 
+controls_column_info_panel_property_key = \u952E
+

plugins/org.jkiss.dbeaver.ui.editors.xml/.classpath

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

plugins/org.jkiss.dbeaver.ui.editors.xml/.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.jkiss.dbeaver.ui.editors.xml</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

plugins/org.jkiss.dbeaver.ui.editors.xml/META-INF/MANIFEST.MF

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.jkiss.dbeaver.ui.editors.xml;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Release-Date: 20181224
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.core.expressions,
+ org.eclipse.jface.text,
+ org.eclipse.ui,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.workbench.texteditor,
+ org.jkiss.dbeaver.model,
+ org.jkiss.dbeaver.ui,
+ org.jkiss.dbeaver.ui.editors.base,
+ org.jkiss.dbeaver.ui.editors.data
+Bundle-ClassPath: .
+Export-Package: org.jkiss.dbeaver.ui.editors.xml,
+ org.jkiss.dbeaver.ui.data.managers.stream

plugins/org.jkiss.dbeaver.ui.editors.xml/OSGI-INF/l10n/bundle.properties

+Bundle-Vendor = DBeaver Corp
+Bundle-Name = DBeaver UI Editors - XML
+

plugins/org.jkiss.dbeaver.ui.editors.xml/build.properties

+source.. = src/
+output.. = target/classes/
+bin.includes = .,\
+               META-INF/,\
+               OSGI-INF/,\
+               plugin.xml

plugins/org.jkiss.dbeaver.ui.editors.xml/plugin.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+
+<plugin>
+
+    <extension point="org.jkiss.dbeaver.dataManager">
+        <streamManager class="org.jkiss.dbeaver.ui.data.managers.stream.XMLStreamValueManager" id="xml" label="XML" primaryMime="text/xml"
+                       description="XML" icon="platform:/plugin/org.jkiss.dbeaver.model/icons/types/xml.png"/>
+    </extension>
+
+</plugin>

plugins/org.jkiss.dbeaver.ui.editors.xml/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.jkiss.dbeaver</groupId>
+    <artifactId>plugins</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+     <relativePath>../</relativePath>
+  </parent>
+  <artifactId>org.jkiss.dbeaver.ui.editors.xml</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/managers/stream/XMLPanelEditor.java → plugins/org.jkiss.dbeaver.ui.editors.xml/src/org/jkiss/dbeaver/ui/data/managers/stream/XMLPanelEditor.java

@@ -17,7 +17,7 @@
 package org.jkiss.dbeaver.ui.data.managers.stream;
 
 import org.jkiss.dbeaver.ui.data.IValueController;
-import org.jkiss.dbeaver.ui.editors.text.BaseTextEditor;
+import org.jkiss.dbeaver.ui.data.managers.AbstractTextPanelEditor;
 import org.jkiss.dbeaver.ui.editors.xml.XMLEditor;
 
 /**

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/xml/XMLFormattingStrategy.java → plugins/org.jkiss.dbeaver.ui.editors.xml/src/org/jkiss/dbeaver/ui/editors/xml/XMLFormattingStrategy.java

@@ -64,7 +64,7 @@ public class XMLFormattingStrategy extends ContextBasedFormattingStrategy
             transformer.transform(source, result);
             return result.getWriter().toString();
         } catch (Throwable e) {
-            log.debug("Error formatting XML", e);
+            log.debug("Error formatting XML: " + e.getMessage());
             return content;
         }
     }

plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_ru.properties

@@ -25,9 +25,6 @@ actions_navigator_copy_fqn_title=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u043
 actions_navigator_copy_fqn_titles=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043F\u043E\u043B\u043D\u044B\u0435 \u0438\u043C\u0435\u043D\u0430
 actions_navigator_copy_object_copy_node=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C {0}
 actions_navigator_copy_object_copy_objects=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043E\u0431\u044A\u0435\u043A\u0442\u044B
-actions_navigator_bookmark_error_message=\u041E\u0448\u0438\u0431\u043A\u0430 \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u044F \u0437\u0430\u043A\u043B\u0430\u0434\u043A\u0438
-actions_navigator_bookmark_error_title=\u041D\u043E\u0432\u0430\u044F \u0437\u0430\u043A\u043B\u0430\u0434\u043A\u0430
-actions_navigator_bookmark_title=\u0418\u043C\u044F \u0437\u0430\u043A\u043B\u0430\u0434\u043A\u0438
 actions_navigator_create_folder_error_message=\u041E\u0448\u0438\u0431\u043A\u0430 \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u044F \u043F\u0430\u043F\u043A\u0438 "{0}"
 actions_navigator_create_folder_error_title=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043F\u0430\u043F\u043A\u0443
 actions_navigator_create_folder_folder_name=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043F\u0430\u043F\u043A\u0443

plugins/pom.xml

@@ -23,6 +23,7 @@
         <module>org.jkiss.dbeaver.ui.editors.hex</module>
         <module>org.jkiss.dbeaver.ui.editors.image</module>
         <module>org.jkiss.dbeaver.ui.editors.sql</module>
+        <module>org.jkiss.dbeaver.ui.editors.xml</module>
         <module>org.jkiss.dbeaver.ui.navigator</module>
 
         <module>org.jkiss.dbeaver.debug.core</module>