Skip to content

Commit

Permalink
Update swt.tests after API removal/change, fixes #2183
Browse files Browse the repository at this point in the history
Signed-off-by: Ondrej Dockal <odockal@redhat.com>
  • Loading branch information
odockal committed Oct 26, 2022
1 parent a5a8926 commit d0c251b
Showing 1 changed file with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@
import java.beans.PropertyChangeSupport;

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.ChangeEvent;
import org.eclipse.core.databinding.observable.IChangeListener;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.observable.value.SelectObservableValue;
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.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.reddeer.swt.api.Text;
import org.eclipse.reddeer.swt.impl.button.RadioButton;
import org.eclipse.reddeer.swt.impl.text.LabeledText;
import org.eclipse.reddeer.swt.test.SWTLayerTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.junit.Test;

/**
Expand Down Expand Up @@ -77,7 +77,7 @@ protected void createControls(Shell shell) {
org.eclipse.swt.widgets.Button buttonA = new org.eclipse.swt.widgets.Button(group, SWT.RADIO);
buttonA.setText(RADIO_BUTTON_LABEL_PREFIX + "A");
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).span(COLUMNS, 1).applyTo(buttonA);
selectedRadioButtonObservable.addOption("Selected: " + "A", WidgetProperties.selection().observe(buttonA));
selectedRadioButtonObservable.addOption("Selected: " + "A", WidgetProperties.buttonSelection().observe(buttonA));
org.eclipse.swt.widgets.Label labelA = new org.eclipse.swt.widgets.Label(group, SWT.NONE);
labelA.setText("Label " + "A");
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).indent(INDENT, 0).applyTo(labelA);
Expand All @@ -89,7 +89,7 @@ protected void createControls(Shell shell) {
org.eclipse.swt.widgets.Button buttonB = new org.eclipse.swt.widgets.Button(group, SWT.RADIO);
buttonB.setText(RADIO_BUTTON_LABEL_PREFIX + "B");
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).span(COLUMNS, 1).applyTo(buttonB);
selectedRadioButtonObservable.addOption("Selected: " + "B", WidgetProperties.selection().observe(buttonB));
selectedRadioButtonObservable.addOption("Selected: " + "B", WidgetProperties.buttonSelection().observe(buttonB));
org.eclipse.swt.widgets.Label labelB = new org.eclipse.swt.widgets.Label(group, SWT.NONE);
labelB.setText("Label " + "B");
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).indent(INDENT, 0).applyTo(labelB);
Expand All @@ -101,7 +101,7 @@ protected void createControls(Shell shell) {
org.eclipse.swt.widgets.Button buttonC = new org.eclipse.swt.widgets.Button(group, SWT.RADIO);
buttonC.setText(RADIO_BUTTON_LABEL_PREFIX + "C");
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).span(COLUMNS, 1).applyTo(buttonC);
selectedRadioButtonObservable.addOption("Selected: " + "C", WidgetProperties.selection().observe(buttonC));
selectedRadioButtonObservable.addOption("Selected: " + "C", WidgetProperties.buttonSelection().observe(buttonC));
org.eclipse.swt.widgets.Label labelC = new org.eclipse.swt.widgets.Label(group, SWT.NONE);
labelC.setText("Label " + "C");
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).indent(INDENT, 0).applyTo(labelC);
Expand Down Expand Up @@ -137,11 +137,11 @@ protected void createControls(Shell shell) {
buttonCModeModelObservable.addChangeListener(onButtonCSelection(buttonCControls));

// bindings
dbc.bindValue(WidgetProperties.selection().observe(buttonA), buttonAModeModelObservable);
dbc.bindValue(WidgetProperties.buttonSelection().observe(buttonA), buttonAModeModelObservable);
dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(textA), buttonATextModelObservable);
dbc.bindValue(WidgetProperties.selection().observe(buttonB), buttonBModeModelObservable);
dbc.bindValue(WidgetProperties.buttonSelection().observe(buttonB), buttonBModeModelObservable);
dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(textB), buttonBTextModelObservable);
dbc.bindValue(WidgetProperties.selection().observe(buttonC), buttonCModeModelObservable);
dbc.bindValue(WidgetProperties.buttonSelection().observe(buttonC), buttonCModeModelObservable);
dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(textC), buttonCTextModelObservable);

//shows selected radio button
Expand Down

0 comments on commit d0c251b

Please sign in to comment.