Merge pull request #8650 from dbeaver/exasol2#8638

#8638 Editors from ext.exasol to ext.exasol.ui moved

plugins/org.jkiss.dbeaver.ext.exasol.ui/META-INF/MANIFEST.MF

@@ -11,7 +11,10 @@ Require-Bundle: org.eclipse.ui,
  org.jkiss.dbeaver.ui,
  org.jkiss.dbeaver.ext.exasol,
  org.jkiss.dbeaver.tasks.ui,
- org.jkiss.dbeaver.ui.editors.sql
+ org.jkiss.dbeaver.ui.editors.sql,
+ org.jkiss.dbeaver.ext.ui.locks,
+ org.jkiss.dbeaver.ui.editors.session,
+ org.jkiss.dbeaver.ui.editors.base
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor

plugins/org.jkiss.dbeaver.ext.exasol.ui/OSGI-INF/l10n/bundle.properties

@@ -8,6 +8,22 @@ Bundle-Vendor = JKISS
 
 dialog.connection.header = Exasol Connection Settings
 
+editor.exasol.source.view.description = Source code
+editor.exasol.source.view.label = Source
+
+editor.org.jkiss.dbeaver.ext.exasol.editors.ExasolLockEditor.name = Lock Manager
+editor.org.jkiss.dbeaver.ext.exasol.model.app.ExasolServerSessionEditor.name = Application Manager
+
+editor.session_manager.name = Session Manager
+editor.lock_manager.name = Lock Manager
+
+editor.source.ddl.description                                                = DDL
+editor.source.ddl.name                                                       = DDL
+editor.source.declaration.description                                        = Source
+editor.source.declaration.name                                               = Source
+
+meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterNotes.name = Adapter Notes
+
 tool.org.jkiss.dbeaver.ext.exasol.table.export.description = Export Tables, Views or Schemas to CSV
 tool.org.jkiss.dbeaver.ext.exasol.table.export.name        = Export Table(s)
 tool.org.jkiss.dbeaver.ext.exasol.table.import.description = Import Tables or Schemas from CSV

plugins/org.jkiss.dbeaver.ext.exasol.ui/OSGI-INF/l10n/bundle_de.properties

@@ -2,8 +2,24 @@
 # DBeaver - Universal Database Manager
 # Copyright (C) 2010-2020 DBeaver Corp and others
 # Copyright (C) 2017 Karl Griesser (fullref@gmail.com)
+
 dialog.connection.header = Exasol Verbindungseinstellungen
 
+editor.lock_manager.name    = Sperrmanager
+editor.session_manager.name = Sitzungsmanager
+
+editor.exasol.source.view.description                                        = Quellcode
+editor.exasol.source.view.label                                              = Quelle
+editor.org.jkiss.dbeaver.ext.exasol.editors.ExasolLockEditor.name            = Sperrmanager
+editor.org.jkiss.dbeaver.ext.exasol.model.app.ExasolServerSessionEditor.name = Applikationsmanager
+
+editor.source.ddl.description                                                = DDL
+editor.source.ddl.name                                                       = DDL
+editor.source.declaration.description                                        = Quellcode
+editor.source.declaration.name                                               = Quellcode
+
+meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterNotes.name = Adapteranmerkungen
+
 tool.org.jkiss.dbeaver.ext.exasol.table.export.description = Exportieren von Tabellen, Ansichten oder Schemas nach CSV
 tool.org.jkiss.dbeaver.ext.exasol.table.export.name        = Tabelle(n) exportieren
 tool.org.jkiss.dbeaver.ext.exasol.table.import.description = Tabellen oder Schemas aus CSV importieren

plugins/org.jkiss.dbeaver.ext.exasol.ui/OSGI-INF/l10n/bundle_ja.properties

@@ -5,6 +5,21 @@
 
 dialog.connection.header = \u00A0Exasol\u306E\u63A5\u7D9A\u8A2D\u5B9A
 
+editor.session_manager.name=\u30BB\u30C3\u30B7\u30E7\u30F3
+editor.lock_manager.name=\u30ED\u30C3\u30AF
+
+editor.exasol.source.view.description                                        = \u00A0\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9
+editor.exasol.source.view.label                                              = \u00A0\u30BD\u30FC\u30B9
+editor.org.jkiss.dbeaver.ext.exasol.editors.ExasolLockEditor.name            = \u00A0\u30ED\u30C3\u30AF\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC
+editor.org.jkiss.dbeaver.ext.exasol.model.app.ExasolServerSessionEditor.name = \u00A0\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30DE\u30CD\u30FC\u30B8\u30E3
+
+editor.source.ddl.description                                                = \u00A0DDL
+editor.source.ddl.name                                                       = \u00A0DDL
+editor.source.declaration.description                                        = \u00A0\u30BD\u30FC\u30B9
+editor.source.declaration.name                                               = \u00A0\u30BD\u30FC\u30B9
+
+meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterNotes.name = \u30A2\u30C0\u30D7\u30BF\u30CE\u30FC\u30C8
+
 tool.org.jkiss.dbeaver.ext.exasol.table.export.description = \u00A0\u8868\u3001\u30D3\u30E5\u30FC\u307E\u305F\u306F\u30B9\u30AD\u30FC\u30DE\u3092CSV\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3059\u308B
 tool.org.jkiss.dbeaver.ext.exasol.table.export.name        = \u00A0\u8F38\u51FA\u8868
 tool.org.jkiss.dbeaver.ext.exasol.table.import.description = \u00A0CSV\u304B\u3089\u30C6\u30FC\u30D6\u30EB\u307E\u305F\u306F\u30B9\u30AD\u30FC\u30DE\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3059\u308B

plugins/org.jkiss.dbeaver.ext.exasol.ui/OSGI-INF/l10n/bundle_pt_BR.properties

@@ -6,7 +6,22 @@
 Bundle-Name = DBeaver Exasol UI
 Bundle-Vendor = JKISS
 
