From da7cdcb750efc6c937b803cb13cc65658ce1434b Mon Sep 17 00:00:00 2001 From: serge-rider Date: Wed, 1 May 2019 23:39:42 +0300 Subject: [PATCH] #5759 "Delete this script" command --- .../org/jkiss/dbeaver/core/CoreMessages.java | 6 -- .../dbeaver/core/CoreResources.properties | 5 -- .../dbeaver/core/CoreResources_ru.properties | 5 -- .../dbeaver/ui/e4/DBeaverStackRenderer.java | 18 ++--- .../OSGI-INF/l10n/bundle.properties | 2 + .../OSGI-INF/l10n/bundle_ru.properties | 2 + .../plugin.xml | 2 + .../ui/editors/sql/SQLEditorCommands.java | 1 + .../handlers/DeleteCurrentFileHandler.java | 65 +++++++++++++++++++ .../sql/internal/SQLEditorMessages.java | 5 ++ .../sql/internal/SQLEditorMessages.properties | 5 ++ .../internal/SQLEditorMessages_ru.properties | 5 ++ 12 files changed, 96 insertions(+), 25 deletions(-) create mode 100644 plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/handlers/DeleteCurrentFileHandler.java diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java index 2ed0c96cf3..4e8b01d030 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java @@ -101,12 +101,6 @@ public class CoreMessages extends NLS { public static String model_navigator_Connection; public static String model_navigator_Connections; - public static String editor_file_delete_error_title; - public static String editor_file_delete_error_text; - public static String editor_file_delete_this_script; - public static String editor_file_delete_confirm_delete_text; - public static String editor_file_delete_confirm_delete_title; - public static String dialog_about_font; public static String dialog_about_label_version; public static String dialog_about_title; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties index 72806430d8..b022ea3b44 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties @@ -337,11 +337,6 @@ dialog_view_classpath_title = System Classpath editor_file_open_in_explorer = Open Folder in Explorer editor_file_copy_path = Copy File Path editor_file_rename = Rename File -editor_file_delete_error_title=Can't delete SQL script -editor_file_delete_error_text=Error deleting file: "{0}" -editor_file_delete_this_script=Delete this script -editor_file_delete_confirm_delete_text=Are you sure you want to delete SQL script "{0}" ? -editor_file_delete_confirm_delete_title=Delete SQL script model_html_read_database_meta_data = Read database metadata diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_ru.properties b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_ru.properties index 123c1e08af..174ecda9f0 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_ru.properties +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_ru.properties @@ -453,11 +453,6 @@ dialog_view_classpath_title = \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u044B\u editor_file_open_in_explorer = \u041E\u0442\u043A\u0440\u044B\u0442\u044C \u043F\u0430\u043F\u043A\u0443 \u0432 Explorer editor_file_copy_path = \u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043F\u0443\u0442\u044C \u043A \u0444\u0430\u0439\u043B\u0443 editor_file_rename = \u041F\u0435\u0440\u0435\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u0442\u044C \u0444\u0430\u0439\u043B -editor_file_delete_error_title=\u041D\u0435 \u0443\u0434\u0430\u0435\u0442\u0441\u044F \u0443\u0434\u0430\u043B\u0438\u0442\u044C SQL \u0441\u043A\u0440\u0438\u043F\u0442 -editor_file_delete_error_text=\u041E\u0448\u0438\u0431\u043A\u0430 \u0443\u0434\u0430\u043B\u0435\u043D\u0438\u044F \u0444\u0430\u0439\u043B\u0430: "{0}" -editor_file_delete_this_script=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0441\u043A\u0440\u0438\u043F\u0442 -editor_file_delete_confirm_delete_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 SQL \u0441\u043A\u0440\u0438\u043F\u0442 "{0}" ? -editor_file_delete_confirm_delete_title=\u0423\u0434\u0430\u043B\u0438\u0442\u044C SQL \u0441\u043A\u0440\u0438\u043F\u0442 runtime_jobs_connect_name=\u041F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0435 \u043A "{0}" runtime_jobs_connect_status_connected=\u041F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u043E diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/e4/DBeaverStackRenderer.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/e4/DBeaverStackRenderer.java index 9b99cf0d49..059dcc5736 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/e4/DBeaverStackRenderer.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/e4/DBeaverStackRenderer.java @@ -75,19 +75,19 @@ public class DBeaverStackRenderer extends StackRenderer { if (inputFile != null) { { + String deleteText = ActionUtils.findCommandName(SQLEditorCommands.CMD_SQL_DELETE_THIS_SCRIPT); + String shortcut = ActionUtils.findCommandDescription(SQLEditorCommands.CMD_SQL_DELETE_THIS_SCRIPT, workbenchPart.getSite(), true);//$NON-NLS-1$ + if (shortcut != null) { + deleteText += "\t" + shortcut; + } + MenuItem menuItemDelete = new MenuItem(menu, SWT.NONE); - menuItemDelete.setText(CoreMessages.editor_file_delete_this_script); + menuItemDelete.setText(deleteText); menuItemDelete.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - if (UIUtils.confirmAction(CoreMessages.editor_file_delete_confirm_delete_title, NLS.bind(CoreMessages.editor_file_delete_confirm_delete_text, inputFile.getName()))) { //$NON-NLS-3$ - try { - inputFile.delete(true, true, new NullProgressMonitor()); - } catch (CoreException e1) { - DBWorkbench.getPlatformUI().showError(CoreMessages.editor_file_delete_error_title, NLS.bind(CoreMessages.editor_file_delete_error_text, inputFile.getName(), e1)); - } - } - } + ActionUtils.runCommand(SQLEditorCommands.CMD_SQL_DELETE_THIS_SCRIPT, workbenchPart.getSite()); + } }); } 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 a482298442..b1aab66095 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 @@ -112,6 +112,8 @@ command.org.jkiss.dbeaver.ui.editors.sql.sync.auto.name=Auto-sync connection wit command.org.jkiss.dbeaver.ui.editors.sql.sync.auto.description=Auto-sync active connection with database navigator selection command.org.jkiss.dbeaver.ui.editors.sql.rename.name=Rename SQL Script command.org.jkiss.dbeaver.ui.editors.sql.rename.description=Rename current SQL script +command.org.jkiss.dbeaver.ui.editors.sql.deleteThisScript.name=Delete this script +command.org.jkiss.dbeaver.ui.editors.sql.deleteThisScript.description=Delete current script file command.org.jkiss.dbeaver.ui.editors.sql.close.tab.name=Close tab command.org.jkiss.dbeaver.ui.editors.sql.close.tab.description=Close results tab diff --git a/plugins/org.jkiss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle_ru.properties b/plugins/org.jkiss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle_ru.properties index 4863c5bd95..0bc896f6cc 100644 --- a/plugins/org.jkiss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle_ru.properties +++ b/plugins/org.jkiss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle_ru.properties @@ -37,6 +37,8 @@ command.org.jkiss.dbeaver.ui.editors.sql.query.prev.name = \u command.org.jkiss.dbeaver.ui.editors.sql.rename.description = \u041F\u0435\u0440\u0435\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u0442\u044C \u0442\u0435\u043A\u0443\u0449\u0438\u0439 SQL \u0441\u043A\u0440\u0438\u043F\u0442 command.org.jkiss.dbeaver.ui.editors.sql.rename.name = \u041F\u0435\u0440\u0435\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u0442\u044C \u0441\u043A\u0440\u0438\u043F\u0442 command.org.jkiss.dbeaver.ui.editors.sql.run.all.rows.description = \u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0438 \u043F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0432\u0441\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F (\u0431\u0435\u0437 \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u0438\u044F \u043F\u043E \u0447\u0438\u0441\u043B\u0443 \u0441\u0442\u0440\u043E\u043A) +command.org.jkiss.dbeaver.ui.editors.sql.deleteThisScript.name = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0442\u0435\u043A\u0443\u0449\u0438\u0439 \u0444\u0430\u0439\u043B +command.org.jkiss.dbeaver.ui.editors.sql.deleteThisScript.description = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0442\u0435\u043A\u0443\u0449\u0438\u0439 \u0444\u0430\u0439\u043B \u0441\u043A\u0440\u0438\u043F\u0442\u0430 SQL command.org.jkiss.dbeaver.ui.editors.sql.run.all.rows.name = \u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0432\u0441\u0435 \u0441\u0442\u0440\u043E\u043A\u0438 command.org.jkiss.dbeaver.ui.editors.sql.run.count.description = \u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0447\u0438\u0441\u043B\u043E \u0441\u0442\u0440\u043E\u043A \u0434\u043B\u044F \u0437\u0430\u043F\u0440\u043E\u0441\u0430 \u043F\u043E\u0434 \u043A\u0443\u0440\u0441\u043E\u0440\u043E\u043C command.org.jkiss.dbeaver.ui.editors.sql.run.count.name = \u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0447\u0438\u0441\u043B\u043E \u0441\u0442\u0440\u043E\u043A diff --git a/plugins/org.jkiss.dbeaver.ui.editors.sql/plugin.xml b/plugins/org.jkiss.dbeaver.ui.editors.sql/plugin.xml index 2130d07d0f..21df45a8b8 100644 --- a/plugins/org.jkiss.dbeaver.ui.editors.sql/plugin.xml +++ b/plugins/org.jkiss.dbeaver.ui.editors.sql/plugin.xml @@ -255,6 +255,7 @@ + @@ -337,6 +338,7 @@ +