diff --git a/plugins/org.jkiss.dbeaver.data.transfer.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.data.transfer.ui/META-INF/MANIFEST.MF index 74159a27452916ed8c227a92133eafe567eb1e0a..a2f941c995f9d40b2eddae46be354b7ae58b5468 100644 --- a/plugins/org.jkiss.dbeaver.data.transfer.ui/META-INF/MANIFEST.MF +++ b/plugins/org.jkiss.dbeaver.data.transfer.ui/META-INF/MANIFEST.MF @@ -8,7 +8,8 @@ Bundle-Release-Date: 20210419 Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Activator: org.jkiss.dbeaver.tools.transfer.ui.internal.DTUIActivator Bundle-ActivationPolicy: lazy -Export-Package: org.jkiss.dbeaver.tools.transfer.ui.wizard +Export-Package: org.jkiss.dbeaver.tools.transfer.ui.wizard, + org.jkiss.dbeaver.ui.controls Require-Bundle: org.eclipse.core.runtime, org.eclipse.swt, org.eclipse.core.expressions, diff --git a/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages.java b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages.java index 72d423908687269df8b590bc6228e5fa212cd888..ffdb54bc0517dcf9fc209ab84e9f2d9621f828ab 100644 --- a/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages.java +++ b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages.java @@ -173,6 +173,10 @@ public class DTUIMessages extends NLS { public static String sql_script_task_page_settings_error_message_you_must_select_script_execute; public static String sql_script_task_page_settings_error_message_you_must_select_connection; + public static String value_format_selector_value; + public static String value_format_selector_display; + public static String value_format_selector_editable; + public static String value_format_selector_database_native; static { // initialize resource bundle diff --git a/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages.properties b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages.properties index 1798c7fef709d38567ca2789c11e39595b4b50b6..daf3f4361fc83ae77294113a4777b3ce9289c3e6 100644 --- a/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages.properties +++ b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages.properties @@ -139,3 +139,7 @@ database_consumer_page_mapping_error_message_set_target_container = Set target c database_consumer_page_mapping_error_message_set_all_tables_mappings = Set all tables mappings sql_script_task_page_settings_error_message_you_must_select_script_execute = You must select script(s) to execute sql_script_task_page_settings_error_message_you_must_select_connection = You must select connection(s) +value_format_selector_database_native = Database native +value_format_selector_display = Display (default) +value_format_selector_editable = Editable +value_format_selector_value = Value Format diff --git a/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages_ru.properties b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages_ru.properties index 410fe81bb6c0231404ea75a3485004d2e60507db..8c38fb9f6491ca54bf266465a0ea89d7025c91ab 100644 --- a/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages_ru.properties +++ b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages_ru.properties @@ -134,8 +134,7 @@ database_consumer_page_mapping_error_message_set_target_container = \u0423\u0441 database_consumer_page_mapping_error_message_set_all_tables_mappings = \u0423\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u0435 \u0432\u0441\u0435 \u043E\u0442\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F \u0442\u0430\u0431\u043B\u0438\u0446 sql_script_task_page_settings_error_message_you_must_select_script_execute = \u0412\u044B \u0434\u043E\u043B\u0436\u043D\u044B \u0432\u044B\u0431\u0440\u0430\u0442\u044C \u0441\u043A\u0440\u0438\u043F\u0442\u044B \u0434\u043B\u044F \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F sql_script_task_page_settings_error_message_you_must_select_connection = \u0412\u044B \u0434\u043E\u043B\u0436\u043D\u044B \u0432\u044B\u0431\u0440\u0430\u0442\u044C \u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435 - - - - - +value_format_selector_database_native = \u0424\u043E\u0440\u043C\u0430\u0442 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0411\u0414 +value_format_selector_display = \u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0439 (\u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E) +value_format_selector_editable = \u041F\u0440\u043E\u0441\u0442\u043E\u0439 +value_format_selector_value = \u0424\u043E\u0440\u043C\u0430\u0442 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F diff --git a/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/controls/ValueFormatSelector.java b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/ui/controls/ValueFormatSelector.java similarity index 83% rename from plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/controls/ValueFormatSelector.java rename to plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/ui/controls/ValueFormatSelector.java index 84d7cc479fd59157ad91179cb46ac02d94b8ec4f..6c0ba56a613574b38fcd5f8318d8103ed4729d81 100644 --- a/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/controls/ValueFormatSelector.java +++ b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/ui/controls/ValueFormatSelector.java @@ -22,18 +22,18 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.jkiss.code.NotNull; import org.jkiss.dbeaver.model.data.DBDDisplayFormat; +import org.jkiss.dbeaver.tools.transfer.ui.internal.DTUIMessages; import org.jkiss.dbeaver.ui.UIUtils; -import org.jkiss.dbeaver.ui.internal.UIMessages; public class ValueFormatSelector { private final Combo formatCombo; public ValueFormatSelector(@NotNull Composite parent) { - UIUtils.createControlLabel(parent, UIMessages.value_format_selector_value); + UIUtils.createControlLabel(parent, DTUIMessages.value_format_selector_value); formatCombo = new Combo(parent, SWT.BORDER | SWT.DROP_DOWN | SWT.READ_ONLY); - formatCombo.add(UIMessages.value_format_selector_display); - formatCombo.add(UIMessages.value_format_selector_editable); - formatCombo.add(UIMessages.value_format_selector_database_native); + formatCombo.add(DTUIMessages.value_format_selector_display); + formatCombo.add(DTUIMessages.value_format_selector_editable); + formatCombo.add(DTUIMessages.value_format_selector_database_native); } public void select(@NotNull DBDDisplayFormat format) { diff --git a/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/internal/UIMessages.java b/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/internal/UIMessages.java index b9834eb3336c21817a58d5f83eaf064c724ddf6d..b819dbe6434345ed01a15055e847bde4ca0fc932 100644 --- a/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/internal/UIMessages.java +++ b/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/internal/UIMessages.java @@ -77,11 +77,6 @@ public class UIMessages extends NLS { public static String control_label_connection_folder; - public static String value_format_selector_value; - public static String value_format_selector_display; - public static String value_format_selector_editable; - public static String value_format_selector_database_native; - static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, UIMessages.class); diff --git a/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/internal/UIMessages.properties b/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/internal/UIMessages.properties index 288dc0d7df382e475a1fc3b0084f1b09bd3e0679..93d1632dfcaaa12fdcde4344e4f0907de995875a 100644 --- a/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/internal/UIMessages.properties +++ b/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/internal/UIMessages.properties @@ -50,8 +50,3 @@ save_execution_plan = Save execution plan load_execution_plan = Load execution plan control_label_connection_folder = Connection folder - -value_format_selector_database_native = Database native -value_format_selector_display = Display (default) -value_format_selector_editable = Editable -value_format_selector_value = Value Format diff --git a/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/internal/UIMessages_ru.properties b/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/internal/UIMessages_ru.properties index 0572faf8dd570c37dca95440df55d8fe62b719cd..2ddd1dc834dc7be6b015ac5953f669ee6071b9f1 100644 --- a/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/internal/UIMessages_ru.properties +++ b/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/internal/UIMessages_ru.properties @@ -43,8 +43,3 @@ ui_properties_name=\u0418\u043C\u044F ui_properties_value=\u0417\u043D\u0430\u0447\u0435\u043D\u0438\u0435 control_label_connection_folder = \u041F\u0430\u043F\u043A\u0430 \u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u044F - -value_format_selector_database_native = \u0424\u043E\u0440\u043C\u0430\u0442 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0411\u0414 -value_format_selector_display = \u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0439 (\u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E) -value_format_selector_editable = \u041F\u0440\u043E\u0441\u0442\u043E\u0439 -value_format_selector_value = \u0424\u043E\u0440\u043C\u0430\u0442 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F