UIUtils refactoring

Former-commit-id: 717ccbc6

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/UIUtils.java

@@ -850,6 +850,12 @@ public class UIUtils {
 
     @NotNull
     public static Button createPushButton(@NotNull Composite parent, @Nullable String label, @Nullable Image image)
+    {
+        return createPushButton(parent, label, image, null);
+    }
+
+    @NotNull
+    public static Button createPushButton(@NotNull Composite parent, @Nullable String label, @Nullable Image image, @Nullable SelectionListener selectionListener)
     {
         Button button = new Button(parent, SWT.PUSH);
         if (label != null) {
@@ -858,9 +864,13 @@ public class UIUtils {
         if (image != null) {
             button.setImage(image);
         }
+        if (selectionListener != null) {
+            button.addSelectionListener(selectionListener);
+        }
         return button;
     }
 
+
     public static void setHelp(Control control, String pluginId, String helpContextID)
     {
         PlatformUI.getWorkbench().getHelpSystem().setHelp(control, pluginId + "." + helpContextID); //$NON-NLS-1$

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/tools/AbstractToolWizardPage.java

@@ -21,7 +21,6 @@ package org.jkiss.dbeaver.ui.dialogs.tools;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableItem;
@@ -45,10 +44,8 @@ public abstract class AbstractToolWizardPage<WIZARD extends AbstractToolWizard>
 
 
     protected static void createCheckButtons(Composite buttonsPanel, final Table table) {
-        Button selectAll = UIUtils.createPushButton(buttonsPanel, "All", null);
-        selectAll.addSelectionListener(new CheckListener(table, true));
-        Button clearSelection = UIUtils.createPushButton(buttonsPanel, "None", null);
-        clearSelection.addSelectionListener(new CheckListener(table, false));
+        UIUtils.createPushButton(buttonsPanel, "All", null, new CheckListener(table, true));
+        UIUtils.createPushButton(buttonsPanel, "None", null, new CheckListener(table, false));
     }
 
 

plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/tools/maintenance/ExasolExportTableToolDialog.java

@@ -115,8 +115,7 @@ public class ExasolExportTableToolDialog extends ExasolBaseTableToolDialog {
 
 		// Directory select Button
 		btSelectDirectory = UIUtils.createPushButton(composite,
-				ExasolMessages.dialog_table_open_output_directory, null);
-		btSelectDirectory.addSelectionListener(new SelectionAdapter() {
+				ExasolMessages.dialog_table_open_output_directory, null, new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e)
 			{

plugins/org.jkiss.dbeaver.ext.exasol/src/org/jkiss/dbeaver/ext/exasol/tools/maintenance/ExasolImportTableToolDialog.java

@@ -111,8 +111,7 @@ public class ExasolImportTableToolDialog extends ExasolBaseTableToolDialog {
 
 		// Directory select Button
 		btSelectDirectory = UIUtils.createPushButton(composite,
-				ExasolMessages.dialog_table_open_output_directory, null);
-		btSelectDirectory.addSelectionListener(new SelectionAdapter() {
+				ExasolMessages.dialog_table_open_output_directory, null, new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e)
 			{

plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/controls/PrivilegeTableControl.java

@@ -73,8 +73,7 @@ public class PrivilegeTableControl extends Composite {
         Composite buttonsPanel = UIUtils.createPlaceholder(privsGroup, 3);
         buttonsPanel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
-        Button checkButton = UIUtils.createPushButton(buttonsPanel, "Check All", null);
-        checkButton.addSelectionListener(new SelectionAdapter() {
+        UIUtils.createPushButton(buttonsPanel, "Check All", null, new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e)
             {
@@ -86,8 +85,7 @@ public class PrivilegeTableControl extends Composite {
                 }
             }
         });
-        Button clearButton = UIUtils.createPushButton(buttonsPanel, "Clear All", null);
-        clearButton.addSelectionListener(new SelectionAdapter() {
+        UIUtils.createPushButton(buttonsPanel, "Clear All", null, new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e)
             {