From 67ae835a247b4afd3db037fc91a316e0f464c7e4 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Wed, 2 Jan 2019 00:48:42 +0300
Subject: [PATCH] #10 Command bindings fix

Former-commit-id: f43d722ffd4faa66977d64f388a6db2d4ed8a19c
---
 .../OSGI-INF/l10n/bundle_de.properties             |  2 --
 .../OSGI-INF/l10n/bundle_zh.properties             |  2 --
 plugins/org.jkiss.dbeaver.core/plugin.xml          |  3 ---
 .../OSGI-INF/l10n/bundle.properties                |  4 ++--
 .../OSGI-INF/l10n/bundle_de.properties             |  2 ++
 .../OSGI-INF/l10n/bundle_zh.properties             |  2 ++
 .../org.jkiss.dbeaver.ui.editors.data/plugin.xml   | 14 ++++++++++++++
 .../OSGI-INF/l10n/bundle.properties                |  2 --
 .../org.jkiss.dbeaver.ui.editors.sql/plugin.xml    | 10 ----------
 9 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_de.properties b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_de.properties
index 3ff1090166..13a3f292a0 100644
--- a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_de.properties
+++ b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_de.properties
@@ -151,8 +151,6 @@ command.org.jkiss.dbeaver.core.txn.log.description                          = Ak
 command.org.jkiss.dbeaver.core.txn.log.name                                 = Transaktionslog
 command.org.jkiss.dbeaver.core.txn.pending.description                      = Liste aller ausstehenden Transaktionen
 command.org.jkiss.dbeaver.core.txn.pending.name                             = Ausstehenden Transaktionen
-command.org.jkiss.dbeaver.ui.editors.data.forSelection.description          = Anzeigen/Editieren der Tabellendaten
-command.org.jkiss.dbeaver.ui.editors.data.forSelection.name                 = Daten editieren
 command.org.jkiss.dbeaver.ui.tools.menu.description                         = Kontextmen\u00FC mit Datenbankwerkzeugen anzeigen
 command.org.jkiss.dbeaver.ui.tools.menu.name                                = Kontextwerkzeuge
 command.org.jkiss.dbeaver.ui.tools.select.connection.description            = Verbindung f\u00FCr aktuellen Editor ausw\u00E4hlen
diff --git a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_zh.properties b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_zh.properties
index 73b8eaed1b..410588570e 100644
--- a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_zh.properties
+++ b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_zh.properties
@@ -139,8 +139,6 @@ command.org.jkiss.dbeaver.core.txn.log.description                          = \u
 command.org.jkiss.dbeaver.core.txn.log.name                                 = \u4E8B\u52A1\u65E5\u5FD7
 command.org.jkiss.dbeaver.core.txn.pending.description                      = \u6240\u6709\u5F85\u5904\u7406\u4E8B\u52A1\u7684\u5217\u8868
 command.org.jkiss.dbeaver.core.txn.pending.name                             = \u5F85\u5904\u7406\u4E8B\u52A1
-command.org.jkiss.dbeaver.ui.editors.data.forSelection.description          = \u67E5\u770B/\u7F16\u8F91\u8868\u683C\u6570\u636E
-command.org.jkiss.dbeaver.ui.editors.data.forSelection.name                 = \u7F16\u8F91\u6570\u636E
 command.org.jkiss.dbeaver.ui.tools.menu.description                         = \u663E\u793A\u5E26\u6570\u636E\u5E93\u5DE5\u5177\u7684\u4E0A\u4E0B\u6587\u83DC\u5355
 command.org.jkiss.dbeaver.ui.tools.menu.name                                = \u4E0A\u4E0B\u6587\u5DE5\u5177
 command.org.jkiss.dbeaver.ui.tools.select.connection.description            = \u4E3A\u5F53\u524D\u7F16\u8F91\u5668\u9009\u62E9\u8FDE\u63A5
diff --git a/plugins/org.jkiss.dbeaver.core/plugin.xml b/plugins/org.jkiss.dbeaver.core/plugin.xml
index b5886db5c4..41366af4bf 100644
--- a/plugins/org.jkiss.dbeaver.core/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.core/plugin.xml
@@ -138,7 +138,6 @@
         <command id="org.jkiss.dbeaver.core.txn.log" name="%command.org.jkiss.dbeaver.core.txn.log.name" description="%command.org.jkiss.dbeaver.core.txn.log.description" categoryId="org.jkiss.dbeaver.core.database"/>
         <command id="org.jkiss.dbeaver.core.txn.pending" name="%command.org.jkiss.dbeaver.core.txn.pending.name" description="%command.org.jkiss.dbeaver.core.txn.pending.description" categoryId="org.jkiss.dbeaver.core.database"/>
 
