mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

Use generified databindings API.

Browse source 
Change-Id: I247759650ce37cc01f585b3675f848d8b209abbc
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
This commit is contained in:
Alexander Kurtakov 2019-10-11 00:59:19 +03:00
parent 7cd94f8f91
commit 4477ea013a
4 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerDataVolumeDialog.java
View file

@ -23,13 +23,13 @@ import org.eclipse.cdt.internal.docker.launcher.ContainerPropertyVolumesModel.Mo
import org.eclipse.core.databinding.Binding; import org.eclipse.core.databinding.Binding;
import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.UpdateValueStrategy; 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.IChangeListener; import org.eclipse.core.databinding.observable.IChangeListener;
import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.validation.ValidationStatus; import org.eclipse.core.databinding.validation.ValidationStatus;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.databinding.swt.ISWTObservableValue; import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.jface.databinding.swt.WidgetProperties; import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.fieldassist.ComboContentAdapter; import org.eclipse.jface.fieldassist.ComboContentAdapter;
@ -173,7 +173,8 @@ public class ContainerDataVolumeDialog extends Dialog {
readOnlyButton.setToolTipText(WizardMessages.getString("ContainerDataVolumeDialog.readOnlyButtonTooltip")); //$NON-NLS-1$ readOnlyButton.setToolTipText(WizardMessages.getString("ContainerDataVolumeDialog.readOnlyButtonTooltip")); //$NON-NLS-1$
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).span(COLUMNS - 2, 1).grab(true, false) GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).span(COLUMNS - 2, 1).grab(true, false)
.applyTo(readOnlyButton); .applyTo(readOnlyButton);
final ISWTObservableValue readOnlyButtonObservable = WidgetProperties.selection().observe(readOnlyButton); final ISWTObservableValue<Boolean> readOnlyButtonObservable = WidgetProperties.buttonSelection()
.observe(readOnlyButton);
dbc.bindValue(readOnlyButtonObservable, dbc.bindValue(readOnlyButtonObservable,
BeanProperties.value(DataVolumeModel.class, DataVolumeModel.READ_ONLY_VOLUME).observe(model)); BeanProperties.value(DataVolumeModel.class, DataVolumeModel.READ_ONLY_VOLUME).observe(model));
// browse for file // browse for file
@ -205,7 +206,7 @@ public class ContainerDataVolumeDialog extends Dialog {
containerSelectionComboViewer.setInput(this.containerNames); containerSelectionComboViewer.setInput(this.containerNames);
final IObservableValue selectedContainerObservable = BeanProperties final IObservableValue selectedContainerObservable = BeanProperties
.value(DataVolumeModel.class, DataVolumeModel.CONTAINER_MOUNT).observe(model); .value(DataVolumeModel.class, DataVolumeModel.CONTAINER_MOUNT).observe(model);
dbc.bindValue(WidgetProperties.selection().observe(containerSelectionCombo), selectedContainerObservable); dbc.bindValue(WidgetProperties.comboSelection().observe(containerSelectionCombo), selectedContainerObservable);
new ContentProposalAdapter(containerSelectionCombo, new ComboContentAdapter() { new ContentProposalAdapter(containerSelectionCombo, new ComboContentAdapter() {
@Override @Override
public void insertControlContents(Control control, String text, int cursorPosition) { public void insertControlContents(Control control, String text, int cursorPosition) {
@ -255,7 +256,7 @@ public class ContainerDataVolumeDialog extends Dialog {
* @return * @return
*/ */
private Binding bindButton(final Button button, final MountType mountType, final Control... controls) { private Binding bindButton(final Button button, final MountType mountType, final Control... controls) {
return dbc.bindValue(WidgetProperties.selection().observe(button), return dbc.bindValue(WidgetProperties.buttonSelection().observe(button),
BeanProperties.value(DataVolumeModel.class, DataVolumeModel.MOUNT_TYPE).observe(model), BeanProperties.value(DataVolumeModel.class, DataVolumeModel.MOUNT_TYPE).observe(model),
new UpdateValueStrategy() { new UpdateValueStrategy() {
@Override @Override

14
launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPortDialog.java
View file

@ -15,10 +15,10 @@
package org.eclipse.cdt.internal.docker.launcher; package org.eclipse.cdt.internal.docker.launcher;
import org.eclipse.core.databinding.DataBindingContext; 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.IValueChangeListener; import org.eclipse.core.databinding.observable.value.IValueChangeListener;
import org.eclipse.jface.databinding.swt.ISWTObservableValue; import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.jface.databinding.swt.WidgetProperties; import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridDataFactory;
@ -79,7 +79,6 @@ public class ContainerPortDialog extends Dialog {
return new Point(400, super.getInitialSize().y); return new Point(400, super.getInitialSize().y);
} }
@SuppressWarnings("unchecked")
@Override @Override
protected Control createDialogArea(Composite parent) { protected Control createDialogArea(Composite parent) {
final int COLUMNS = 2; final int COLUMNS = 2;
@ -111,14 +110,15 @@ public class ContainerPortDialog extends Dialog {
.applyTo(errorMessageLabel); .applyTo(errorMessageLabel);
// listening to changes // listening to changes
final ISWTObservableValue containerPortObservable = WidgetProperties.text(SWT.Modify) final ISWTObservableValue<String> containerPortObservable = WidgetProperties.text(SWT.Modify)
.observe(containerPortText); .observe(containerPortText);
dbc.bindValue(containerPortObservable, BeanProperties dbc.bindValue(containerPortObservable, BeanProperties
.value(ContainerPortDialogModel.class, ContainerPortDialogModel.CONTAINER_PORT).observe(model)); .value(ContainerPortDialogModel.class, ContainerPortDialogModel.CONTAINER_PORT).observe(model));
final ISWTObservableValue hostAddressObservable = WidgetProperties.text(SWT.Modify).observe(hostAddressText); final ISWTObservableValue<String> hostAddressObservable = WidgetProperties.text(SWT.Modify)
.observe(hostAddressText);
dbc.bindValue(hostAddressObservable, BeanProperties dbc.bindValue(hostAddressObservable, BeanProperties
.value(ContainerPortDialogModel.class, ContainerPortDialogModel.HOST_ADDRESS).observe(model)); .value(ContainerPortDialogModel.class, ContainerPortDialogModel.HOST_ADDRESS).observe(model));
final ISWTObservableValue hostPortObservable = WidgetProperties.text(SWT.Modify).observe(hostPortText); final ISWTObservableValue<String> hostPortObservable = WidgetProperties.text(SWT.Modify).observe(hostPortText);
dbc.bindValue(hostPortObservable, BeanProperties dbc.bindValue(hostPortObservable, BeanProperties
.value(ContainerPortDialogModel.class, ContainerPortDialogModel.HOST_PORT).observe(model)); .value(ContainerPortDialogModel.class, ContainerPortDialogModel.HOST_PORT).observe(model));
@ -128,7 +128,7 @@ public class ContainerPortDialog extends Dialog {
return container; return container;
} }
private IValueChangeListener<?> onContainerPortSettingsChanged() { private IValueChangeListener<String> onContainerPortSettingsChanged() {
return event -> validateInput(); return event -> validateInput();
} }

2
launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyTab.java
View file

@ -41,8 +41,8 @@ import org.eclipse.cdt.managedbuilder.internal.core.Configuration;
import org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector; import org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector;
import org.eclipse.cdt.managedbuilder.ui.properties.AbstractCBuildPropertyTab; import org.eclipse.cdt.managedbuilder.ui.properties.AbstractCBuildPropertyTab;
import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.beans.IBeanValueProperty; import org.eclipse.core.databinding.beans.IBeanValueProperty;
import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.list.IObservableList; import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.map.IObservableMap; import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.core.databinding.property.Properties; import org.eclipse.core.databinding.property.Properties;

2
launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java
View file

@ -21,7 +21,7 @@ import java.util.Iterator;
import org.eclipse.cdt.docker.launcher.DockerLaunchUIPlugin; import org.eclipse.cdt.docker.launcher.DockerLaunchUIPlugin;
import org.eclipse.core.databinding.DataBindingContext; 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.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfiguration;