Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2019-05-08 08:27:27 -0400
committerAlexander Kurtakov2019-05-08 09:03:24 -0400
commit1ed4974fb1ac8aa68b3b724e9d909093506704d3 (patch)
tree4a2eaa2e5295e5ccb46330a5a3813d578482f7fb
parent6dfdb95bba37dcde461e62a3181a239f5378f7b0 (diff)
downloadorg.eclipse.linuxtools-1ed4974fb1ac8aa68b3b724e9d909093506704d3.tar.gz
org.eclipse.linuxtools-1ed4974fb1ac8aa68b3b724e9d909093506704d3.tar.xz
org.eclipse.linuxtools-1ed4974fb1ac8aa68b3b724e9d909093506704d3.zip
Another round of databindings generification.
A lot better than no generification like in pre 4.12 but still some work to be done. Change-Id: I122e04d5a7946b564d729a03b0e913a05285878e Signed-off-by: Alexander Kurtakov <akurtako@redhat.com> Reviewed-on: https://git.eclipse.org/r/141775 Tested-by: Linux Tools Bot <linuxtools-bot@eclipse.org>
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageEnvironmentTab.java2
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageLabelsTab.java2
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageLinksTab.java2
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageMainTab.java2
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImagePortsTab.java2
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageResourcesTab.java2
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ConfigureLabelsPage.java2
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerDataVolumeDialog.java8
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerEnvironmentVariableDialog.java4
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerLabelVariableDialog.java4
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerLinkDialog.java17
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerPortDialog.java23
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/EditDockerConnectionPage.java17
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageBuildDialog.java4
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullPage.java6
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullPushPage.java6
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePushPage.java6
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunNetworkPage.java1
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunResourceVolumesVariablesPage.java2
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionPage.java4
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageSearchPage.java8
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageTagSelectionPage.java3
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionPage.java26
-rw-r--r--vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/AddBoxPage.java8
-rw-r--r--vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/CreateVMPage.java14
-rw-r--r--vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/PackageVMPage.java8
26 files changed, 82 insertions, 101 deletions
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageEnvironmentTab.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageEnvironmentTab.java
index e82ce14cd9..74435e4de5 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageEnvironmentTab.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageEnvironmentTab.java
@@ -174,7 +174,7 @@ public class RunImageEnvironmentTab extends AbstractLaunchConfigurationTab {
WizardMessages
.getString("ImageRunResourceVolVarPage.valueColumn"), //$NON-NLS-1$
200);
- tableViewer.setContentProvider(new ObservableListContentProvider());
+ tableViewer.setContentProvider(new ObservableListContentProvider<>());
return tableViewer;
}
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageLabelsTab.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageLabelsTab.java
index d674fa8f27..d1d028545a 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageLabelsTab.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageLabelsTab.java
@@ -172,7 +172,7 @@ public class RunImageLabelsTab extends AbstractLaunchConfigurationTab {
WizardMessages
.getString("ImageRunResourceVolVarPage.valueColumn"), //$NON-NLS-1$
200);
- tableViewer.setContentProvider(new ObservableListContentProvider());
+ tableViewer.setContentProvider(new ObservableListContentProvider<>());
return tableViewer;
}
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageLinksTab.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageLinksTab.java
index 6182fae839..ff31366f59 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageLinksTab.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageLinksTab.java
@@ -163,7 +163,7 @@ public class RunImageLinksTab extends AbstractLaunchConfigurationTab {
createTableViewerColumn(tableViewer,
WizardMessages.getString("ImageRunSelectionPage.aliasColumn"), //$NON-NLS-1$
150);
- tableViewer.setContentProvider(new ObservableListContentProvider());
+ tableViewer.setContentProvider(new ObservableListContentProvider<>());
return tableViewer;
}
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 41ab95a989..255221b34e 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
@@ -228,7 +228,7 @@ public class RunImageMainTab extends AbstractLaunchConfigurationTab {
.applyTo(searchImageButton);
searchImageButton.addSelectionListener(onSearchImage());
imageSelectionComboViewer
- .setContentProvider(new ObservableListContentProvider());
+ .setContentProvider(new ObservableListContentProvider<>());
dbc.bindList(WidgetProperties.items().observe(imageSelectionCombo),
BeanProperties
.list(ImageRunSelectionModel.class,
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 c5f6abf2a8..07eaa3488d 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
@@ -227,7 +227,7 @@ public class RunImagePortsTab extends AbstractLaunchConfigurationTab
WizardMessages
.getString("ImageRunSelectionPage.hostPortColumn"), //$NON-NLS-1$
100);
- tableViewer.setContentProvider(new ObservableListContentProvider());
+ tableViewer.setContentProvider(new ObservableListContentProvider<>());
return tableViewer;
}
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 03b9f4dec8..a13c389359 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
@@ -176,7 +176,7 @@ public class RunImageResourcesTab extends AbstractLaunchConfigurationTab {
.grab(false, false).applyTo(memoryLimitValueLabel);
// enable/disable controls
- final IObservableValue enableResourceLimitationsObservable = BeanProperties
+ final IObservableValue<?> enableResourceLimitationsObservable = BeanProperties
.value(ImageRunResourceVolumesVariablesModel.class,
ImageRunResourceVolumesVariablesModel.ENABLE_RESOURCE_LIMITATIONS)
.observe(model);
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ConfigureLabelsPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ConfigureLabelsPage.java
index e60f398b36..889880af2b 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ConfigureLabelsPage.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ConfigureLabelsPage.java
@@ -190,7 +190,7 @@ public class ConfigureLabelsPage extends WizardPage {
WizardMessages
.getString("ImageRunResourceVolVarPage.valueColumn"), //$NON-NLS-1$
200);
- tableViewer.setContentProvider(new ObservableListContentProvider());
+ tableViewer.setContentProvider(new ObservableListContentProvider<>());
return tableViewer;
}
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 ac5615c9d0..05652ab182 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
@@ -138,7 +138,7 @@ public class ContainerDataVolumeDialog extends Dialog {
final Text containerPathText = new Text(container, SWT.BORDER);
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
.grab(true, false).applyTo(containerPathText);
- final IObservableValue containerPathObservable = BeanProperties
+ final IObservableValue<?> containerPathObservable = BeanProperties
.value(DataVolumeModel.class, DataVolumeModel.CONTAINER_PATH)
.observe(model);
dbc.bindValue(
@@ -175,7 +175,7 @@ public class ContainerDataVolumeDialog extends Dialog {
final Text hostPathText = new Text(container, SWT.BORDER);
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
.grab(true, false).applyTo(hostPathText);
- final IObservableValue hostPathObservable = BeanProperties
+ final IObservableValue<?> hostPathObservable = BeanProperties
.value(DataVolumeModel.class, DataVolumeModel.HOST_PATH_MOUNT)
.observe(model);
dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(hostPathText),
@@ -197,7 +197,7 @@ public class ContainerDataVolumeDialog extends Dialog {
.getString("ContainerDataVolumeDialog.readOnlyButtonTooltip")); //$NON-NLS-1$
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
.span(COLUMNS - 2, 1).grab(true, false).applyTo(readOnlyButton);
- final ISWTObservableValue readOnlyButtonObservable = WidgetProperties
+ final ISWTObservableValue<?> readOnlyButtonObservable = WidgetProperties
.selection().observe(readOnlyButton);
dbc.bindValue(readOnlyButtonObservable,
BeanProperties
@@ -241,7 +241,7 @@ public class ContainerDataVolumeDialog extends Dialog {
containerSelectionComboViewer
.setContentProvider(new ArrayContentProvider());
containerSelectionComboViewer.setInput(this.containerNames);
- final IObservableValue selectedContainerObservable = BeanProperties
+ final IObservableValue<?> selectedContainerObservable = BeanProperties
.value(DataVolumeModel.class, DataVolumeModel.CONTAINER_MOUNT)
.observe(model);
dbc.bindValue(
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerEnvironmentVariableDialog.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerEnvironmentVariableDialog.java
index 9b63786f8a..753eeb37cc 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerEnvironmentVariableDialog.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerEnvironmentVariableDialog.java
@@ -110,12 +110,12 @@ public class ContainerEnvironmentVariableDialog extends Dialog {
.span(COLUMNS, 1).grab(true, false).applyTo(errorMessageLabel);
// listening to changes
- final ISWTObservableValue variableNameObservable = WidgetProperties
+ final ISWTObservableValue<?> variableNameObservable = WidgetProperties
.text(SWT.Modify).observe(variableNameText);
dbc.bindValue(variableNameObservable,
BeanProperties.value(EnvironmentVariableModel.class,
EnvironmentVariableModel.NAME).observe(model));
- final ISWTObservableValue variableValueObservable = WidgetProperties
+ final ISWTObservableValue<?> variableValueObservable = WidgetProperties
.text(SWT.Modify).observe(variableValueText);
dbc.bindValue(variableValueObservable,
BeanProperties.value(EnvironmentVariableModel.class,
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerLabelVariableDialog.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerLabelVariableDialog.java
index fc419871cd..60c19fb81b 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerLabelVariableDialog.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerLabelVariableDialog.java
@@ -110,12 +110,12 @@ public class ContainerLabelVariableDialog extends Dialog {
.span(COLUMNS, 1).grab(true, false).applyTo(errorMessageLabel);
// listening to changes
- final ISWTObservableValue variableNameObservable = WidgetProperties
+ final ISWTObservableValue<?> variableNameObservable = WidgetProperties
.text(SWT.Modify).observe(variableNameText);
dbc.bindValue(variableNameObservable,
BeanProperties.value(LabelVariableModel.class,
LabelVariableModel.NAME).observe(model));
- final ISWTObservableValue variableValueObservable = WidgetProperties
+ final ISWTObservableValue<?> variableValueObservable = WidgetProperties
.text(SWT.Modify).observe(variableValueText);
dbc.bindValue(variableValueObservable,
BeanProperties.value(LabelVariableModel.class,
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 f5cc7b25e4..795fa682b4 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
@@ -154,7 +154,7 @@ public class ContainerLinkDialog extends Dialog {
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
.span(COLUMNS, 1).grab(true, false).applyTo(errorMessageLabel);
- final ISWTObservableValue containerNameObservable = WidgetProperties
+ final ISWTObservableValue<?> containerNameObservable = WidgetProperties
.selection().observe(containerSelectionComboViewer.getCombo());
dbc.bindValue(containerNameObservable,
@@ -162,18 +162,13 @@ public class ContainerLinkDialog extends Dialog {
.value(ContainerLinkDialogModel.class,
ContainerLinkDialogModel.CONTAINER_NAME)
.observe(model));
- final ISWTObservableValue containerAliasObservable = WidgetProperties
+ final ISWTObservableValue<?> containerAliasObservable = WidgetProperties
.text(SWT.Modify).observe(containerAliasText);
- dbc.bindValue(containerAliasObservable,
- BeanProperties
- .value(ContainerLinkDialogModel.class,
- ContainerLinkDialogModel.CONTAINER_ALIAS)
- .observe(model));
- containerNameObservable.addValueChangeListener(
-onContainerLinkSettingsChanged());
- containerAliasObservable.addValueChangeListener(
-onContainerLinkSettingsChanged());
+ dbc.bindValue(containerAliasObservable, BeanProperties
+ .value(ContainerLinkDialogModel.class, ContainerLinkDialogModel.CONTAINER_ALIAS).observe(model));
+ containerNameObservable.addValueChangeListener(onContainerLinkSettingsChanged());
+ containerAliasObservable.addValueChangeListener(onContainerLinkSettingsChanged());
return container;
}
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerPortDialog.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerPortDialog.java
index 1c3c400fed..1fbfa3d192 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerPortDialog.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerPortDialog.java
@@ -129,34 +129,27 @@ public class ContainerPortDialog extends Dialog {
.span(COLUMNS, 1).grab(true, false).applyTo(errorMessageLabel);
// listening to changes
- final ISWTObservableValue containerPortObservable = WidgetProperties
+ final ISWTObservableValue<?> containerPortObservable = WidgetProperties
.text(SWT.Modify).observe(containerPortText);
dbc.bindValue(containerPortObservable,
BeanProperties
.value(ContainerPortDialogModel.class,
ContainerPortDialogModel.CONTAINER_PORT)
.observe(model));
- final ISWTObservableValue hostAddressObservable = WidgetProperties
+ final ISWTObservableValue<?> hostAddressObservable = WidgetProperties
.text(SWT.Modify).observe(hostAddressText);
dbc.bindValue(hostAddressObservable,
BeanProperties
.value(ContainerPortDialogModel.class,
ContainerPortDialogModel.HOST_ADDRESS)
.observe(model));
- final ISWTObservableValue hostPortObservable = WidgetProperties
- .text(SWT.Modify).observe(hostPortText);
- dbc.bindValue(hostPortObservable,
- BeanProperties
- .value(ContainerPortDialogModel.class,
- ContainerPortDialogModel.HOST_PORT)
- .observe(model));
+ final ISWTObservableValue<?> hostPortObservable = WidgetProperties.text(SWT.Modify).observe(hostPortText);
+ dbc.bindValue(hostPortObservable, BeanProperties
+ .value(ContainerPortDialogModel.class, ContainerPortDialogModel.HOST_PORT).observe(model));
- containerPortObservable.addValueChangeListener(
-onContainerPortSettingsChanged());
- hostPortObservable.addValueChangeListener(
-onContainerPortSettingsChanged());
- hostAddressObservable.addValueChangeListener(
-onContainerPortSettingsChanged());
+ containerPortObservable.addValueChangeListener(onContainerPortSettingsChanged());
+ hostPortObservable.addValueChangeListener(onContainerPortSettingsChanged());
+ hostAddressObservable.addValueChangeListener(onContainerPortSettingsChanged());
return container;
}
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 10c5a0892f..c638fc45b4 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
@@ -21,7 +21,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.IChangeListener;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -127,7 +127,6 @@ public class EditDockerConnectionPage extends WizardPage {
* the parent container (ie, the main container in the preference
* page)
*/
- @SuppressWarnings("unchecked")
private void createConnectionSettingsContainer(final Composite parent) {
final int COLUMNS = 3;
final int INDENT = 20;
@@ -232,32 +231,32 @@ public class EditDockerConnectionPage extends WizardPage {
// observe
final IObservableValue<String> connectionNameModelObservable = BeanProperties
.value(EditDockerConnectionPageModel.class,
- EditDockerConnectionPageModel.CONNECTION_NAME)
+ EditDockerConnectionPageModel.CONNECTION_NAME, String.class)
.observe(model);
final IObservableValue<Boolean> unixSocketBindingModeModelObservable = BeanProperties
.value(EditDockerConnectionPageModel.class,
- EditDockerConnectionPageModel.UNIX_SOCKET_BINDING_MODE)
+ EditDockerConnectionPageModel.UNIX_SOCKET_BINDING_MODE, Boolean.class)
.observe(model);
final IObservableValue<String> unixSocketPathModelObservable = BeanProperties
.value(EditDockerConnectionPageModel.class,
- EditDockerConnectionPageModel.UNIX_SOCKET_PATH)
+ EditDockerConnectionPageModel.UNIX_SOCKET_PATH, String.class)
.observe(model);
final IObservableValue<Boolean> tcpConnectionBindingModeModelObservable = BeanProperties
.value(EditDockerConnectionPageModel.class,
- EditDockerConnectionPageModel.TCP_CONNECTION_BINDING_MODE)
+ EditDockerConnectionPageModel.TCP_CONNECTION_BINDING_MODE, Boolean.class)
.observe(model);
final IObservableValue<String> tcpCertPathModelObservable = BeanProperties
.value(EditDockerConnectionPageModel.class,
- EditDockerConnectionPageModel.TCP_CERT_PATH)
+ EditDockerConnectionPageModel.TCP_CERT_PATH, String.class)
.observe(model);
final IObservableValue<Boolean> tcpTlsVerifyModelObservable = BeanProperties
.value(EditDockerConnectionPageModel.class,
- EditDockerConnectionPageModel.TCP_TLS_VERIFY)
+ EditDockerConnectionPageModel.TCP_TLS_VERIFY, Boolean.class)
.observe(model);
final IObservableValue<String> tcpHostModelObservable = BeanProperties
.value(EditDockerConnectionPageModel.class,
- EditDockerConnectionPageModel.TCP_HOST)
+ EditDockerConnectionPageModel.TCP_HOST, String.class)
.observe(model);
// group controls to easily enable/disable them
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 648d37e091..5ed756fcf8 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
@@ -143,7 +143,7 @@ public class ImageBuildDialog extends Dialog {
WizardMessages.getString("ImageBuildName.toolTip")); //$NON-NLS-1$
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
.grab(true, false).applyTo(repoNameText);
- final ISWTObservableValue connnectionNameObservable = WidgetProperties
+ final ISWTObservableValue<?> connnectionNameObservable = WidgetProperties
.selection().observe(connectionSelectionComboViewer.getCombo());
// pre-select with first connection
if (!connectionNames.isEmpty()) {
@@ -167,7 +167,7 @@ public class ImageBuildDialog extends Dialog {
.value(ImageBuildDialogModel.class,
ImageBuildDialogModel.CONNECTION_NAME)
.observe(model));
- final ISWTObservableValue repoNameObservable = WidgetProperties
+ final ISWTObservableValue<?> repoNameObservable = WidgetProperties
.text(SWT.Modify).observe(repoNameText);
dbc.bindValue(repoNameObservable,
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 18777b563d..5a7bbbc9b4 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
@@ -14,7 +14,7 @@
package org.eclipse.linuxtools.internal.docker.ui.wizards;
import org.eclipse.core.databinding.UpdateValueStrategy;
-import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.databinding.wizard.WizardPageSupport;
@@ -116,10 +116,10 @@ public class ImagePullPage extends ImagePullPushPage<ImagePullPageModel> {
// binding
final IObservableValue<String> imgeNameObservable = BeanProperties
.value(ImagePullPushPageModel.class,
- ImagePullPushPageModel.SELECTED_IMAGE_NAME)
+ ImagePullPushPageModel.SELECTED_IMAGE_NAME, String.class)
.observe(getModel());
dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(imageNameText),
- imgeNameObservable, new UpdateValueStrategy()
+ imgeNameObservable, new UpdateValueStrategy<String, String>()
.setAfterConvertValidator(new ImageNameValidator()),
null);
}
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullPushPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullPushPage.java
index 5be68a1a17..ccb1e2e9a4 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullPushPage.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullPushPage.java
@@ -17,7 +17,7 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
import org.eclipse.jface.layout.GridDataFactory;
@@ -79,7 +79,6 @@ public abstract class ImagePullPushPage<M extends ImagePullPushPageModel>
return this.model;
}
- @SuppressWarnings("unchecked")
IObservableValue<IRegistry> createRegistrySelectionControls(
Composite parent) {
// registry selection
@@ -121,8 +120,7 @@ public abstract class ImagePullPushPage<M extends ImagePullPushPageModel>
getModel().setSelectedRegistry(selectedRegistry);
}
final IObservableValue<IRegistry> registryAccountObservable = BeanProperties
- .value(ImagePushPageModel.class,
- ImagePullPushPageModel.SELECTED_REGISTRY)
+ .value(ImagePullPushPageModel.SELECTED_REGISTRY, IRegistry.class)
.observe(model);
dbc.bindValue(ViewerProperties.singleSelection().observe(
registryAccountComboViewer), registryAccountObservable);
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 dade73063d..16e620e3e3 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
@@ -12,7 +12,7 @@
*******************************************************************************/
package org.eclipse.linuxtools.internal.docker.ui.wizards;
-import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.databinding.wizard.WizardPageSupport;
@@ -87,7 +87,6 @@ public class ImagePushPage extends ImagePullPushPage<ImagePushPageModel> {
}
- @SuppressWarnings("unchecked")
@Override
public void createControl(final Composite parent) {
parent.setLayout(new GridLayout());
@@ -134,7 +133,6 @@ public class ImagePushPage extends ImagePullPushPage<ImagePushPageModel> {
setControl(container);
}
- @SuppressWarnings("unchecked")
private IObservableValue<String> createImageSelectionControls(
final Composite container) {
final Label nameLabel = new Label(container, SWT.NULL);
@@ -155,7 +153,7 @@ public class ImagePushPage extends ImagePullPushPage<ImagePushPageModel> {
// repo/name can be selected.
final IObservableValue<String> imageNameObservable = BeanProperties
.value(ImagePushPageModel.class,
- ImagePullPushPageModel.SELECTED_IMAGE_NAME)
+ ImagePullPushPageModel.SELECTED_IMAGE_NAME, String.class)
.observe(getModel());
dbc.bindValue(WidgetProperties.selection().observe(imageNameCombo),
imageNameObservable);
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 2e86896804..a75bf83b5c 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
@@ -125,7 +125,6 @@ public class ImageRunNetworkPage extends WizardPage {
setControl(scrollTop);
}
- @SuppressWarnings("unchecked")
private void createNetworkModeContainer(final Composite parent) {
final Composite container = new Composite(parent, SWT.NONE);
container.setLayout(new GridLayout());
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 f8071e0224..1c23e1ec68 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
@@ -270,7 +270,7 @@ image);
.grab(false, false).applyTo(memoryLimitValueLabel);
// enable/disable controls
- final IObservableValue enableResourceLimitationsObservable = BeanProperties
+ final IObservableValue<?> enableResourceLimitationsObservable = BeanProperties
.value(ImageRunResourceVolumesVariablesModel.class,
ImageRunResourceVolumesVariablesModel.ENABLE_RESOURCE_LIMITATIONS)
.observe(model);
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 0a446da948..c563b0efda 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
@@ -326,7 +326,7 @@ public class ImageRunSelectionPage extends WizardPage {
.observe(model));
// bind combo with model (for values and selection)
imageSelectionComboViewer
- .setContentProvider(new ObservableListContentProvider());
+ .setContentProvider(new ObservableListContentProvider<>());
dbc.bindList(WidgetProperties.items().observe(imageSelectionCombo),
BeanProperties
.list(ImageRunSelectionModel.class,
@@ -516,7 +516,7 @@ public class ImageRunSelectionPage extends WizardPage {
WizardMessages
.getString("ImageRunSelectionPage.hostPortColumn"), //$NON-NLS-1$
100);
- tableViewer.setContentProvider(new ObservableListContentProvider());
+ tableViewer.setContentProvider(new ObservableListContentProvider<>());
return tableViewer;
}
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 589e76f97c..72cf68c1c5 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
@@ -174,10 +174,10 @@ public class ImageSearchPage extends WizardPage {
.grab(true, true).hint(200, 100)
.applyTo(selectedImageDescription);
// bind the search term
- final IObservableValue observableTermModel = BeanProperties
+ final IObservableValue<?> observableTermModel = BeanProperties
.value(ImageSearchModel.class, ImageSearchModel.TERM)
.observe(model);
- final ISWTObservableValue imageSearchTextObservable = WidgetProperties
+ final ISWTObservableValue<String> imageSearchTextObservable = WidgetProperties
.text(SWT.Modify).observe(searchImageText);
ctx.bindValue(imageSearchTextObservable, observableTermModel,
new UpdateValueStrategy().setBeforeSetValidator(
@@ -185,7 +185,7 @@ public class ImageSearchPage extends WizardPage {
null);
// observe the viewer content
searchResultTableViewer
- .setContentProvider(new ObservableListContentProvider());
+ .setContentProvider(new ObservableListContentProvider<>());
// observe the viewer content
final IObservableList observableSearchResultModel = BeanProperties
.list(ImageSearchModel.class,
@@ -200,7 +200,7 @@ public class ImageSearchPage extends WizardPage {
BeanProperties.value(ImageSearchModel.SELECTED_IMAGE)
.observe(model));
// observe the viewer selection to update the description label
- final IObservableValue observableSelectedImageDescription = PojoProperties
+ final IObservableValue<String> observableSelectedImageDescription = PojoProperties
.value("description", String.class) // $NON-NLS-1$
.observeDetail(ViewerProperties.singleSelection()
.observe(searchResultTableViewer));
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageTagSelectionPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageTagSelectionPage.java
index 6d965dff57..7d388ca353 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageTagSelectionPage.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageTagSelectionPage.java
@@ -176,7 +176,6 @@ public class ImageTagSelectionPage extends WizardPage {
super.dispose();
}
- @SuppressWarnings("unchecked")
@Override
public void createControl(final Composite parent) {
final int COLUMNS = 1;
@@ -207,7 +206,7 @@ public class ImageTagSelectionPage extends WizardPage {
WizardMessages
.getString("ImageTagSelectionPage.column.localcopy"), //$NON-NLS-1$
SWT.NONE, SWT.LEFT, 75, new ImagePulledColumnLabelProvider());
- tableViewer.setContentProvider(new ObservableListContentProvider());
+ tableViewer.setContentProvider(new ObservableListContentProvider<>());
// observe the viewer content
final IObservableList<?> observableSearchResultModel = BeanProperties
.list(ImageSearchModel.class,
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 efe8363e8b..4cc37e2cba 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
@@ -26,7 +26,7 @@ import java.util.StringTokenizer;
import java.util.stream.Collectors;
import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.IChangeListener;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -293,46 +293,38 @@ public class NewDockerConnectionPage extends WizardPage {
.addSelectionListener(onTestConnectionButtonSelection());
// observe
- @SuppressWarnings("unchecked")
final IObservableValue<String> connectionNameModelObservable = BeanProperties
.value(NewDockerConnectionPageModel.class,
- NewDockerConnectionPageModel.CONNECTION_NAME)
+ NewDockerConnectionPageModel.CONNECTION_NAME, String.class)
.observe(model);
- @SuppressWarnings("unchecked")
final IObservableValue<Boolean> unixSocketBindingModeModelObservable = BeanProperties
.value(NewDockerConnectionPageModel.class,
- NewDockerConnectionPageModel.UNIX_SOCKET_BINDING_MODE)
+ NewDockerConnectionPageModel.UNIX_SOCKET_BINDING_MODE, Boolean.class)
.observe(model);
- @SuppressWarnings("unchecked")
final IObservableValue<String> unixSocketPathModelObservable = BeanProperties
.value(NewDockerConnectionPageModel.class,
- NewDockerConnectionPageModel.UNIX_SOCKET_PATH)
+ NewDockerConnectionPageModel.UNIX_SOCKET_PATH, String.class)
.observe(model);
- @SuppressWarnings("unchecked")
final IObservableValue<Boolean> customConnectionSettingsModelObservable = BeanProperties
.value(NewDockerConnectionPageModel.class,
- NewDockerConnectionPageModel.CUSTOM_SETTINGS)
+ NewDockerConnectionPageModel.CUSTOM_SETTINGS, Boolean.class)
.observe(model);
- @SuppressWarnings("unchecked")
final IObservableValue<Boolean> tcpConnectionBindingModeModelObservable = BeanProperties
.value(NewDockerConnectionPageModel.class,
- NewDockerConnectionPageModel.TCP_CONNECTION_BINDING_MODE)
+ NewDockerConnectionPageModel.TCP_CONNECTION_BINDING_MODE, Boolean.class)
.observe(model);
- @SuppressWarnings("unchecked")
final IObservableValue<String> tcpCertPathModelObservable = BeanProperties
.value(NewDockerConnectionPageModel.class,
- NewDockerConnectionPageModel.TCP_CERT_PATH)
+ NewDockerConnectionPageModel.TCP_CERT_PATH, String.class)
.observe(model);
- @SuppressWarnings("unchecked")
final IObservableValue<Boolean> tcpTlsVerifyModelObservable = BeanProperties
.value(NewDockerConnectionPageModel.class,
- NewDockerConnectionPageModel.TCP_TLS_VERIFY)
+ NewDockerConnectionPageModel.TCP_TLS_VERIFY, Boolean.class)
.observe(model);
- @SuppressWarnings("unchecked")
final IObservableValue<String> tcpHostModelObservable = BeanProperties
.value(NewDockerConnectionPageModel.class,
- NewDockerConnectionPageModel.TCP_HOST)
+ NewDockerConnectionPageModel.TCP_HOST, String.class)
.observe(model);
// group controls to easily enable/disable them
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 a4b36d7f08..97c4ecd671 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
@@ -15,7 +15,7 @@ package org.eclipse.linuxtools.internal.vagrant.ui.wizards;
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.UpdateValueStrategy;
-import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.list.WritableList;
@@ -91,7 +91,8 @@ public class AddBoxPage extends WizardPage {
WizardMessages.getString("ImagePull.name.tooltip")); //$NON-NLS-1$
// Name binding
final IObservableValue<String> boxNameObservable = BeanProperties
- .value(AddBoxPageModel.class, AddBoxPageModel.BOX_NAME)
+ .value(AddBoxPageModel.class, AddBoxPageModel.BOX_NAME,
+ String.class)
.observe(model);
dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(boxNameText),
boxNameObservable, new UpdateValueStrategy<>(), null);
@@ -110,7 +111,8 @@ public class AddBoxPage extends WizardPage {
WizardMessages.getString("ImagePull.loc.tooltip")); //$NON-NLS-1$
// Location binding
final IObservableValue<String> imageNameObservable = BeanProperties
- .value(AddBoxPageModel.class, AddBoxPageModel.BOX_LOC)
+ .value(AddBoxPageModel.class, AddBoxPageModel.BOX_LOC,
+ String.class)
.observe(model);
dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(boxLocText),
imageNameObservable, new UpdateValueStrategy<>(), null);
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/CreateVMPage.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/CreateVMPage.java
index 2a70be8201..a9d217e80b 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/CreateVMPage.java
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/wizards/CreateVMPage.java
@@ -17,7 +17,7 @@ import java.nio.file.Paths;
import java.util.Map;
import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.list.WritableList;
@@ -110,7 +110,8 @@ public class CreateVMPage extends WizardPage {
WizardMessages.getString("CreateVMPage.name.tooltip")); //$NON-NLS-1$
// VM Name binding
final IObservableValue<String> vmmNameObservable = BeanProperties
- .value(CreateVMPageModel.class, CreateVMPageModel.VM_NAME)
+ .value(CreateVMPageModel.class, CreateVMPageModel.VM_NAME,
+ String.class)
.observe(model);
dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(vmNameText),
vmmNameObservable);
@@ -129,7 +130,8 @@ public class CreateVMPage extends WizardPage {
WizardMessages.getString("CreateVMPage.boxRef.tooltip")); //$NON-NLS-1$
// Box Name binding
final IObservableValue<String> boxRefObservable = BeanProperties
- .value(CreateVMPageModel.class, CreateVMPageModel.BOX_REF)
+ .value(CreateVMPageModel.class, CreateVMPageModel.BOX_REF,
+ String.class)
.observe(model);
dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(boxRefText),
boxRefObservable);
@@ -149,7 +151,8 @@ public class CreateVMPage extends WizardPage {
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
.grab(false, false).span(3, 1).applyTo(customVMFileButton);
final IObservableValue<String> customVMFileObservable = BeanProperties
- .value(CreateVMPageModel.class, CreateVMPageModel.V_FILE_MODE)
+ .value(CreateVMPageModel.class, CreateVMPageModel.V_FILE_MODE,
+ String.class)
.observe(model);
dbc.bindValue(WidgetProperties.selection().observe(customVMFileButton),
customVMFileObservable);
@@ -169,7 +172,8 @@ public class CreateVMPage extends WizardPage {
boxLocText.setEnabled(false);
// Location binding
final IObservableValue<String> boxLocObservable = BeanProperties
- .value(CreateVMPageModel.class, CreateVMPageModel.VM_FILE)
+ .value(CreateVMPageModel.class, CreateVMPageModel.VM_FILE,
+ String.class)
.observe(model);
dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(boxLocText),
boxLocObservable);
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 c04482cdfd..585d4e89dc 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
@@ -17,7 +17,7 @@ import java.nio.file.Paths;
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.UpdateValueStrategy;
-import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.list.WritableList;
@@ -95,7 +95,8 @@ public class PackageVMPage extends WizardPage {
WizardMessages.getString("ImagePull.name.tooltip")); //$NON-NLS-1$
// Name binding
final IObservableValue<String> boxNameObservable = BeanProperties
- .value(PackageVMPageModel.class, PackageVMPageModel.BOX_NAME)
+ .value(PackageVMPageModel.class, PackageVMPageModel.BOX_NAME,
+ String.class)
.observe(model);
dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(boxNameText),
boxNameObservable, new UpdateValueStrategy<>(), null);
@@ -113,7 +114,8 @@ public class PackageVMPage extends WizardPage {
WizardMessages.getString("PackageVMPage.folder.desc")); //$NON-NLS-1$
// Folder binding
final IObservableValue<String> boxFolderObservable = BeanProperties
- .value(PackageVMPageModel.class, PackageVMPageModel.BOX_FOLDER)
+ .value(PackageVMPageModel.class, PackageVMPageModel.BOX_FOLDER,
+ String.class)
.observe(model);
dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(boxFolderText),
boxFolderObservable, new UpdateValueStrategy<>(), null);

Back to the top