-dialog.connection.header = Configura\u00E7\u00F5es de conex\u00E3o Exasol 
+dialog.connection.header = Configura\u00E7\u00F5es de conex\u00E3o Exasol
+
+editor.session_manager.name = Ger\u00EAnciador de sess\u00E3o
+editor.lock_manager.name = Travamento
+
+editor.exasol.source.view.description                                        = Codigo fonte
+editor.exasol.source.view.label                                              = Fonte
+editor.org.jkiss.dbeaver.ext.exasol.editors.ExasolLockEditor.name            = Gerenciador de bloqueio
+editor.org.jkiss.dbeaver.ext.exasol.model.app.ExasolServerSessionEditor.name = Gerenciador de aplica\u00E7\u00E3o
+
+editor.source.ddl.description                                                = DDL
+editor.source.ddl.name                                                       = DDL
+editor.source.declaration.description                                        = Fonte
+editor.source.declaration.name                                               = Fonte
+
+meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterNotes.name = Notas do adaptador
 
 tool.org.jkiss.dbeaver.ext.exasol.table.export.description = Exportar Tabelas, Views ou  Esquema para CSV
 tool.org.jkiss.dbeaver.ext.exasol.table.export.name        = Exportar Tabela(s)

plugins/org.jkiss.dbeaver.ext.exasol.ui/OSGI-INF/l10n/bundle_ru.properties

 
 dialog.connection.header = \u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F Exasol
 
+editor.session_manager.name = \u041C\u0435\u043D\u0435\u0434\u0436\u0435\u0440 \u0441\u0435\u0441\u0441\u0438\u0439
+editor.lock_manager.name = \u0414\u0438\u0441\u043F\u0435\u0442\u0447\u0435\u0440 \u0431\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u043E\u043A
+
+editor.exasol.source.view.description = \u0418\u0441\u0445\u043E\u0434\u043D\u044B\u0439 \u043A\u043E\u0434
+editor.exasol.source.view.label = \u0418\u0441\u0445\u043E\u0434\u043D\u044B\u0439 \u043A\u043E\u0434
+
+editor.org.jkiss.dbeaver.ext.exasol.editors.ExasolLockEditor.name = \u0414\u0438\u0441\u043F\u0435\u0442\u0447\u0435\u0440 \u0431\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u043E\u043A
+
+editor.source.ddl.description                                                = DDL
+editor.source.ddl.name                                                       = DDL
+editor.source.declaration.description                                        = \u0418\u0441\u0442\u043E\u0447\u043D\u0438\u043A
+editor.source.declaration.name                                               = \u0418\u0441\u0442\u043E\u0447\u043D\u0438\u043A
+
+meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterNotes.name = \u041F\u0440\u0438\u043C\u0435\u0447\u0430\u043D\u0438\u044F \u043A \u0430\u0434\u0430\u043F\u0442\u0435\u0440\u0443
+
 tool.org.jkiss.dbeaver.ext.exasol.table.export.description = \u042D\u043A\u0441\u043F\u043E\u0440\u0442 \u0442\u0430\u0431\u043B\u0438\u0446, \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u0438\u0439 \u0438\u043B\u0438 \u0441\u0445\u0435\u043C \u0432 CSV
 tool.org.jkiss.dbeaver.ext.exasol.table.export.name        = \u042D\u043A\u0441\u043F\u043E\u0440\u0442 \u0442\u0430\u0431\u043B\u0438\u0446(\u044B)
 tool.org.jkiss.dbeaver.ext.exasol.table.import.description = \u0418\u043C\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0442\u0430\u0431\u043B\u0438\u0446\u044B \u0438\u043B\u0438 \u0441\u0445\u0435\u043C\u044B \u0438\u0437 CSV

plugins/org.jkiss.dbeaver.ext.exasol.ui/OSGI-INF/l10n/bundle_zh.properties

@@ -5,4 +5,19 @@ dialog.connection.header = Exasol \u8FDE\u63A5\u8BBE\u7F6E
 tool.org.jkiss.dbeaver.ext.exasol.table.export.description = \u5BFC\u51FA\u8868, \u89C6\u56FE\u6216\u8005\u6A21\u5F0F\u5230 CSV
 tool.org.jkiss.dbeaver.ext.exasol.table.export.name        = \u5BFC\u51FA\u8868
 tool.org.jkiss.dbeaver.ext.exasol.table.import.description = \u4ECE CSV \u5BFC\u5165\u8868\u6216\u6A21\u5F0F
-tool.org.jkiss.dbeaver.ext.exasol.table.import.name        = \u5BFC\u5165\u8868
\ No newline at end of file
+tool.org.jkiss.dbeaver.ext.exasol.table.import.name        = \u5BFC\u5165\u8868
+
+editor.session_manager.name = \u4F1A\u8BDD\u7BA1\u7406
+editor.lock_manager.name = \u9501\u53E4\u7BA1\u7406\u5668
+
+editor.exasol.source.view.description                                        = \u6E90\u7801
+editor.exasol.source.view.label                                              = \u6E90
+editor.org.jkiss.dbeaver.ext.exasol.editors.ExasolLockEditor.name            = \u9501\u7BA1\u7406\u5668
+editor.org.jkiss.dbeaver.ext.exasol.model.app.ExasolServerSessionEditor.name = \u5E94\u7528\u7BA1\u7406\u5668
+
+editor.source.ddl.description                                                = DDL
+editor.source.ddl.name                                                       = DDL
+editor.source.declaration.description                                        = \u6E90
+editor.source.declaration.name                                               = \u6E90
+
+meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterNotes.name = \u9002\u914D\u5668\u5907\u6CE8
\ No newline at end of file

plugins/org.jkiss.dbeaver.ext.exasol.ui/plugin.xml

@@ -21,7 +21,71 @@
         </view>
     </extension>
     
