diff --git a/plugins/org.jkiss.dbeaver.core/plugin.xml b/plugins/org.jkiss.dbeaver.core/plugin.xml index 3f16e104e259e3ef51ad606e33d8fbf4af1d0200..50f79d8977a153fe104cf59d34764238fd9bcfcc 100644 --- a/plugins/org.jkiss.dbeaver.core/plugin.xml +++ b/plugins/org.jkiss.dbeaver.core/plugin.xml @@ -3776,6 +3776,12 @@ This event is triggered when transaction was rolled back. + + + + This event is triggered when connection was automatically reconnected. + + diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/DBeaverNotifications.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/DBeaverNotifications.java index f303c6c9ecd6f38724f871ca219aa665fbddde7b..5efda26cbae0b2d03f0572e8e209c574a2bbd58d 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/DBeaverNotifications.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/DBeaverNotifications.java @@ -17,21 +17,20 @@ package org.jkiss.dbeaver.ui; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Display; -import org.jkiss.dbeaver.DBeaverPreferences; -import org.jkiss.dbeaver.core.DBeaverCore; import org.jkiss.dbeaver.model.DBPDataSource; import org.jkiss.dbeaver.model.DBPMessageType; -import org.jkiss.dbeaver.ui.notifications.NotificationPopupMessage; import org.jkiss.dbeaver.ui.notifications.NotificationUtils; /** - * DBeaverIcons + * Notifications utilities */ public class DBeaverNotifications { + public static final String NT_COMMIT = "commit"; + public static final String NT_ROLLBACK = "rollback"; + public static final String NT_RECONNECT = "reconnect"; + public static void showNotification(DBPDataSource dataSource, String id, String text) { NotificationUtils.sendNotification(dataSource, id, text, null, null); } diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceCommitHandler.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceCommitHandler.java index bb5f335563c506ae46e821081949724953ec87fa..87f925bab0ffab1575ede119d61d12b69ca92d29 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceCommitHandler.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceCommitHandler.java @@ -56,7 +56,7 @@ public class DataSourceCommitHandler extends AbstractDataSourceHandler DBeaverNotifications.showNotification( context.getDataSource(), - "commit", + DBeaverNotifications.NT_COMMIT, "Transaction has been committed\n\n" + "Query count: " + txnInfo.getUpdateCount() + "\n" + "Duration: " + RuntimeUtils.formatExecutionTime(System.currentTimeMillis() - txnInfo.getTransactionStartTime()) + "\n", diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceRollbackHandler.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceRollbackHandler.java index 85e3a8fac3391a4c096405cab3f99c77eaee9a2b..888855467ecb8d9e7ef75e91d5aef198bbe7e715 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceRollbackHandler.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceRollbackHandler.java @@ -57,7 +57,7 @@ public class DataSourceRollbackHandler extends AbstractDataSourceHandler } DBeaverNotifications.showNotification( context.getDataSource(), - "rollback", + DBeaverNotifications.NT_ROLLBACK, "Transaction has been rolled back\n\n" + "Query count: " + txnInfo.getUpdateCount() + "\n" + "Duration: " + RuntimeUtils.formatExecutionTime(System.currentTimeMillis() - txnInfo.getTransactionStartTime()) + "\n",