-        <command id="org.jkiss.dbeaver.ui.editors.data.forSelection" name="%command.org.jkiss.dbeaver.ui.editors.data.forSelection.name" description="%command.org.jkiss.dbeaver.ui.editors.data.forSelection.description" categoryId="org.jkiss.dbeaver.core.database"/>
         <command id="org.jkiss.dbeaver.core.procedure.execute" name="%command.org.jkiss.dbeaver.core.procedure.execute.name" description="%command.org.jkiss.dbeaver.core.procedure.execute.description" categoryId="org.jkiss.dbeaver.core.database"/>
 
         <command id="org.jkiss.dbeaver.core.compare.objects" name="%command.org.jkiss.dbeaver.core.compare.objects.name" description="%command.org.jkiss.dbeaver.core.compare.objects.description" categoryId="org.jkiss.dbeaver.core.util"/>
@@ -169,8 +168,6 @@
         <image commandId="org.jkiss.dbeaver.core.rollback" icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/rollback.png"/>
         <image commandId="org.jkiss.dbeaver.core.txn.log" icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/txn_log.png"/>
 
-        <image commandId="org.jkiss.dbeaver.ui.editors.data.forSelection" icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/sql_table.png"/>
-
         <image commandId="org.jkiss.dbeaver.core.qm.filter" icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/misc/filter.png"/>
         <image commandId="org.jkiss.dbeaver.core.qm.clear" icon="IMG_ETOOL_CLEAR"/>
 
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle.properties b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle.properties
index 39565ba9b0..ed42e0d709 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle.properties
@@ -99,8 +99,8 @@ command.org.jkiss.dbeaver.core.resultset.referencesMenu.name=References
 command.org.jkiss.dbeaver.core.resultset.referencesMenu.description=Foreign keys and tables referencing current table
 command.org.jkiss.dbeaver.core.resultset.toggleOrder.name=Toggle results sort order
 command.org.jkiss.dbeaver.core.resultset.toggleOrder.description=Toggle results sort order (ascending/descending/default)
-
-
+command.org.jkiss.dbeaver.ui.editors.data.forSelection.name=Edit data
+command.org.jkiss.dbeaver.ui.editors.data.forSelection.description=View/edit table  data
 
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.type.name=Type
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name=Name
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_de.properties b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_de.properties
index adfe601ebe..106a76ddab 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_de.properties
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_de.properties
@@ -85,6 +85,8 @@ command.org.jkiss.dbeaver.core.resultset.toggleMode.description             = Um
 command.org.jkiss.dbeaver.core.resultset.toggleMode.name                    = Umschalten zwischen Grid- und Textansicht
 command.org.jkiss.dbeaver.core.resultset.toggleOrder.description            = Umschalten der Reihenfolge der Ergebnisse (aufsteigend(asc)/absteigend(desc)/standard)
 command.org.jkiss.dbeaver.core.resultset.toggleOrder.name                   = \u00C4ndern der Reihenfolge der Ergebnisse
+command.org.jkiss.dbeaver.ui.editors.data.forSelection.description          = Anzeigen/Editieren der Tabellendaten
+command.org.jkiss.dbeaver.ui.editors.data.forSelection.name                 = Daten editieren
 
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name    = Spalten
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name       = Name
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_zh.properties b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_zh.properties
index 1e9660dab3..a58b7c9356 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_zh.properties
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_zh.properties
@@ -83,6 +83,8 @@ command.org.jkiss.dbeaver.core.resultset.toggleMode.description             = \u
 command.org.jkiss.dbeaver.core.resultset.toggleMode.name                    = \u5207\u6362\u8868\u683C/\u8BB0\u5F55\u89C6\u56FE
 command.org.jkiss.dbeaver.core.resultset.toggleOrder.description            = \u5207\u6362\u7ED3\u679C\u96C6\u7684\u6392\u5E8F(\u5347\u5E8F/\u964D\u5E8F/\u9ED8\u8BA4)
 command.org.jkiss.dbeaver.core.resultset.toggleOrder.name                   = \u5207\u6362\u7ED3\u679C\u6392\u5E8F
