From 1fbc629f23e2497554e81a9fb28400e0faed35f0 Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Thu, 15 Aug 2019 19:01:27 +0300 Subject: [PATCH] Entity editor: save message fix --- .../jkiss/dbeaver/ui/editors/entity/EntityEditor.java | 11 ++++++++++- .../ui/internal/UINavigatorMessages.properties | 2 +- .../ui/internal/UINavigatorMessages_de.properties | 2 +- .../ui/internal/UINavigatorMessages_es.properties | 2 +- .../ui/internal/UINavigatorMessages_fr.properties | 2 +- .../ui/internal/UINavigatorMessages_it.properties | 2 +- .../ui/internal/UINavigatorMessages_ja.properties | 2 +- .../ui/internal/UINavigatorMessages_ko.properties | 2 +- .../ui/internal/UINavigatorMessages_ru.properties | 2 +- .../ui/internal/UINavigatorMessages_zh.properties | 2 +- 10 files changed, 19 insertions(+), 10 deletions(-) diff --git a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/editors/entity/EntityEditor.java b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/editors/entity/EntityEditor.java index e81d390ca8..11c7f27bc5 100644 --- a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/editors/entity/EntityEditor.java +++ b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/editors/entity/EntityEditor.java @@ -681,12 +681,21 @@ public class EntityEditor extends MultiPageDatabaseEditor @Override public int promptToSaveOnClose() { + List changedSubEditors = new ArrayList<>(); + for (IEditorPart editor : editorMap.values()) { + if (editor.isDirty()) { + changedSubEditors.add(editor.getTitle()); + } + } + + String subEditorsString = "(" + String.join(", ", changedSubEditors) + ")"; final int result = ConfirmationDialog.showConfirmDialog( ResourceBundle.getBundle(UINavigatorMessages.BUNDLE_NAME), getSite().getShell(), NavigatorPreferences.CONFIRM_ENTITY_EDIT_CLOSE, ConfirmationDialog.QUESTION_WITH_CANCEL, - getEditorInput().getNavigatorNode().getNodeName()); + getEditorInput().getNavigatorNode().getNodeName(), + subEditorsString); if (result == IDialogConstants.YES_ID) { // getWorkbenchPart().getSite().getPage().saveEditor(this, false); return ISaveablePart2.YES; diff --git a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages.properties b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages.properties index 3c00611ab3..a642a8aa6e 100644 --- a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages.properties +++ b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages.properties @@ -136,7 +136,7 @@ confirm_entity_revert_toggleMessage = Don't ask again confirm_close_editor_edit_message = "{0}" was changed. Do you want to save these changes? confirm_close_editor_edit_title = Save editor changes -confirm_close_entity_edit_message = Object "{0}" was changed. Do you want to persist these changes in database? +confirm_close_entity_edit_message = Object "{0}" was changed {1}. Do you want to persist these changes in database? confirm_close_entity_edit_title = Persist object changes editors_entity_dialog_persist_title = Persist Changes diff --git a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_de.properties b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_de.properties index 482de9f26d..d8c5419d36 100644 --- a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_de.properties +++ b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_de.properties @@ -123,7 +123,7 @@ confirm_entity_revert_toggleMessage = Nicht mehr nachfragen confirm_close_editor_edit_message = "{0}" wurde ge\u00E4ndert. Sollen die \u00C4nderungen gespeichert werden? confirm_close_editor_edit_title = Editor\u00E4nderungen speichern -confirm_close_entity_edit_message = Objekt "{0}" wurde ge\u00E4ndert. Sollen diese \u00C4nderungen in der Datenbank persistiert werden? +confirm_close_entity_edit_message = Objekt "{0}" wurde ge\u00E4ndert {1}. Sollen diese \u00C4nderungen in der Datenbank persistiert werden? confirm_close_entity_edit_title = Objekt\u00E4nderungen persistieren editors_entity_dialog_persist_title = \u00C4nderungen persistieren diff --git a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_es.properties b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_es.properties index 6384ede662..f526dcee7d 100644 --- a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_es.properties +++ b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_es.properties @@ -31,7 +31,7 @@ confirm_entity_revert_message = \u0457Est\u0431 seguro de que quiere revertir to confirm_entity_revert_toggleMessage = No volver a preguntar confirm_close_entity_edit_title = Grabar las modificaciones del objeto -confirm_close_entity_edit_message = El objeto "{0}" se ha modificado. \u0457Quiere grabar estos cambios en la base de datos? +confirm_close_entity_edit_message = El objeto "{0}" se ha modificado {1}. \u0457Quiere grabar estos cambios en la base de datos? confirm_close_editor_edit_title = Grabar los cambios del editor confirm_close_editor_edit_message = "{0}" se ha modificado. \u0457Quiere grabar estos cambios? diff --git a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_fr.properties b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_fr.properties index 79dc21544d..032c9d6e25 100644 --- a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_fr.properties +++ b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_fr.properties @@ -116,7 +116,7 @@ confirm_entity_revert_toggleMessage = Ne plus me demander confirm_close_editor_edit_message = "{0}" a \u00E9t\u00E9 modifi\u00E9. Voulez-vous sauvegarder ces modifications ? confirm_close_editor_edit_title = Sauvegarder les modifications de l'\u00E9diteur -confirm_close_entity_edit_message = L'objet "{0}" a \u00E9t\u00E9 modifi\u00E9. Voulez-vous conserver ces modifications dans la base de donn\u00E9es ? +confirm_close_entity_edit_message = L'objet "{0}" a \u00E9t\u00E9 modifi\u00E9 {1}. Voulez-vous conserver ces modifications dans la base de donn\u00E9es ? confirm_close_entity_edit_title = Conserver les modifications d'objet editors_entity_dialog_persist_title = Rendre les changements persistants diff --git a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_it.properties b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_it.properties index 845a8394d1..573dfb0365 100644 --- a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_it.properties +++ b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_it.properties @@ -31,7 +31,7 @@ confirm_entity_revert_message = Sei sicuro di voler ripristinare tutti i cambiam confirm_entity_revert_toggleMessage = Non chiedermi ulteriormente confirm_close_entity_edit_title = Salva le modifiche all''oggetto -confirm_close_entity_edit_message = L''oggetto "{0}" \u00E8 stato modificato. Vuoi salvare questi cambiamenti nel database? +confirm_close_entity_edit_message = L''oggetto "{0}" \u00E8 stato modificato {1}. Vuoi salvare questi cambiamenti nel database? confirm_close_editor_edit_title = Salva i cambiamenti dell''editor confirm_close_editor_edit_message = "{0}" \u00E8 stato modificato. Vuoi salvare questi cambiamenti? diff --git a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_ja.properties b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_ja.properties index cb81e1cea4..3a374947c1 100644 --- a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_ja.properties +++ b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_ja.properties @@ -118,7 +118,7 @@ confirm_entity_revert_toggleMessage =\u4ECA\u5F8C\u306F\u3053\u306E\u30C0\u30A4\ confirm_close_editor_edit_message ={0}\u304C\u5909\u66F4\u3055\u308C\u307E\u3057\u305F\u3002\u3053\u308C\u3089\u306E\u5909\u66F4\u3092\u4FDD\u5B58\u3057\u307E\u3059\u304B\uFF1F confirm_close_editor_edit_title =\u30A8\u30C7\u30A3\u30BF\u306E\u5909\u66F4\u3092\u4FDD\u5B58 -confirm_close_entity_edit_message =\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8 "{0}"\u304C\u5909\u66F4\u3055\u308C\u307E\u3057\u305F\u3002\u3053\u308C\u3089\u306E\u5909\u66F4\u3092\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u4FDD\u5B58\u3057\u307E\u3059\u304B\uFF1F +confirm_close_entity_edit_message =\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8 "{0}"\u304C\u5909\u66F4\u3055\u308C\u307E\u3057\u305F {1}\u3002\u3053\u308C\u3089\u306E\u5909\u66F4\u3092\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u4FDD\u5B58\u3057\u307E\u3059\u304B\uFF1F confirm_close_entity_edit_title =\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u5909\u66F4\u3092\u6C38\u7D9A\u5316\u3059\u308B editors_entity_dialog_persist_title =\u5909\u66F4\u3092\u6301\u7D9A\u3055\u305B\u308B diff --git a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_ko.properties b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_ko.properties index 0d1774df6d..f3ce826d80 100644 --- a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_ko.properties +++ b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_ko.properties @@ -15,5 +15,5 @@ confirm_entity_revert_toggleMessage = \uB2E4\uC2DC \uBB3B\uC9C0 \uC54A\uAE30 confirm_close_editor_edit_message = "{0}"\uC758 \uBCC0\uACBD\uC0AC\uD56D\uC744 \uC800\uC7A5\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C? confirm_close_editor_edit_title = \uBCC0\uACBD\uC0AC\uD56D \uC800\uC7A5 -confirm_close_entity_edit_message = \uC624\uBE0C\uC81D\uD2B8 "{0}"\uC774 \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uC5D0 \uC800\uC7A5\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C? +confirm_close_entity_edit_message = \uC624\uBE0C\uC81D\uD2B8 "{0}"\uC774 \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4 {1}. \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uC5D0 \uC800\uC7A5\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C? confirm_close_entity_edit_title = \uC624\uBE0C\uC81D\uD2B8 \uBCC0\uACBD \uC800\uC7A5 diff --git a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_ru.properties b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_ru.properties index 6c758e1eaf..d272463764 100644 --- a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_ru.properties +++ b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_ru.properties @@ -116,7 +116,7 @@ confirm_entity_revert_message=\u0412\u044B \u0443\u0432\u0435\u0440\u0435\u043D\ confirm_entity_revert_toggleMessage=\u0411\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u0441\u043F\u0440\u0430\u0448\u0438\u0432\u0430\u0442\u044C confirm_close_entity_edit_title=\u0417\u0430\u043A\u0440\u044B\u0442\u044C \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440 -confirm_close_entity_edit_message=\u041E\u0431\u044A\u0435\u043A\u0442 "{0}" \u0431\u044B\u043B \u0438\u0437\u043C\u0435\u043D\u0451\u043D. \u0425\u043E\u0442\u0438\u0442\u0435 \u0441\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F \u0432 \u0431\u0430\u0437\u0435 \u0434\u0430\u043D\u043D\u044B\u0445? +confirm_close_entity_edit_message=\u041E\u0431\u044A\u0435\u043A\u0442 "{0}" \u0431\u044B\u043B \u0438\u0437\u043C\u0435\u043D\u0451\u043D {1}. \u0425\u043E\u0442\u0438\u0442\u0435 \u0441\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F \u0432 \u0431\u0430\u0437\u0435 \u0434\u0430\u043D\u043D\u044B\u0445? confirm_close_editor_edit_title=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F \u0432 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0435 confirm_close_editor_edit_message="{0}" \u0431\u044B\u043B \u0438\u0437\u043C\u0435\u043D\u0451\u043D. \u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F? diff --git a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_zh.properties b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_zh.properties index 342d5d0de0..f1a8aa2427 100644 --- a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_zh.properties +++ b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_zh.properties @@ -124,7 +124,7 @@ confirm_entity_revert_toggleMessage = \u4E0D\u518D\u8BE2\u95EE confirm_close_editor_edit_message = "{0}" \u5DF2\u7ECF\u6539\u53D8\uFF0C\u662F\u5426\u4FDD\u5B58\u6240\u6709\u4FEE\u6539? confirm_close_editor_edit_title = \u4FDD\u5B58\u7F16\u8F91\u5668\u53D8\u66F4 -confirm_close_entity_edit_message = \u5BF9\u8C61 "{0}" \u5DF2\u7ECF\u88AB\u4FEE\u6539\u3002\u662F\u5426\u5C06\u4FEE\u6539\u4FDD\u5B58\u5230\u6570\u636E\u5E93? +confirm_close_entity_edit_message = \u5BF9\u8C61 "{0}" \u5DF2\u7ECF\u88AB\u4FEE\u6539 {1}\u3002\u662F\u5426\u5C06\u4FEE\u6539\u4FDD\u5B58\u5230\u6570\u636E\u5E93? confirm_close_entity_edit_title = \u4FDD\u5B58\u4FEE\u6539 editors_entity_dialog_persist_title = \u6267\u884C\u4FEE\u6539 -- GitLab