Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2018-10-16 20:01:31 +0000
committerAlexander Kurtakov2018-10-17 04:03:38 +0000
commit91f06a079fa2035a5866c14ab65a55a7541c43f8 (patch)
tree772e9c58912c0f17038f024870cb403a3faa1c6d
parentc99edc9d2b13accf266e3f3ca3af55faa836ce5d (diff)
downloadorg.eclipse.linuxtools-91f06a079fa2035a5866c14ab65a55a7541c43f8.tar.gz
org.eclipse.linuxtools-91f06a079fa2035a5866c14ab65a55a7541c43f8.tar.xz
org.eclipse.linuxtools-91f06a079fa2035a5866c14ab65a55a7541c43f8.zip
Generify observability code.
Change-Id: I717791c6a515dacfc8ecd412109b8a7915440274 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com> Reviewed-on: https://git.eclipse.org/r/131018 Tested-by: CI Bot
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageNetworkTab.java11
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerDataVolumeDialog.java9
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/DockerComposeUpDialog.java9
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageBuildDialog.java9
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullPage.java2
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageSearchPage.java2
-rw-r--r--vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/AddBoxPage.java4
-rw-r--r--vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/PackageVMPage.java4
8 files changed, 16 insertions, 34 deletions
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 e757ad40e8..5e39bfefaa 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
@@ -217,18 +217,15 @@ public class RunImageNetworkTab extends AbstractLaunchConfigurationTab
*/
private Binding bindButton(final Button button, final String strValue) {
return dbc.bindValue(WidgetProperties.selection().observe(button),
- BeanProperties
- .value(ImageRunNetworkModel.class,
- ImageRunNetworkModel.NETWORK_MODE)
- .observe(model),
+ BeanProperties.value(ImageRunNetworkModel.class, ImageRunNetworkModel.NETWORK_MODE).observe(model),
new UpdateValueStrategy() {
- @Override
+ @Override
public Object convert(Object value) {
if (value.equals(Boolean.TRUE)) {
return strValue;
- }
+ }
return null;
- }
+ }
}, new UpdateValueStrategy() {
@Override
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 61c2a63954..56f0cbbea1 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,7 +15,6 @@ 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;
@@ -285,12 +284,8 @@ public class ContainerDataVolumeDialog extends Dialog {
private void setupValidationSupport(final Label errorMessageIcon,
final Label errorMessageLabel) {
- for (@SuppressWarnings("unchecked")
- Iterator<Binding> iterator = dbc.getBindings().iterator(); iterator
- .hasNext();) {
- final Binding binding = iterator.next();
- binding.getModel().addChangeListener(onDataVolumeSettingsChanged(
- errorMessageIcon, errorMessageLabel));
+ for (Binding binding : dbc.getBindings()) {
+ 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 972201c56a..93e5796951 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,7 +14,6 @@
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;
@@ -157,12 +156,8 @@ public class DockerComposeUpDialog extends Dialog {
private void setupValidationSupport(final Label errorMessageIcon,
final Label errorMessageLabel) {
- for (@SuppressWarnings("unchecked")
- Iterator<Binding> iterator = dbc.getBindings().iterator(); iterator
- .hasNext();) {
- final Binding binding = iterator.next();
- binding.getModel().addChangeListener(onSettingsChanged(
- errorMessageIcon, errorMessageLabel));
+ for (Binding binding : dbc.getBindings()) {
+ 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 6d7f57699c..67c35d72ba 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,7 +14,6 @@
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;
@@ -183,12 +182,8 @@ public class ImageBuildDialog extends Dialog {
private void setupValidationSupport(final Label errorMessageIcon,
final Label errorMessageLabel) {
- for (@SuppressWarnings("unchecked")
- Iterator<Binding> iterator = dbc.getBindings().iterator(); iterator
- .hasNext();) {
- final Binding binding = iterator.next();
- binding.getModel().addChangeListener(onBuildSettingsChanged(
- errorMessageIcon, errorMessageLabel));
+ for (Binding binding : dbc.getBindings()) {
+ 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 9642a890ce..8d663de466 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 dbf8a78305..3e760f301d 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
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/AddBoxPage.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/AddBoxPage.java
index 8c5bfd4533..04b9774c3e 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/AddBoxPage.java
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/AddBoxPage.java
@@ -94,7 +94,7 @@ public class AddBoxPage extends WizardPage {
.value(AddBoxPageModel.class, AddBoxPageModel.BOX_NAME)
.observe(model);
dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(boxNameText),
- boxNameObservable, new UpdateValueStrategy(), null);
+ boxNameObservable, new UpdateValueStrategy<>(), null);
// Box location
final Label boxLocLabel = new Label(container, SWT.NONE);
@@ -113,7 +113,7 @@ public class AddBoxPage extends WizardPage {
.value(AddBoxPageModel.class, AddBoxPageModel.BOX_LOC)
.observe(model);
dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(boxLocText),
- imageNameObservable, new UpdateValueStrategy(), null);
+ imageNameObservable, new UpdateValueStrategy<>(), null);
// search
final Button searchButton = new Button(container, SWT.NONE);
searchButton
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/PackageVMPage.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/PackageVMPage.java
index b90b9d070b..d85dc5b68c 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/PackageVMPage.java
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/PackageVMPage.java
@@ -98,7 +98,7 @@ public class PackageVMPage extends WizardPage {
.value(PackageVMPageModel.class, PackageVMPageModel.BOX_NAME)
.observe(model);
dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(boxNameText),
- boxNameObservable, new UpdateValueStrategy(), null);
+ boxNameObservable, new UpdateValueStrategy<>(), null);
// Box folder
final Label boxFolderLabel = new Label(container, SWT.NONE);
@@ -116,7 +116,7 @@ public class PackageVMPage extends WizardPage {
.value(PackageVMPageModel.class, PackageVMPageModel.BOX_FOLDER)
.observe(model);
dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(boxFolderText),
- boxFolderObservable, new UpdateValueStrategy(), null);
+ boxFolderObservable, new UpdateValueStrategy<>(), null);
// search
final Button searchButton = new Button(container, SWT.NONE);
searchButton

Back to the top