Fix some compile errors with Docker UI

- fix references to UpdateValueStrategy
- fix for loops using DataBindingContext.getBindings()

Change-Id: I47bbca12b603667bff9347a9bf2fce5924492c1b
Reviewed-on: https://git.eclipse.org/r/131874
Tested-by: CI Bot
Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>

5 files changed, 14 insertions, 5 deletions

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 56f0cbbea1..09fea3a201 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
@@ -15,6 +15,7 @@ package org.eclipse.linuxtools.internal.docker.ui.wizards;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.core.databinding.Binding;
@@ -284,7 +285,9 @@ public class ContainerDataVolumeDialog extends Dialog {
 
 	private void setupValidationSupport(final Label errorMessageIcon,
 			final Label errorMessageLabel) {
-		for (Binding binding : dbc.getBindings()) {
+		for (@SuppressWarnings("unchecked")
+		Iterator<Binding> iterator = dbc.getBindings().iterator(); iterator.hasNext();) {
+			final Binding binding = iterator.next();
 			binding.getModel().addChangeListener(onDataVolumeSettingsChanged(errorMessageIcon, errorMessageLabel));
 		}
 	}
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 93e5796951..f0803d741c 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
@@ -14,6 +14,7 @@
 package org.eclipse.linuxtools.internal.docker.ui.wizards;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.core.databinding.Binding;
@@ -156,7 +157,9 @@ public class DockerComposeUpDialog extends Dialog {
 
 	private void setupValidationSupport(final Label errorMessageIcon,
 			final Label errorMessageLabel) {
-		for (Binding binding : dbc.getBindings()) {
+		for (@SuppressWarnings("unchecked")
+		Iterator<Binding> iterator = dbc.getBindings().iterator(); iterator.hasNext();) {
+			final Binding binding = iterator.next();
 			binding.getModel().addChangeListener(onSettingsChanged(errorMessageIcon, errorMessageLabel));
 		}
 	}
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 67c35d72ba..fc4fb3c322 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
@@ -14,6 +14,7 @@
 package org.eclipse.linuxtools.internal.docker.ui.wizards;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.core.databinding.Binding;
@@ -182,7 +183,9 @@ public class ImageBuildDialog extends Dialog {
 
 	private void setupValidationSupport(final Label errorMessageIcon,
 			final Label errorMessageLabel) {
-		for (Binding binding : dbc.getBindings()) {
+		for (@SuppressWarnings("unchecked")
+		Iterator<Binding> iterator = dbc.getBindings().iterator(); iterator.hasNext();) {
+			final Binding binding = iterator.next();
 			binding.getModel().addChangeListener(onBuildSettingsChanged(errorMessageIcon, errorMessageLabel));
 		}
 	}
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 8d663de466..9642a890ce 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
@@ -119,7 +119,7 @@ public class ImagePullPage extends ImagePullPushPage<ImagePullPageModel> {
 						ImagePullPushPageModel.SELECTED_IMAGE_NAME)
 				.observe(getModel());
 		dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(imageNameText),
-				imgeNameObservable, new UpdateValueStrategy<>()
+				imgeNameObservable, new UpdateValueStrategy()
 						.setAfterConvertValidator(new ImageNameValidator()),
 				null);
 	}
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 3e760f301d..dbf8a78305 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
@@ -180,7 +180,7 @@ public class ImageSearchPage extends WizardPage {
 		final ISWTObservableValue imageSearchTextObservable = WidgetProperties
 				.text(SWT.Modify).observe(searchImageText);
 		ctx.bindValue(imageSearchTextObservable, observableTermModel,
-				new UpdateValueStrategy<>().setBeforeSetValidator(
+				new UpdateValueStrategy().setBeforeSetValidator(
 						new SearchTermValidator(searchImageButton)),
 				null);
 		// observe the viewer content