-        <extension point="org.jkiss.dbeaver.tools">
+    <extension point="org.eclipse.ui.editors">
+        <editor
+                name="%editor.org.jkiss.dbeaver.ext.exasol.model.app.ExasolServerSessionEditor.name"
+                icon="platform:/plugin/org.jkiss.dbeaver.ext.exasol/icons/compile.png"
+                class="org.jkiss.dbeaver.ext.exasol.ui.editors.ExasolServerSessionEditor"
+                id="org.jkiss.dbeaver.ext.exasol.ui.editors.ExasolServerSessionEditor"
+                contributorClass="org.jkiss.dbeaver.ui.editors.EditorSearchActionsContributor">
+        </editor>
+        <editor
+            name="%editor.org.jkiss.dbeaver.ext.exasol.ui.editors.ExasolLockEditor.name"
+            class="org.jkiss.dbeaver.ext.exasol.ui.editors.ExasolLockEditor"
+            id="org.jkiss.dbeaver.ext.exasol.ui.editors.ExasolLockEditor">
+        </editor>
+
+    </extension>
+    
+    <extension point="org.jkiss.dbeaver.dataSourceProvider">
+        <editorContribution editorId="org.jkiss.dbeaver.ext.exasol.ui.editors.ExasolServerSessionEditor" category="connectionEditor" label="%editor.session_manager.name" icon="platform:/plugin/org.jkiss.dbeaver.model/icons/tree/sessions.png">
+            <supports dataSource="exasol"/>
+        </editorContribution>
+        <editorContribution editorId="org.jkiss.dbeaver.ext.exasol.ui.editors.ExasolLockEditor" category="connectionEditor" label="%editor.lock_manager.name" icon="platform:/plugin/org.jkiss.dbeaver.model/icons/tree/locks.png">
+            <supports dataSource="exasol"/>
+        </editorContribution>
+    </extension>
+    
+	<extension point="org.jkiss.dbeaver.databaseEditor">    
+	    <editor
+	              class="org.jkiss.dbeaver.ext.exasol.ui.editors.ExasolSourceViewEditor"
+	              contributor="org.jkiss.dbeaver.ui.editors.sql.SQLEditorContributorNested"
+	              description="%editor.exasol.source.view.description"
+	              icon="#sql_text"
+	              id="exasol.source.view"
+	              label="%editor.exasol.source.view.label"
+	              position="additions_middle"
+	              type="folder">
+	           <objectType name="org.jkiss.dbeaver.ext.exasol.model.ExasolView"/>
+	           <objectType name="org.jkiss.dbeaver.ext.exasol.model.ExasolScript"/>
+	           <objectType name="org.jkiss.dbeaver.ext.exasol.model.ExasolFunction"/>
+	    </editor>
+        <editor
+                class="org.jkiss.dbeaver.ui.editors.sql.SQLSourceViewer"
+                contributor="org.jkiss.dbeaver.ui.editors.sql.SQLEditorContributorNested"
+                description="%editor.source.ddl.description"
+                icon="#sql_text"
+                id="source.ddl"
+                label="%editor.source.ddl.name"
+                position="additions_middle"
+                type="folder">
+            <objectType name="org.jkiss.dbeaver.ext.exasol.model.ExasolTable"/>
+        </editor>
+        <editor
+                class="org.jkiss.dbeaver.ui.editors.sql.SQLSourceViewer"
+                contributor="org.jkiss.dbeaver.ui.editors.sql.SQLEditorContributorNested"
+                description="%editor.source.declaration.description"
+                embeddable="true"
+                icon="#sql_text"
+                id="source.declaration"
+                label="%meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterNotes.name"
+                position="additions_middle"
+                type="folder">
+            <objectType name="org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema"/>
+        </editor>
+    </extension>
+    
+    <extension point="org.jkiss.dbeaver.tools">
       <tools>
          <tool
                class="org.jkiss.dbeaver.ext.exasol.ui.tools.ExasolExportTableTool"

plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/editors/ExasolLockEditor.java → plugins/org.jkiss.dbeaver.ext.exasol.ui/src/org/jkiss/dbeaver/ext/exasol/ui/editors/ExasolLockEditor.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ext.exasol.editors;
+package org.jkiss.dbeaver.ext.exasol.ui.editors;
 
 import org.eclipse.jface.action.IContributionManager;
 import org.eclipse.jface.action.Separator;

plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/app/ExasolServerSessionEditor.java → plugins/org.jkiss.dbeaver.ext.exasol.ui/src/org/jkiss/dbeaver/ext/exasol/ui/editors/ExasolServerSessionEditor.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ext.exasol.model.app;
+package org.jkiss.dbeaver.ext.exasol.ui.editors;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IContributionManager;
@@ -23,8 +23,10 @@ import org.eclipse.jface.action.Separator;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.ISharedImages;
-import org.jkiss.dbeaver.ext.exasol.ExasolMessages;
+import org.jkiss.dbeaver.ext.exasol.ui.internal.ExasolMessages;
 import org.jkiss.dbeaver.ext.exasol.model.ExasolDataSource;
+import org.jkiss.dbeaver.ext.exasol.model.app.ExasolServerSession;
+import org.jkiss.dbeaver.ext.exasol.model.app.ExasolServerSessionManager;
 import org.jkiss.dbeaver.model.admin.sessions.DBAServerSession;
 import org.jkiss.dbeaver.model.admin.sessions.DBAServerSessionManager;
 import org.jkiss.dbeaver.model.exec.DBCExecutionContext;

plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/editors/ExasolSourceViewEditor.java → plugins/org.jkiss.dbeaver.ext.exasol.ui/src/org/jkiss/dbeaver/ext/exasol/ui/editors/ExasolSourceViewEditor.java

@@ -15,8 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ext.exasol.editors;
+package org.jkiss.dbeaver.ext.exasol.ui.editors;
 
+import org.jkiss.dbeaver.ext.exasol.editors.ExasolSourceObject;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.ui.editors.sql.SQLSourceViewer;
 

plugins/org.jkiss.dbeaver.ext.exasol.ui/src/org/jkiss/dbeaver/ext/exasol/ui/internal/ExasolMessages.java