+command.org.jkiss.dbeaver.ui.editors.data.forSelection.description          = \u67E5\u770B/\u7F16\u8F91\u8868\u683C\u6570\u636E
+command.org.jkiss.dbeaver.ui.editors.data.forSelection.name                 = \u7F16\u8F91\u6570\u636E
 
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name    = \u5B57\u6BB5
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name       = \u540D\u79F0
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/plugin.xml b/plugins/org.jkiss.dbeaver.ui.editors.data/plugin.xml
index 4ddce7da3e..b1e895679b 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/plugin.xml
@@ -233,6 +233,8 @@
         <command id="org.jkiss.dbeaver.core.resultset.referencesMenu" name="%command.org.jkiss.dbeaver.core.resultset.referencesMenu.name" description="%command.org.jkiss.dbeaver.core.resultset.referencesMenu.description" categoryId="org.jkiss.dbeaver.core.rs"/>
         <command id="org.jkiss.dbeaver.core.resultset.toggleOrder" name="%command.org.jkiss.dbeaver.core.resultset.toggleOrder.name" description="%command.org.jkiss.dbeaver.core.resultset.toggleOrder.description" categoryId="org.jkiss.dbeaver.core.rs"/>
         <command id="org.jkiss.dbeaver.core.resultset.export" name="%command.org.jkiss.dbeaver.core.resultset.export.name" description="%command.org.jkiss.dbeaver.core.resultset.export.description" categoryId="org.jkiss.dbeaver.core.rs"/>
+
+        <command id="org.jkiss.dbeaver.ui.editors.data.forSelection" name="%command.org.jkiss.dbeaver.ui.editors.data.forSelection.name" description="%command.org.jkiss.dbeaver.ui.editors.data.forSelection.description" categoryId="org.jkiss.dbeaver.core.database"/>
     </extension>
 
     <extension point="org.eclipse.ui.commandImages">
@@ -255,6 +257,7 @@
         <image commandId="org.jkiss.dbeaver.core.resultset.cell.save" icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/file/save.png"/>
         <image commandId="org.jkiss.dbeaver.core.resultset.grid.togglePreview" icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/panel_customize.png"/>
         <image commandId="org.jkiss.dbeaver.core.resultset.export" icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/file/export.png"/>
+        <image commandId="org.jkiss.dbeaver.ui.editors.data.forSelection" icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/sql_table.png"/>
     </extension>
 
     <extension point="org.eclipse.core.expressions.definitions">
@@ -601,6 +604,17 @@
             </enabledWhen>
         </handler>
 
+        <handler commandId="org.jkiss.dbeaver.ui.editors.data.forSelection" class="org.jkiss.dbeaver.ui.editors.data.OpenDataEditorHandler">
+            <enabledWhen>
+                <with variable="selection">
+                    <count value="+"/>
+                    <iterate operator="and">
+                        <adapt type="org.jkiss.dbeaver.model.struct.DBSDataContainer"/>
+                    </iterate>
+                </with>
+            </enabledWhen>
+        </handler>
+
     </extension>
 
     <extension point="org.eclipse.ui.menus">
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle.properties b/plugins/org.jkiss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle.properties
index f3a8ed4e00..a85796772e 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.jkiss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle.properties
@@ -32,8 +32,6 @@ command.org.jkiss.dbeaver.core.sql.editor.create.name=New SQL Editor
 command.org.jkiss.dbeaver.core.sql.editor.create.description=Open new SQL editor (create new script)
 command.org.jkiss.dbeaver.core.sql.editor.forSelection.name=Read data in SQL console
 command.org.jkiss.dbeaver.core.sql.editor.forSelection.description=Open new SQL console with data read query
-command.org.jkiss.dbeaver.ui.editors.data.forSelection.name=Edit data
-command.org.jkiss.dbeaver.ui.editors.data.forSelection.description=View/edit table  data
 command.org.jkiss.dbeaver.ui.editors.sql.run.statement.name=Execute SQL Statement
 command.org.jkiss.dbeaver.ui.editors.sql.run.statement.description=Execute SQL statement
 command.org.jkiss.dbeaver.ui.editors.sql.run.statementNew.name=Execute SQL in new tab
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.sql/plugin.xml b/plugins/org.jkiss.dbeaver.ui.editors.sql/plugin.xml
index 1c65fb2f9b..6de675ce0b 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.sql/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.ui.editors.sql/plugin.xml
@@ -313,16 +313,6 @@
                 </with>
             </enabledWhen>
         </handler>
-        <handler commandId="org.jkiss.dbeaver.ui.editors.data.forSelection" class="org.jkiss.dbeaver.ui.editors.data.OpenDataEditorHandler">
-            <enabledWhen>
-                <with variable="selection">
-                    <count value="+"/>
-                    <iterate operator="and">
-                        <adapt type="org.jkiss.dbeaver.model.struct.DBSDataContainer"/>
-                    </iterate>
-                </with>
-            </enabledWhen>
-        </handler>
         <handler commandId="org.jkiss.dbeaver.core.procedure.execute" class="org.jkiss.dbeaver.ui.editors.sql.handlers.RunProcedureConsoleHandler">
             <enabledWhen>
                 <with variable="selection">
-- 
GitLab