Adjust for API changes in Bug 546975 - Rename selection to

widgetSelection

Generify IValidators too.

Change-Id: I5394df7c3ea7f5b18b97e7a1b7e903a586a33278
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/142566
Tested-by: Linux Tools Bot <linuxtools-bot@eclipse.org>

17 files changed, 67 insertions, 72 deletions

diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageMainTab.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageMainTab.java
index 255221b34e..432f1c5d6d 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageMainTab.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageMainTab.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat Inc. and others.
+ * Copyright (c) 2015, 2019 Red Hat Inc. and others.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -185,7 +185,7 @@ public class RunImageMainTab extends AbstractLaunchConfigurationTab {
 		connectionSelectionComboViewer.setInput(DockerConnectionManager
 				.getInstance().getConnectionNames().toArray());
 		dbc.bindValue(
-				WidgetProperties.selection().observe(connectionSelectionCombo),
+				WidgetProperties.widgetSelection().observe(connectionSelectionCombo),
 				BeanProperties
 						.value(ImageRunSelectionModel.class,
 								ImageRunSelectionModel.SELECTED_CONNECTION_NAME)
@@ -234,7 +234,7 @@ public class RunImageMainTab extends AbstractLaunchConfigurationTab {
 						.list(ImageRunSelectionModel.class,
 								ImageRunSelectionModel.IMAGE_NAMES)
 						.observe(model));
-		dbc.bindValue(WidgetProperties.selection().observe(imageSelectionCombo),
+		dbc.bindValue(WidgetProperties.widgetSelection().observe(imageSelectionCombo),
 				BeanProperties
 						.value(ImageRunSelectionModel.class,
 								ImageRunSelectionModel.SELECTED_IMAGE_NAME)
@@ -412,7 +412,7 @@ public class RunImageMainTab extends AbstractLaunchConfigurationTab {
 				WizardMessages.getString("ImageRunSelectionPage.openStdin")); //$NON-NLS-1$
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
 				.span(COLUMNS, 1).grab(true, false).applyTo(interactiveButton);
-		dbc.bindValue(WidgetProperties.selection().observe(interactiveButton),
+		dbc.bindValue(WidgetProperties.widgetSelection().observe(interactiveButton),
 				BeanProperties
 						.value(ImageRunSelectionModel.class,
 								ImageRunSelectionModel.INTERACTIVE_MODE)
@@ -423,7 +423,7 @@ public class RunImageMainTab extends AbstractLaunchConfigurationTab {
 				.setText(WizardMessages.getString("ImageRunSelectionPage.tty")); //$NON-NLS-1$
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
 				.span(COLUMNS, 1).grab(true, false).applyTo(allocatePseudoTTY);
-		dbc.bindValue(WidgetProperties.selection().observe(allocatePseudoTTY),
+		dbc.bindValue(WidgetProperties.widgetSelection().observe(allocatePseudoTTY),
 				BeanProperties
 						.value(ImageRunSelectionModel.class,
 								ImageRunSelectionModel.ALLOCATE_PSEUDO_TTY)
@@ -437,7 +437,7 @@ public class RunImageMainTab extends AbstractLaunchConfigurationTab {
 				.span(COLUMNS, 1).grab(true, false)
 				.applyTo(removeWhenExitsButton);
 		dbc.bindValue(
-				WidgetProperties.selection().observe(removeWhenExitsButton),
+				WidgetProperties.widgetSelection().observe(removeWhenExitsButton),
 				BeanProperties
 						.value(ImageRunSelectionModel.class,
 								ImageRunSelectionModel.REMOVE_WHEN_EXITS)
@@ -449,7 +449,7 @@ public class RunImageMainTab extends AbstractLaunchConfigurationTab {
 				WizardMessages.getString("ImageRunSelectionPage.privileged")); //$NON-NLS-1$
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
 				.span(COLUMNS, 1).grab(true, false).applyTo(privilegedButton);
-		dbc.bindValue(WidgetProperties.selection().observe(privilegedButton),
+		dbc.bindValue(WidgetProperties.widgetSelection().observe(privilegedButton),
 				BeanProperties
 						.value(ImageRunSelectionModel.class,
 								ImageRunSelectionModel.PRIVILEGED)
@@ -642,11 +642,10 @@ public class RunImageMainTab extends AbstractLaunchConfigurationTab {
 		}
 	}
 
-	private class ImageSelectionValidator implements IValidator {
+	private class ImageSelectionValidator implements IValidator<String> {
 
 		@Override
-		public IStatus validate(final Object value) {
-			final String selectedImageName = (String) value;
+		public IStatus validate(final String selectedImageName) {
 			if (selectedImageName.isEmpty()) {
 				model.setSelectedImageNeedsPulling(false);
 				return ValidationStatus.error(WizardMessages
@@ -664,11 +663,10 @@ public class RunImageMainTab extends AbstractLaunchConfigurationTab {
 
 	}
 
-	private class ContainerNameValidator implements IValidator {
+	private class ContainerNameValidator implements IValidator<String> {
 
 		@Override
-		public IStatus validate(Object value) {
-			final String containerName = (String) value;
+		public IStatus validate(String containerName) {
 
 			for (IDockerContainer container : model.getSelectedConnection()
 					.getContainers()) {
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageNetworkTab.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageNetworkTab.java
index 25a6c0323d..dc5afd877e 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageNetworkTab.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageNetworkTab.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2018 Red Hat Inc. and others.
+ * Copyright (c) 2017, 2019 Red Hat Inc. and others.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -153,7 +153,7 @@ public class RunImageNetworkTab extends AbstractLaunchConfigurationTab
 						.list(ImageRunNetworkModel.class,
 								ImageRunNetworkModel.CONTAINER_NAMES)
 						.observe(model));
-		dbc.bindValue(WidgetProperties.selection().observe(containerList),
+		dbc.bindValue(WidgetProperties.widgetSelection().observe(containerList),
 				BeanProperties
 						.value(ImageRunNetworkModel.class,
 								ImageRunNetworkModel.SELECTED_CONTAINER)
@@ -216,7 +216,7 @@ public class RunImageNetworkTab extends AbstractLaunchConfigurationTab
 	 * @return
 	 */
 	private Binding bindButton(final Button button, final String strValue) {
-		return dbc.bindValue(WidgetProperties.selection().observe(button),
+		return dbc.bindValue(WidgetProperties.widgetSelection().observe(button),
 				BeanProperties.value(ImageRunNetworkModel.class, ImageRunNetworkModel.NETWORK_MODE).observe(model),
 				new UpdateValueStrategy() {
 					@Override
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImagePortsTab.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImagePortsTab.java
index 07eaa3488d..1192ead3d7 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImagePortsTab.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImagePortsTab.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat Inc. and others.
+ * Copyright (c) 2015, 2019 Red Hat Inc. and others.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -100,7 +100,7 @@ public class RunImagePortsTab extends AbstractLaunchConfigurationTab
 				.span(COLUMNS, 1).grab(true, false)
 				.applyTo(publishAllPortsButton);
 		dbc.bindValue(
-				WidgetProperties.selection().observe(publishAllPortsButton),
+				WidgetProperties.widgetSelection().observe(publishAllPortsButton),
 				BeanProperties
 						.value(ImageRunSelectionModel.class,
 								ImageRunSelectionModel.PUBLISH_ALL_PORTS)
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageResourcesTab.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageResourcesTab.java
index a13c389359..eadc03b2e2 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageResourcesTab.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageResourcesTab.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat Inc. and others.
+ * Copyright (c) 2015, 2019 Red Hat Inc. and others.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -87,7 +87,7 @@ public class RunImageResourcesTab extends AbstractLaunchConfigurationTab {
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
 				.applyTo(enableResourceLimitationButton);
 		dbc.bindValue(
-				WidgetProperties.selection()
+				WidgetProperties.widgetSelection()
 						.observe(enableResourceLimitationButton),
 				BeanProperties
 						.value(ImageRunResourceVolumesVariablesModel.class,
@@ -149,7 +149,7 @@ public class RunImageResourcesTab extends AbstractLaunchConfigurationTab {
 		memoryLimitSpinner.setMinimum(0);
 		memoryLimitSpinner.setMaximum(this.model.getTotalMemory());
 		memoryLimitSpinner.setPageIncrement(64);
-		dbc.bindValue(WidgetProperties.selection().observe(memoryLimitSpinner),
+		dbc.bindValue(WidgetProperties.widgetSelection().observe(memoryLimitSpinner),
 				BeanProperties
 						.value(ImageRunResourceVolumesVariablesModel.class,
 								ImageRunResourceVolumesVariablesModel.MEMORY_LIMIT)
@@ -165,7 +165,7 @@ public class RunImageResourcesTab extends AbstractLaunchConfigurationTab {
 						.value(ImageRunResourceVolumesVariablesModel.class,
 								ImageRunResourceVolumesVariablesModel.MEMORY_LIMIT)
 						.observe(model));
-		dbc.bindValue(WidgetProperties.selection().observe(memoryLimitSpinner),
+		dbc.bindValue(WidgetProperties.widgetSelection().observe(memoryLimitSpinner),
 				BeanProperties
 						.value(ImageRunResourceVolumesVariablesModel.class,
 								ImageRunResourceVolumesVariablesModel.MEMORY_LIMIT)
@@ -181,7 +181,7 @@ public class RunImageResourcesTab extends AbstractLaunchConfigurationTab {
 						ImageRunResourceVolumesVariablesModel.ENABLE_RESOURCE_LIMITATIONS)
 				.observe(model);
 		dbc.bindValue(
-				WidgetProperties.selection()
+				WidgetProperties.widgetSelection()
 						.observe(enableResourceLimitationButton),
 				enableResourceLimitationsObservable);
 		enableResourceLimitationsObservable
@@ -209,7 +209,7 @@ public class RunImageResourcesTab extends AbstractLaunchConfigurationTab {
 	 * @return
 	 */
 	private Binding bindButton(final Button button, final long cpuShares) {
-		return dbc.bindValue(WidgetProperties.selection().observe(button),
+		return dbc.bindValue(WidgetProperties.widgetSelection().observe(button),
 				BeanProperties
 						.value(ImageRunResourceVolumesVariablesModel.class,
 								ImageRunResourceVolumesVariablesModel.CPU_SHARE_WEIGHT)
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerDataVolumeDialog.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerDataVolumeDialog.java
index 05652ab182..4d71c388b8 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerDataVolumeDialog.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerDataVolumeDialog.java
@@ -198,7 +198,7 @@ public class ContainerDataVolumeDialog extends Dialog {
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
 				.span(COLUMNS - 2, 1).grab(true, false).applyTo(readOnlyButton);
 		final ISWTObservableValue<?> readOnlyButtonObservable = WidgetProperties
-				.selection().observe(readOnlyButton);
+				.widgetSelection().observe(readOnlyButton);
 		dbc.bindValue(readOnlyButtonObservable,
 				BeanProperties
 						.value(DataVolumeModel.class,
@@ -245,7 +245,7 @@ public class ContainerDataVolumeDialog extends Dialog {
 				.value(DataVolumeModel.class, DataVolumeModel.CONTAINER_MOUNT)
 				.observe(model);
 		dbc.bindValue(
-				WidgetProperties.selection().observe(containerSelectionCombo),
+				WidgetProperties.widgetSelection().observe(containerSelectionCombo),
 				selectedContainerObservable);
 		new ContentProposalAdapter(containerSelectionCombo,
 				new ComboContentAdapter() {
@@ -306,7 +306,7 @@ public class ContainerDataVolumeDialog extends Dialog {
 	 */
 	private Binding bindButton(final Button button, final MountType mountType,
 			final Control... controls) {
-		return dbc.bindValue(WidgetProperties.selection().observe(button),
+		return dbc.bindValue(WidgetProperties.widgetSelection().observe(button),
 				BeanProperties.value(DataVolumeModel.class,
 						DataVolumeModel.MOUNT_TYPE).observe(model),
 				new UpdateValueStrategy() {
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerLinkDialog.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerLinkDialog.java
index 795fa682b4..dbac053402 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerLinkDialog.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerLinkDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat Inc. and others.
+ * Copyright (c) 2015, 2019 Red Hat Inc. and others.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -155,7 +155,7 @@ public class ContainerLinkDialog extends Dialog {
 				.span(COLUMNS, 1).grab(true, false).applyTo(errorMessageLabel);
 
 		final ISWTObservableValue<?> containerNameObservable = WidgetProperties
-				.selection().observe(containerSelectionComboViewer.getCombo());
+				.widgetSelection().observe(containerSelectionComboViewer.getCombo());
 
 		dbc.bindValue(containerNameObservable,
 				BeanProperties
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/DockerComposeUpDialog.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/DockerComposeUpDialog.java
index 2c6244fda0..9561817538 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/DockerComposeUpDialog.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/DockerComposeUpDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat Inc. and others.
+ * Copyright (c) 2015, 2019 Red Hat Inc. and others.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -126,7 +126,7 @@ public class DockerComposeUpDialog extends Dialog {
 						containerSelectionCombo),
 				null, null);
 		final ISWTObservableValue connnectionNameObservable = WidgetProperties
-				.selection().observe(connectionSelectionComboViewer.getCombo());
+				.widgetSelection().observe(connectionSelectionComboViewer.getCombo());
 		// pre-select with first connection
 		if (!connectionNames.isEmpty()) {
 			model.setConnectionName(connectionNames.get(0));
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/EditDockerConnectionPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/EditDockerConnectionPage.java
index c638fc45b4..c06069fc5f 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/EditDockerConnectionPage.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/EditDockerConnectionPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat Inc. and others.
+ * Copyright (c) 2014, 2019 Red Hat Inc. and others.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -279,19 +279,19 @@ public class EditDockerConnectionPage extends WizardPage {
 				WidgetProperties.text(SWT.Modify).observe(connectionNameText),
 				connectionNameModelObservable);
 		dbc.bindValue(
-				WidgetProperties.selection()
+				WidgetProperties.widgetSelection()
 						.observe(unixSocketBindingModeButton),
 				unixSocketBindingModeModelObservable);
 		dbc.bindValue(
 				WidgetProperties.text(SWT.Modify).observe(unixSocketPathText),
 				unixSocketPathModelObservable);
 		dbc.bindValue(
-				WidgetProperties.selection()
+				WidgetProperties.widgetSelection()
 						.observe(tcpConnectionBindingModeButton),
 				tcpConnectionBindingModeModelObservable);
 		dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(tcpHostText),
 				tcpHostModelObservable);
-		dbc.bindValue(WidgetProperties.selection().observe(tcpAuthButton),
+		dbc.bindValue(WidgetProperties.widgetSelection().observe(tcpAuthButton),
 				tcpTlsVerifyModelObservable);
 		dbc.bindValue(
 				WidgetProperties.text(SWT.Modify).observe(tcpCertPathText),
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageBuildDialog.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageBuildDialog.java
index 5ed756fcf8..a9720532dd 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageBuildDialog.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageBuildDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat Inc. and others.
+ * Copyright (c) 2015, 2019 Red Hat Inc. and others.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -144,7 +144,7 @@ public class ImageBuildDialog extends Dialog {
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
 				.grab(true, false).applyTo(repoNameText);
 		final ISWTObservableValue<?> connnectionNameObservable = WidgetProperties
-				.selection().observe(connectionSelectionComboViewer.getCombo());
+				.widgetSelection().observe(connectionSelectionComboViewer.getCombo());
 		// pre-select with first connection
 		if (!connectionNames.isEmpty()) {
 			model.setConnectionName(connectionNames.get(0));
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageNameValidator.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageNameValidator.java
index 08c70ef4d9..639e11f5e8 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageNameValidator.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageNameValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat Inc. and others.
+ * Copyright (c) 2015, 2019 Red Hat Inc. and others.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -24,7 +24,7 @@ import org.eclipse.linuxtools.internal.docker.core.DockerImage;
  * Validates that the image name matches
  * [REGISTRY_HOST[:REGISTRY_PORT]/]IMAGE_NAME[:TAG]
  */
-public class ImageNameValidator implements IValidator {
+public class ImageNameValidator implements IValidator<String> {
 
 	public static enum ImageNameStatus {
 		// status when image name is valid and complete
@@ -38,8 +38,7 @@ public class ImageNameValidator implements IValidator {
 	}
 
 	@Override
-	public IStatus validate(final Object value) {
-		final String imageName = (String) value;
+	public IStatus validate(final String imageName) {
 		final ImageNameStatus imageNameStatus = getStatus(imageName);
 		switch (imageNameStatus) {
 		case EMPTY:
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullPage.java
index 5a7bbbc9b4..75b5dad62d 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullPage.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat.
+ * Copyright (c) 2015, 2019 Red Hat Inc. and others.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -90,7 +90,6 @@ public class ImagePullPage extends ImagePullPushPage<ImagePullPageModel> {
 		setControl(container);
 	}
 
-	@SuppressWarnings("unchecked")
 	void createImageNameSelectionControls(final Composite parent) {
 		// Image name
 		final Label imageNameLabel = new Label(parent, SWT.NONE);
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePushPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePushPage.java
index 16e620e3e3..faa1f6f7af 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePushPage.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePushPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat Inc. and others.
+ * Copyright (c) 2015, 2019 Red Hat Inc. and others.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -109,7 +109,7 @@ public class ImagePushPage extends ImagePullPushPage<ImagePushPageModel> {
 				.getString("ImagePushPage.forcetagging.label")); //$NON-NLS-1$ );
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
 				.grab(true, false).span(2, 1).applyTo(forceTaggingButton);
-		dbc.bindValue(WidgetProperties.selection().observe(forceTaggingButton),
+		dbc.bindValue(WidgetProperties.widgetSelection().observe(forceTaggingButton),
 				BeanProperties.value(ImagePushPageModel.class,
 						ImagePushPageModel.FORCE_TAGGING).observe(getModel()));
 
@@ -120,7 +120,7 @@ public class ImagePushPage extends ImagePullPushPage<ImagePushPageModel> {
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
 				.grab(true, false).span(2, 1).applyTo(keepTaggedImageButton);
 		dbc.bindValue(
-				WidgetProperties.selection().observe(keepTaggedImageButton),
+				WidgetProperties.widgetSelection().observe(keepTaggedImageButton),
 				BeanProperties
 						.value(ImagePushPageModel.class,
 								ImagePushPageModel.KEEP_TAGGED_IMAGE)
@@ -155,7 +155,7 @@ public class ImagePushPage extends ImagePullPushPage<ImagePushPageModel> {
 				.value(ImagePushPageModel.class,
 						ImagePullPushPageModel.SELECTED_IMAGE_NAME, String.class)
 				.observe(getModel());
-		dbc.bindValue(WidgetProperties.selection().observe(imageNameCombo),
+		dbc.bindValue(WidgetProperties.widgetSelection().observe(imageNameCombo),
 				imageNameObservable);
 		// filler for the last column
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunNetworkPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunNetworkPage.java
index a75bf83b5c..c1796fabbd 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunNetworkPage.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunNetworkPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2018 Red Hat Inc. and others.
+ * Copyright (c) 2017, 2019 Red Hat Inc. and others.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -197,7 +197,7 @@ public class ImageRunNetworkPage extends WizardPage {
 		containerList.setEnabled(false);
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
 				.grab(true, false).applyTo(containerList);
-		dbc.bindValue(WidgetProperties.selection().observe(containerList),
+		dbc.bindValue(WidgetProperties.widgetSelection().observe(containerList),
 				BeanProperties
 						.value(ImageRunNetworkModel.class,
 								ImageRunNetworkModel.SELECTED_CONTAINER)
@@ -287,7 +287,7 @@ public class ImageRunNetworkPage extends WizardPage {
 	 */
 	@SuppressWarnings("unchecked")
 	private Binding bindButton(final Button button, final String strValue) {
-		return dbc.bindValue(WidgetProperties.selection().observe(button),
+		return dbc.bindValue(WidgetProperties.widgetSelection().observe(button),
 				BeanProperties
 						.value(ImageRunNetworkModel.class,
 								ImageRunNetworkModel.NETWORK_MODE)
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunResourceVolumesVariablesPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunResourceVolumesVariablesPage.java
index 1c23e1ec68..2778280eb6 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunResourceVolumesVariablesPage.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunResourceVolumesVariablesPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat Inc. and others.
+ * Copyright (c) 2015, 2019 Red Hat Inc. and others.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -248,7 +248,7 @@ image);
 		memoryLimitSpinner.setMinimum(0);
 		memoryLimitSpinner.setMaximum(this.model.getTotalMemory());
 		memoryLimitSpinner.setPageIncrement(64);
-		dbc.bindValue(WidgetProperties.selection().observe(memoryLimitSpinner),
+		dbc.bindValue(WidgetProperties.widgetSelection().observe(memoryLimitSpinner),
 				BeanProperties
 						.value(ImageRunResourceVolumesVariablesModel.class,
 								ImageRunResourceVolumesVariablesModel.MEMORY_LIMIT)
@@ -275,7 +275,7 @@ image);
 						ImageRunResourceVolumesVariablesModel.ENABLE_RESOURCE_LIMITATIONS)
 				.observe(model);
 		dbc.bindValue(
-				WidgetProperties.selection()
+				WidgetProperties.widgetSelection()
 						.observe(enableResourceLimitationButton),
 				enableResourceLimitationsObservable);
 		enableResourceLimitationsObservable
@@ -295,7 +295,7 @@ image);
 	 * @return
 	 */
 	private Binding bindButton(final Button button, final long cpuShares) {
-		return dbc.bindValue(WidgetProperties.selection().observe(button),
+		return dbc.bindValue(WidgetProperties.widgetSelection().observe(button),
 				BeanProperties
 						.value(ImageRunResourceVolumesVariablesModel.class,
 								ImageRunResourceVolumesVariablesModel.CPU_SHARE_WEIGHT)
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionPage.java
index c563b0efda..5637d95930 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionPage.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat Inc. and others.
+ * Copyright (c) 2014, 2019 Red Hat Inc. and others.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -332,7 +332,7 @@ public class ImageRunSelectionPage extends WizardPage {
 						.list(ImageRunSelectionModel.class,
 								ImageRunSelectionModel.IMAGE_NAMES)
 						.observe(model));
-		dbc.bindValue(WidgetProperties.selection().observe(imageSelectionCombo),
+		dbc.bindValue(WidgetProperties.widgetSelection().observe(imageSelectionCombo),
 				BeanProperties
 						.value(ImageRunSelectionModel.class,
 								ImageRunSelectionModel.SELECTED_IMAGE_NAME)
@@ -403,7 +403,7 @@ public class ImageRunSelectionPage extends WizardPage {
 				.span(COLUMNS, 1).grab(true, false)
 				.applyTo(publishAllPortsButton);
 		dbc.bindValue(
-				WidgetProperties.selection().observe(publishAllPortsButton),
+				WidgetProperties.widgetSelection().observe(publishAllPortsButton),
 				BeanProperties
 						.value(ImageRunSelectionModel.class,
 								ImageRunSelectionModel.PUBLISH_ALL_PORTS)
@@ -649,7 +649,7 @@ public class ImageRunSelectionPage extends WizardPage {
 				WizardMessages.getString("ImageRunSelectionPage.openStdin")); //$NON-NLS-1$
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
 				.span(COLUMNS, 1).grab(true, false).applyTo(interactiveButton);
-		dbc.bindValue(WidgetProperties.selection().observe(interactiveButton),
+		dbc.bindValue(WidgetProperties.widgetSelection().observe(interactiveButton),
 				BeanProperties
 						.value(ImageRunSelectionModel.class,
 								ImageRunSelectionModel.INTERACTIVE_MODE)
@@ -660,7 +660,7 @@ public class ImageRunSelectionPage extends WizardPage {
 				.setText(WizardMessages.getString("ImageRunSelectionPage.tty")); //$NON-NLS-1$
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
 				.span(COLUMNS, 1).grab(true, false).applyTo(allocatePseudoTTY);
-		dbc.bindValue(WidgetProperties.selection().observe(allocatePseudoTTY),
+		dbc.bindValue(WidgetProperties.widgetSelection().observe(allocatePseudoTTY),
 				BeanProperties
 						.value(ImageRunSelectionModel.class,
 								ImageRunSelectionModel.ALLOCATE_PSEUDO_TTY)
@@ -674,7 +674,7 @@ public class ImageRunSelectionPage extends WizardPage {
 				.span(COLUMNS, 1).grab(true, false)
 				.applyTo(removeWhenExitsButton);
 		dbc.bindValue(
-				WidgetProperties.selection().observe(removeWhenExitsButton),
+				WidgetProperties.widgetSelection().observe(removeWhenExitsButton),
 				BeanProperties
 						.value(ImageRunSelectionModel.class,
 								ImageRunSelectionModel.REMOVE_WHEN_EXITS)
@@ -686,7 +686,7 @@ public class ImageRunSelectionPage extends WizardPage {
 				WizardMessages.getString("ImageRunSelectionPage.privileged")); //$NON-NLS-1$
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
 				.span(COLUMNS, 1).grab(true, false).applyTo(privilegedButton);
-		dbc.bindValue(WidgetProperties.selection().observe(privilegedButton),
+		dbc.bindValue(WidgetProperties.widgetSelection().observe(privilegedButton),
 				BeanProperties
 						.value(ImageRunSelectionModel.class,
 								ImageRunSelectionModel.PRIVILEGED)
@@ -698,7 +698,7 @@ public class ImageRunSelectionPage extends WizardPage {
 				WizardMessages.getString("ImageRunSelectionPage.unconfined")); //$NON-NLS-1$
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
 				.span(COLUMNS, 1).grab(true, false).applyTo(unconfinedButton);
-		dbc.bindValue(WidgetProperties.selection().observe(unconfinedButton),
+		dbc.bindValue(WidgetProperties.widgetSelection().observe(unconfinedButton),
 				BeanProperties
 						.value(ImageRunSelectionModel.class,
 								ImageRunSelectionModel.UNCONFINED)
@@ -711,7 +711,7 @@ public class ImageRunSelectionPage extends WizardPage {
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
 				.span(COLUMNS, 1).grab(true, false)
 				.applyTo(basicSecurityButton);
-		dbc.bindValue(WidgetProperties.selection().observe(basicSecurityButton),
+		dbc.bindValue(WidgetProperties.widgetSelection().observe(basicSecurityButton),
 				BeanProperties
 						.value(ImageRunSelectionModel.class,
 								ImageRunSelectionModel.BASIC_SECURITY)
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageSearchPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageSearchPage.java
index 72cf68c1c5..eae0e32262 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageSearchPage.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageSearchPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat Inc. and others.
+ * Copyright (c) 2014, 2019 Red Hat Inc. and others.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -331,7 +331,7 @@ public class ImageSearchPage extends WizardPage {
 		return this.model.getSelectedImage() != null;
 	}
 
-	static class SearchTermValidator implements IValidator {
+	static class SearchTermValidator implements IValidator<String> {
 
 		private static final String REPOSITORY = "[a-z0-9]+([._-][a-z0-9]+)*";
 		private static final String NAME = "[a-z0-9]+([._-][a-z0-9]+)*";
@@ -345,8 +345,7 @@ public class ImageSearchPage extends WizardPage {
 		}
 
 		@Override
-		public IStatus validate(final Object value) {
-			final String term = (String) value;
+		public IStatus validate(final String term) {
 			if (term == null || term.isEmpty()) {
 				this.searchImageButton.setEnabled(false);
 				return ValidationStatus.info(WizardMessages
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionPage.java
index 4cc37e2cba..6c87e19b5c 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionPage.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat Inc. and others
+ * Copyright (c) 2014, 2019 Red Hat Inc. and others
  * .
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -353,23 +353,23 @@ public class NewDockerConnectionPage extends WizardPage {
 				WidgetProperties.text(SWT.Modify).observe(connectionNameText),
 				connectionNameModelObservable);
 		dbc.bindValue(
-				WidgetProperties.selection()
+				WidgetProperties.widgetSelection()
 						.observe(customConnectionSettingsButton),
 				customConnectionSettingsModelObservable);
 		dbc.bindValue(
-				WidgetProperties.selection()
+				WidgetProperties.widgetSelection()
 						.observe(unixSocketBindingModeButton),
 				unixSocketBindingModeModelObservable);
 		dbc.bindValue(
 				WidgetProperties.text(SWT.Modify).observe(unixSocketPathText),
 				unixSocketPathModelObservable);
 		dbc.bindValue(
-				WidgetProperties.selection()
+				WidgetProperties.widgetSelection()
 						.observe(tcpConnectionBindingModeButton),
 				tcpConnectionBindingModeModelObservable);
 		dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(tcpHostText),
 				tcpHostModelObservable);
-		dbc.bindValue(WidgetProperties.selection().observe(tcpAuthButton),
+		dbc.bindValue(WidgetProperties.widgetSelection().observe(tcpAuthButton),
 				tcpTlsVerifyModelObservable);
 		dbc.bindValue(
 				WidgetProperties.text(SWT.Modify).observe(tcpCertPathText),