@@ -43,6 +43,11 @@ public class ExasolMessages extends NLS {
 	public static String dialog_table_tools_encoding;
 	public static String dialog_table_tools_import_title;
 
+	public static String editors_exasol_session_editor_title_kill_session;
+	public static String editors_exasol_session_editor_action_kill;
+	public static String editors_exasol_session_editor_confirm_action;
+	public static String editors_exasol_session_editor_title_kill_session_statement;
+
 	public static String exasol_partition_name;
 	public static String exasol_partition_description;
 	public static String label_backup_host_list;

plugins/org.jkiss.dbeaver.ext.exasol.ui/src/org/jkiss/dbeaver/ext/exasol/ui/internal/ExasolResources.properties

@@ -18,6 +18,11 @@ dialog_table_tools_string_sep = String Separator
 dialog_table_tools_string_sep_mode = Use String Separator
 dialog_table_tools_success_title = Success
 
+editors_exasol_session_editor_action_kill = Kill Session
+editors_exasol_session_editor_confirm_action = {0} {1}. Are you sure?
+editors_exasol_session_editor_title_kill_session = Kill Session
+editors_exasol_session_editor_title_kill_session_statement = Terminate Statement
+
 exasol_partition_description = Information about columns that are used for partitioning
 exasol_partition_name = Partition info
 

plugins/org.jkiss.dbeaver.ext.exasol.ui/src/org/jkiss/dbeaver/ext/exasol/ui/internal/ExasolResources_de.properties

@@ -23,6 +23,11 @@ dialog_table_tools_string_sep = Zeichentrenneichen
 dialog_table_tools_string_sep_mode = Zeichentrennzeichen Verwendungsart
 dialog_table_tools_success_title = Erfolg
 
+editors_exasol_session_editor_action_kill = Verbindung terminieren
+editors_exasol_session_editor_confirm_action = {0} {1}. Sind Sie sicher?
+editors_exasol_session_editor_title_kill_session = Verbindung terminieren
+editors_exasol_session_editor_title_kill_session_statement = Befehl terminieren
+
 exasol_partition_description = Informationen zu den Partitionierungsspalten
 exasol_partition_name = Partitionsinformation
 

plugins/org.jkiss.dbeaver.ext.exasol.ui/src/org/jkiss/dbeaver/ext/exasol/ui/internal/ExasolResources_ja.properties

@@ -16,4 +16,9 @@ dialog_table_tools_result = \u7D50\u679C
 dialog_table_tools_row_sep_mode = \u884C\u533A\u5207\u308A\u8A18\u53F7
 dialog_table_tools_string_sep = \u30B9\u30C8\u30EA\u30F3\u30B0\u30BB\u30D1\u30EC\u30FC\u30BF
 dialog_table_tools_string_sep_mode = \u6587\u5B57\u5217\u30BB\u30D1\u30EC\u30FC\u30BF\u3092\u4F7F\u7528\u3059\u308B
-dialog_table_tools_success_title = \u6210\u529F
\ No newline at end of file
+dialog_table_tools_success_title = \u6210\u529F
+
+editors_exasol_session_editor_action_kill = \u00A0\u30BB\u30C3\u30B7\u30E7\u30F3\u3092\u7D42\u4E86
+editors_exasol_session_editor_confirm_action = \u00A0{0} "{1}"\u672C\u5F53\u306B\u3088\u308D\u3057\u3044\u3067\u3059\u304B\uFF1F
+editors_exasol_session_editor_title_kill_session = \u00A0\u30BB\u30C3\u30B7\u30E7\u30F3\u3092\u7D42\u4E86
+editors_exasol_session_editor_title_kill_session_statement = \u00A0Terminate\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8

plugins/org.jkiss.dbeaver.ext.exasol.ui/src/org/jkiss/dbeaver/ext/exasol/ui/internal/ExasolResources_ru.properties

@@ -18,6 +18,10 @@ dialog_table_tools_string_sep_mode = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\
 dialog_table_tools_string_sep = \u0420\u0430\u0437\u0434\u0435\u043B\u0438\u0442\u0435\u043B\u044C \u0441\u0442\u0440\u043E\u043A
 dialog_table_tools_success_title = \u0423\u0441\u043F\u0435\u0448\u043D\u043E
 
+editors_exasol_session_editor_action_kill = \u041F\u0440\u0435\u0440\u0432\u0430\u0442\u044C \u0441\u0435\u0441\u0441\u0438\u044E
+editors_exasol_session_editor_confirm_action = {0} {1}. \u0412\u044B \u0443\u0432\u0435\u0440\u0435\u043D\u044B?
+editors_exasol_session_editor_title_kill_session = \u041F\u0440\u0435\u0440\u0432\u0430\u0442\u044C \u0441\u0435\u0441\u0441\u0438\u044E
+
 label_backup_host_list = \u0421\u043F\u0438\u0441\u043E\u043A \u0440\u0435\u0437\u0435\u0440\u0432\u043D\u044B\u0445 \u0445\u043E\u0441\u0442\u043E\u0432
 label_database = \u0411\u0430\u0437\u0430 \u0434\u0430\u043D\u043D\u044B\u0445
 label_encrypt = \u0428\u0438\u0444\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u0441\u0432\u044F\u0437\u0438

plugins/org.jkiss.dbeaver.ext.exasol.ui/src/org/jkiss/dbeaver/ext/exasol/ui/internal/ExasolResources_zh.properties

@@ -19,4 +19,9 @@ dialog_table_tools_result = \u7ED3\u679C
 dialog_table_tools_row_sep_mode = \u884C\u5206\u9694\u7B26
 dialog_table_tools_string_sep = \u5B57\u7B26\u4E32\u5206\u9694\u7B26
 dialog_table_tools_string_sep_mode = \u4F7F\u7528\u5B57\u7B26\u4E32\u5206\u9694\u7B26
-dialog_table_tools_success_title = \u6210\u529F
\ No newline at end of file
+dialog_table_tools_success_title = \u6210\u529F
+
+editors_exasol_session_editor_action_kill = \u6740\u6389\u4F1A\u8BDD
+editors_exasol_session_editor_confirm_action = {0} "{1}". \u4F60\u786E\u5B9A\u5417?
+editors_exasol_session_editor_title_kill_session = \u6740\u6389\u4F1A\u8BDD
+editors_exasol_session_editor_title_kill_session_statement = \u7EC8\u6B62\u8BED\u53E5
\ No newline at end of file

plugins/org.jkiss.dbeaver.ext.exasol/META-INF/MANIFEST.MF

@@ -25,4 +25,7 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-ClassPath: .
 Automatic-Module-Name: org.jkiss.dbeaver.ext.exasol
 Export-Package: org.jkiss.dbeaver.ext.exasol,
- org.jkiss.dbeaver.ext.exasol.model
+ org.jkiss.dbeaver.ext.exasol.editors,
+ org.jkiss.dbeaver.ext.exasol.model,
+ org.jkiss.dbeaver.ext.exasol.model.app,
+ org.jkiss.dbeaver.ext.exasol.model.lock

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

@@ -18,15 +18,6 @@ dialog.connection.header = Exasol Connection Settings
 driver.exasol.description = Exasol JDBC driver
 driver.exasol.label       = Exasol
 
-editor.exasol.source.view.description                                        = Source code
-editor.exasol.source.view.label                                              = Source
-editor.org.jkiss.dbeaver.ext.exasol.editors.ExasolLockEditor.name            = Lock Manager
-editor.org.jkiss.dbeaver.ext.exasol.model.app.ExasolServerSessionEditor.name = Application Manager
-editor.source.ddl.description                                                = DDL
-editor.source.ddl.name                                                       = DDL
-editor.source.declaration.description                                        = Source
-editor.source.declaration.name                                               = Source
-
 menu.tables.manage = Manage
 
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolConnection.connectionString.name                    = Connection String
@@ -110,7 +101,6 @@ meta.org.jkiss.dbeaver.ext.exasol.model.ExasolUser.name.name
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolView.description.name                               = View Description
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolView.owner.name                                     = View Owner
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolView.text.name                                      = SQL Definition
-meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterNotes.name                     = Adapter Notes
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterScriptName.name                = Adapter Script Name
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterScriptSchema.name              = Adapter Script Schema
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.lastRefresh.name                      = Last Refreshed at
@@ -232,6 +222,11 @@ meta.org.jkiss.dbeaver.ext.exasol.model.security.ExasolUser.passwordState.name
 meta.org.jkiss.dbeaver.ext.exasol.model.security.ExasolUser.passwordStateChanged.name             = Password status changed
 ##meta.org.jkiss.dbeaver.ext.exasol.model.security.ExasolUser.priority.name                         = Priority
 meta.org.jkiss.dbeaver.ext.exasol.model.security.ExasolViewGrant.view.name                        = View
+meta.org.jkiss.dbeaver.ext.exasol.model.ExasolScript.objectDefinitionText.name = Scripts
+meta.org.jkiss.dbeaver.ext.exasol.model.ExasolView.objectDefinitionText.name = Views
+meta.org.jkiss.dbeaver.ext.exasol.model.ExasolFunction.objectDefinitionText.name = Functions
+meta.org.jkiss.dbeaver.ext.exasol.model.ExasolFunction.sql.name = SQL
+
 
 tool.org.jkiss.dbeaver.ext.exasol.database.reorg.name      = Reorganize Database...
 tool.org.jkiss.dbeaver.ext.exasol.table.export.description = Export Tables, Views or Schemas to CSV

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

@@ -14,15 +14,6 @@ dialog.connection.header = Exasol Verbindungseinstellungen
 driver.exasol.description = Exasol JDBC Treiber
 driver.exasol.label       = Exasol
 
-editor.exasol.source.view.description                                        = Quellcode
-editor.exasol.source.view.label                                              = Quelle
-editor.org.jkiss.dbeaver.ext.exasol.editors.ExasolLockEditor.name            = Sperrmanager
-editor.org.jkiss.dbeaver.ext.exasol.model.app.ExasolServerSessionEditor.name = Applikationsmanager
-editor.source.ddl.description                                                = DDL
-editor.source.ddl.name                                                       = DDL
-editor.source.declaration.description                                        = Quellcode
-editor.source.declaration.name                                               = Quellcode
-
 menu.tables.manage = Verwalten
 
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolConnection.connectionString.name                    = Verbindungsurl
@@ -106,7 +97,6 @@ meta.org.jkiss.dbeaver.ext.exasol.model.ExasolUser.name.name
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolView.description.name                               = View Beschreibung
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolView.owner.name                                     = Zeige Besitzer
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolView.text.name                                      = SQL-Definition
-meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterNotes.name                     = Adapteranmerkungen
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterScriptName.name                = Adapterskriptname
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterScriptSchema.name              = Adapterskriptschema
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.lastRefresh.name                      = Zuletzt aktualisiert am
@@ -180,7 +170,7 @@ meta.org.jkiss.dbeaver.ext.exasol.model.plan.ExasolPlanNode.tempDbRamPeak.name
 meta.org.jkiss.dbeaver.ext.exasol.model.security.ExasolBaseObjectGrant.alterAuth.name             = \u00C4ndern
 meta.org.jkiss.dbeaver.ext.exasol.model.security.ExasolBaseObjectGrant.deleteAuth.name            = L\u00F6schen
 meta.org.jkiss.dbeaver.ext.exasol.model.security.ExasolBaseObjectGrant.insertAuth.name            = Einf\u00FCgen
-meta.org.jkiss.dbeaver.ext.exasol.model.security.ExasolBaseObjectGrant.referencesAuth.name        = Verfweise
+meta.org.jkiss.dbeaver.ext.exasol.model.security.ExasolBaseObjectGrant.referencesAuth.name        = Verweise
 meta.org.jkiss.dbeaver.ext.exasol.model.security.ExasolBaseObjectGrant.schema.name                = Schema
 meta.org.jkiss.dbeaver.ext.exasol.model.security.ExasolBaseObjectGrant.selectAuth.name            = Ausw\u00E4hlen
 meta.org.jkiss.dbeaver.ext.exasol.model.security.ExasolBaseObjectGrant.updateAuth.name            = Update

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

@@ -9,20 +9,9 @@ category.exasol.name        = \u00A0Exasol
 datasource.exasol.description = \u00A0Exasol\u30B3\u30CD\u30AF\u30BF
 datasource.exasol.label       = \u00A0Exasol
 
-dialog.connection.header = \u00A0Exasol\u306E\u63A5\u7D9A\u8A2D\u5B9A
-
 driver.exasol.description = \u00A0Exasol JDBC\u30C9\u30E9\u30A4\u30D0
 driver.exasol.label       = \u00A0Exasol
 
-editor.exasol.source.view.description                                        = \u00A0\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9
-editor.exasol.source.view.label                                              = \u00A0\u30BD\u30FC\u30B9
-editor.org.jkiss.dbeaver.ext.exasol.editors.ExasolLockEditor.name            = \u00A0\u30ED\u30C3\u30AF\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC
-editor.org.jkiss.dbeaver.ext.exasol.model.app.ExasolServerSessionEditor.name = \u00A0\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30DE\u30CD\u30FC\u30B8\u30E3
-editor.source.ddl.description                                                = \u00A0DDL
-editor.source.ddl.name                                                       = \u00A0DDL
-editor.source.declaration.description                                        = \u00A0\u30BD\u30FC\u30B9
-editor.source.declaration.name                                               = \u00A0\u30BD\u30FC\u30B9
-
 menu.tables.manage = \u00A0\u7BA1\u7406
 
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolConnection.connectionString.name                    = \u63A5\u7D9A\u6587\u5B57\u5217
@@ -95,7 +84,6 @@ meta.org.jkiss.dbeaver.ext.exasol.model.ExasolUser.name.name
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolView.description.name                               = \u30D3\u30E5\u30FC\u306E\u8AAC\u660E
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolView.owner.name                                     = \u30AA\u30FC\u30CA\u30FC\u3092\u8868\u793A
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolView.text.name                                      = SQL\u5B9A\u7FA9
-meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterNotes.name                     = \u30A2\u30C0\u30D7\u30BF\u30CE\u30FC\u30C8
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterScriptName.name                = \u30A2\u30C0\u30D7\u30BF\u30B9\u30AF\u30EA\u30D7\u30C8\u540D
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterScriptSchema.name              = \u30A2\u30C0\u30D7\u30BF\u30B9\u30AF\u30EA\u30D7\u30C8\u30B9\u30AD\u30FC\u30DE
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.lastRefresh.name                      = \u6700\u5F8C\u306B\u66F4\u65B0\u3055\u308C\u307E\u3057\u305F

plugins/org.jkiss.dbeaver.ext.exasol/OSGI-INF/l10n/bundle_pt_BR.properties

@@ -13,20 +13,9 @@ category.exasol.name        = Exasol
 datasource.exasol.description = Exasol Connector
 datasource.exasol.label       = Exasol
 
-dialog.connection.header = Configura\u00E7\u00F5es de conex\u00E3o Exasol 
-
 driver.exasol.description = Exasol JDBC driver
 driver.exasol.label       = Exasol
 
-editor.exasol.source.view.description                                        = Codigo fonte
-editor.exasol.source.view.label                                              = Fonte
-editor.org.jkiss.dbeaver.ext.exasol.editors.ExasolLockEditor.name            = Gerenciador de bloqueio
-editor.org.jkiss.dbeaver.ext.exasol.model.app.ExasolServerSessionEditor.name = Gerenciador de aplica\u00E7\u00E3o
-editor.source.ddl.description                                                = DDL
-editor.source.ddl.name                                                       = DDL
-editor.source.declaration.description                                        = Fonte
-editor.source.declaration.name                                               = Fonte
-
 menu.tables.manage = Ger\u00EAncia
 
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolConnection.connectionString.name                    = Express\u00E3o  de conex\u00E3o
@@ -110,7 +99,6 @@ meta.org.jkiss.dbeaver.ext.exasol.model.ExasolUser.name.name
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolView.description.name                               = Ver descri\u00E7\u00E3o
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolView.owner.name                                     = Ver propiet\u00E1rio
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolView.text.name                                      = Defini\u00E7\u00F5es de SQL
-meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterNotes.name                     = Notas do adaptador
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterScriptName.name                = Nome do script do adaptador
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterScriptSchema.name              = Script do esquema do adaptador
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.lastRefresh.name                      = \u00DAltima atualiza\u00E7\u00E3o em

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

@@ -7,20 +7,9 @@ category.exasol.name        = Exasol
 datasource.exasol.description = Exasol \u8FDE\u63A5\u5668
 datasource.exasol.label       = Exasol
 
-dialog.connection.header = Exasol \u8FDE\u63A5\u8BBE\u7F6E
-
 driver.exasol.description = Exasol JDBC \u9A71\u52A8
 driver.exasol.label       = Exasol
 
-editor.exasol.source.view.description                                        = \u6E90\u7801
-editor.exasol.source.view.label                                              = \u6E90
-editor.org.jkiss.dbeaver.ext.exasol.editors.ExasolLockEditor.name            = \u9501\u7BA1\u7406\u5668
-editor.org.jkiss.dbeaver.ext.exasol.model.app.ExasolServerSessionEditor.name = \u5E94\u7528\u7BA1\u7406\u5668
-editor.source.ddl.description                                                = DDL
-editor.source.ddl.name                                                       = DDL
-editor.source.declaration.description                                        = \u6E90
-editor.source.declaration.name                                               = \u6E90
-
 menu.tables.manage = \u7BA1\u7406
 
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolConnection.connectionString.name             = \u8FDE\u63A5\u5B57\u7B26\u4E32
@@ -87,7 +76,6 @@ meta.org.jkiss.dbeaver.ext.exasol.model.ExasolUser.name.name
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolView.description.name                        = \u89C6\u56FE\u5B9A\u4E49
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolView.owner.name                              = \u89C6\u56FE\u6240\u6709\u8005
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolView.text.name                               = SQL \u5B9A\u4E49
-meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterNotes.name              = \u9002\u914D\u5668\u5907\u6CE8
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterScriptName.name         = \u9002\u914D\u5668\u811A\u672C\u540D\u79F0
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterScriptSchema.name       = \u9002\u914D\u5668\u811A\u672C\u6A21\u5F0F
 meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.lastRefresh.name               = \u6700\u540E\u5237\u65B0\u4E8E

plugins/org.jkiss.dbeaver.ext.exasol/plugin.xml

@@ -201,24 +201,8 @@
                       </items>
                    </items>
                 </folder>
-                <folder
-                      description="%tree.administer.node.description"
-                      icon="#folder_admin"
-                      label="%tree.administer.node.name"
-                      visibleIf="object.dataSource.UserAuthorizedForSessions">
-                    <object type="org.jkiss.dbeaver.ext.exasol.model.app.ExasolServerSession"
-                            label="%tree.sessions.node.name"
-                            icon="#admin"
-                            description="%tree.sessions.node.description"
-                            editor="org.jkiss.dbeaver.ext.exasol.model.app.ExasolServerSessionEditor"
-                            />
-                    <object
-                          description="%tree.locks.node.description"
-                          editor="org.jkiss.dbeaver.ext.exasol.editors.ExasolLockEditor"
-                          icon="#locks"
-                          label="%tree.locks.node.name"
-                          type="org.jkiss.dbeaver.ext.exasol.editors.ExasolLockEditor">
-                    </object>
+                <folder type="" label="%tree.administer.node.name" icon="#folder_admin" description="Maintenance/Settings">
+                    <treeContribution category="connectionEditor"/>
                 </folder>
                 <folder
                       description="%tree.connections.node.description"
@@ -466,61 +450,6 @@
         </manager>
     </extension>
 
-    <extension point="org.jkiss.dbeaver.databaseEditor">
-        <editor
-                class="org.jkiss.dbeaver.ui.editors.sql.SQLSourceViewer"
-                contributor="org.jkiss.dbeaver.ui.editors.sql.SQLEditorContributorNested"
-                description="%editor.source.ddl.description"
-                icon="#sql_text"
-                id="source.ddl"
-                label="%editor.source.ddl.name"
-                position="additions_middle"
-                type="folder">
-           <objectType name="org.jkiss.dbeaver.ext.exasol.model.ExasolTable"/>
-        </editor>
-        <editor
-              class="org.jkiss.dbeaver.ui.editors.sql.SQLSourceViewer"
-              contributor="org.jkiss.dbeaver.ui.editors.sql.SQLEditorContributorNested"
-              description="%editor.source.declaration.description"
-              embeddable="true"
-              icon="#sql_text"
-              id="source.declaration"
-              label="%meta.org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema.adapterNotes.name"
-              position="additions_middle"
-              type="folder">
-           <objectType name="org.jkiss.dbeaver.ext.exasol.model.ExasolVirtualSchema"/>
-        </editor>
-        <editor
-              class="org.jkiss.dbeaver.ext.exasol.editors.ExasolSourceViewEditor"
-              contributor="org.jkiss.dbeaver.ui.editors.sql.SQLEditorContributorNested"
-              description="%editor.exasol.source.view.description"
-              icon="#sql_text"
-              id="exasol.source.view"
-              label="%editor.exasol.source.view.label"
-              position="additions_middle"
-              type="folder">
-           <objectType name="org.jkiss.dbeaver.ext.exasol.model.ExasolView"/>
-           <objectType name="org.jkiss.dbeaver.ext.exasol.model.ExasolScript"/>
-           <objectType name="org.jkiss.dbeaver.ext.exasol.model.ExasolFunction"/>
-        </editor>
-    </extension>
-
-    <extension point="org.eclipse.ui.editors">
-        <editor
-                name="%editor.org.jkiss.dbeaver.ext.exasol.model.app.ExasolServerSessionEditor.name"
-                icon="icons/compile.png"
-                class="org.jkiss.dbeaver.ext.exasol.model.app.ExasolServerSessionEditor"
-                id="org.jkiss.dbeaver.ext.exasol.model.app.ExasolServerSessionEditor"
-                contributorClass="org.jkiss.dbeaver.ui.editors.EditorSearchActionsContributor">
-        </editor>
-        <editor
-            name="%editor.org.jkiss.dbeaver.ext.exasol.editors.ExasolLockEditor.name"
-            class="org.jkiss.dbeaver.ext.exasol.editors.ExasolLockEditor"
-            id="org.jkiss.dbeaver.ext.exasol.editors.ExasolLockEditor">
-        </editor>
-
-    </extension>
-
     <extension point="org.jkiss.dbeaver.mavenRepository">
         <repository id="exasol-maven-repo" name="Exasol Repository" url="https://maven.exasol.com/artifactory/exasol-releases" order="10">
             <scope group="com.exasol"/>

plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/ExasolMessages.java

@@ -38,11 +38,6 @@ public class ExasolMessages extends NLS {
 
 	public static String dialog_general_continue;
 
-	public static String editors_exasol_session_editor_title_kill_session;
-	public static String editors_exasol_session_editor_action_kill;
-	public static String editors_exasol_session_editor_confirm_action;
-	public static String editors_exasol_session_editor_title_kill_session_statement;
-
 	public static String edit_exasol_constraint_manager_dialog_title;
 
 	public static String read_table_details;

plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/ExasolResources.properties

@@ -47,24 +47,16 @@ dialog_schema_drop_message = Every existing object in the schema will be dropped
 
 dialog_schema_drop_title = Drop Schema Warning
 
-dialog_struct_edit_fk_label_fk_name = Foreign Key Name
-
 edit_exasol_constraint_manager_dialog_title = Create Primary Key
 
-editors_exasol_session_editor_action_kill = Kill Session
-
-editors_exasol_session_editor_confirm_action = {0} {1}. Are you sure?
-
-editors_exasol_session_editor_title_kill_session = Kill Session
-
-editors_exasol_session_editor_title_kill_session_statement = Terminate Statement
-
 exasol_security_policy_description = System wide password security policy
 
 exasol_security_policy_name = System Security Policy
 
 manager_assign_priority_group = Assign priority group
 
+manager_consumer_alter = Alter consumer group
+
 manager_consumer_create = Create new consumer group
 
 manager_consumer_drop = Drop consumer group

plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/ExasolResources_de.properties

@@ -41,24 +41,16 @@ dialog_priority_group_name = Priorit\u00E4tsgruppenname
 
 dialog_priority_group_weight = Gewicht der Priorit\u00E4tsgruppe
 
-dialog_struct_edit_fk_label_fk_name = Fremschl\u00FCsselname
-
 edit_exasol_constraint_manager_dialog_title = Prim\u00E4rschl\u00FCssel Anlegen
 
-editors_exasol_session_editor_action_kill = Verbindung terminieren
-
-editors_exasol_session_editor_confirm_action = {0} {1}. Sind Sie sicher?
-
-editors_exasol_session_editor_title_kill_session = Verbindung terminieren
-
-editors_exasol_session_editor_title_kill_session_statement = Befehl terminieren
-
 exasol_security_policy_description = Systemweite Passwortsicherheitsrichtlinie
 
 exasol_security_policy_name = Systemsicherheitsrichtlinie
 
 manager_assign_priority_group = Priorit\u00E4tsgruppe zuweisen
 
+manager_consumer_alter = \u00C4ndern Consumer Gruppe
+
 manager_consumer_create = Neue Consumer Gruppe anlegen
 
 manager_consumer_drop = Consumer Gruppe l\u00F6schen

plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/ExasolResources_ja.properties

@@ -13,12 +13,4 @@ dialog_struct_edit_fk_label_fk_name = \u5916\u90E8\u30AD\u30FC\u540D
 
 edit_exasol_constraint_manager_dialog_title = \u4E3B\u30AD\u30FC\u306E\u4F5C\u6210
 
-editors_exasol_session_editor_action_kill = \u00A0\u30BB\u30C3\u30B7\u30E7\u30F3\u3092\u7D42\u4E86
-
-editors_exasol_session_editor_confirm_action = \u00A0{0} "{1}"\u672C\u5F53\u306B\u3088\u308D\u3057\u3044\u3067\u3059\u304B\uFF1F
-
-editors_exasol_session_editor_title_kill_session = \u00A0\u30BB\u30C3\u30B7\u30E7\u30F3\u3092\u7D42\u4E86
-
-editors_exasol_session_editor_title_kill_session_statement = \u00A0Terminate\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8
-
 read_table_details = \u30C6\u30FC\u30D6\u30EB\u306E\u8A73\u7D30\u3092\u8AAD\u3080
\ No newline at end of file

plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/ExasolResources_ru.properties

-exasol_security_policy_name = \u041F\u043E\u043B\u0438\u0442\u0438\u043A\u0430 \u0431\u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E\u0441\u0442\u0438 \u0441\u0438\u0441\u0442\u0435\u043C\u044B
\ No newline at end of file
+exasol_security_policy_name = \u041F\u043E\u043B\u0438\u0442\u0438\u043A\u0430 \u0431\u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E\u0441\u0442\u0438 \u0441\u0438\u0441\u0442\u0435\u043C\u044B
+
+manager_consumer_alter = \u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u043F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u044C\u0441\u043A\u0443\u044E \u0433\u0440\u0443\u043F\u043F\u0443
\ No newline at end of file

plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/ExasolResources_zh.properties

@@ -13,12 +13,4 @@ dialog_schema_drop_title = Schema\u5220\u9664\u8B66\u544A
 
 dialog_struct_edit_fk_label_fk_name = \u5916\u952E\u540D\u79F0
 
-edit_exasol_constraint_manager_dialog_title = \u521B\u5EFA\u4E3B\u952E
-
-editors_exasol_session_editor_action_kill = \u6740\u6389\u4F1A\u8BDD
-
-editors_exasol_session_editor_confirm_action = {0} "{1}". \u4F60\u786E\u5B9A\u5417?
-
-editors_exasol_session_editor_title_kill_session = \u6740\u6389\u4F1A\u8BDD
-
-editors_exasol_session_editor_title_kill_session_statement = \u7EC8\u6B62\u8BED\u53E5
\ No newline at end of file
+edit_exasol_constraint_manager_dialog_title = \u521B\u5EFA\u4E3B\u952E
\ No newline at end of file

plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/model/lock/ExasolLockManager.java

@@ -18,7 +18,6 @@
 package org.jkiss.dbeaver.ext.exasol.model.lock;
 
 import org.jkiss.dbeaver.DBException;
-import org.jkiss.dbeaver.ext.exasol.editors.ExasolLockEditor;
 import org.jkiss.dbeaver.ext.exasol.model.ExasolDataSource;
 import org.jkiss.dbeaver.model.DBPDataSource;
 import org.jkiss.dbeaver.model.admin.locks.DBAServerLockManager;
@@ -35,6 +34,9 @@ import java.util.*;
 
 public class ExasolLockManager extends LockGraphManager
 		implements DBAServerLockManager<ExasolLock, ExasolLockItem> {
+
+	public static final String sidHold = "hsid";
+	public static final String sidWait = "wsid";
 	
 	public static final String LOCK_QUERY = 
 			"/*snapshot execution*/ WITH LOCKED AS (\r\n" + 
@@ -287,10 +289,10 @@ public class ExasolLockManager extends LockGraphManager
 				
 				switch(otype) {
 					case LockGraphManager.typeWait:
-						dbStat.setBigDecimal(1, new BigDecimal((BigInteger) options.get(ExasolLockEditor.sidWait)));
+						dbStat.setBigDecimal(1, new BigDecimal((BigInteger) options.get(sidWait)));
 						break;
 					case LockGraphManager.typeHold:
-						dbStat.setBigDecimal(1,  new BigDecimal((BigInteger) options.get(ExasolLockEditor.sidHold)));
+						dbStat.setBigDecimal(1,  new BigDecimal((BigInteger) options.get(sidHold)));
 						break;
 						
 					default: