Bug 546975 - Rename selection to widgetSelection

Rename WidgetProperties.selection to widgetSelection
to indicate to users that this is not the standard
property. The standard properties are the widget
specific once: buttonSelection, comboSelection, etc.

Change-Id: I8ea876b5ff9827fe1f104cc1f5c392c383ce0048
Signed-off-by: Jens Lidestrom <jens@lidestrom.se>

13 files changed, 16 insertions, 16 deletions

diff --git a/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/swt/SWTObservables.java b/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/swt/SWTObservables.java
index 0f623a698f5..0423c3b3343 100644
--- a/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/swt/SWTObservables.java
+++ b/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/swt/SWTObservables.java
@@ -212,7 +212,7 @@ public class SWTObservables {
 	 */
 	@Deprecated
 	public static ISWTObservableValue observeSelection(Widget widget) {
-		return WidgetProperties.selection().observe(widget);
+		return WidgetProperties.widgetSelection().observe(widget);
 	}
 
 	/**
diff --git a/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/swt/typed/WidgetProperties.java b/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/swt/typed/WidgetProperties.java
index f2782f544fe..720b830ab0a 100644
--- a/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/swt/typed/WidgetProperties.java
+++ b/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/swt/typed/WidgetProperties.java
@@ -248,7 +248,7 @@ public class WidgetProperties {
 	 *         {@link List}, {@link MenuItem}, {@link Scale}, {@link Slider} or
 	 *         {@link Spinner}.
 	 */
-	public static <S extends Widget, T> IWidgetValueProperty<S, T> selection() {
+	public static <S extends Widget, T> IWidgetValueProperty<S, T> widgetSelection() {
 		return new WidgetSelectionProperty<>();
 	}
 
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/swt/WidgetPropertiesTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/swt/WidgetPropertiesTest.java
index ac49eec34f3..c917df2e7cc 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/swt/WidgetPropertiesTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/swt/WidgetPropertiesTest.java
@@ -271,8 +271,8 @@ public class WidgetPropertiesTest extends AbstractSWTTestCase {
 	public void testSelection_ObserveMenuItem() {
 		Menu menu = new Menu(shell, SWT.BAR);
 		MenuItem item = new MenuItem(menu, SWT.CHECK);
-		IWidgetValueProperty<MenuItem, Object> prop = WidgetProperties.selection();
-		IObservableValue<Object> observable = prop.observe(item);
+		IWidgetValueProperty<MenuItem, Boolean> prop = WidgetProperties.menuItemSelection();
+		IObservableValue<Boolean> observable = prop.observe(item);
 
 		assertEquals(boolean.class, observable.getValueType());
 
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/ButtonObservableValueTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/ButtonObservableValueTest.java
index e1588854e4c..c23fa2ee20b 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/ButtonObservableValueTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/ButtonObservableValueTest.java
@@ -42,7 +42,7 @@ import junit.framework.TestSuite;
  */
 public class ButtonObservableValueTest extends AbstractSWTTestCase {
 	private Button button;
-	private ISWTObservableValue<Object> observableValue;
+	private ISWTObservableValue<Boolean> observableValue;
 	private ValueChangeEventTracker<Object> listener;
 
 	@Override
@@ -52,7 +52,7 @@ public class ButtonObservableValueTest extends AbstractSWTTestCase {
 
 		Shell shell = getShell();
 		button = new Button(shell, SWT.CHECK);
-		observableValue = WidgetProperties.selection().observe(button);
+		observableValue = WidgetProperties.buttonSelection().observe(button);
 		listener = new ValueChangeEventTracker<>();
 	}
 
@@ -143,7 +143,7 @@ public class ButtonObservableValueTest extends AbstractSWTTestCase {
 
 		@Override
 		public IObservableValue<Object> createObservableValue(Realm realm) {
-			return WidgetProperties.selection().observe(realm, button);
+			return WidgetProperties.widgetSelection().observe(realm, button);
 		}
 
 		@Override
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/CComboObservableValueSelectionTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/CComboObservableValueSelectionTest.java
index 3df47b7ad60..1115e817cb1 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/CComboObservableValueSelectionTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/CComboObservableValueSelectionTest.java
@@ -93,7 +93,7 @@ public class CComboObservableValueSelectionTest {
 
 		@Override
 		public IObservableValue<Object> createObservableValue(Realm realm) {
-			return WidgetProperties.selection().observe(realm, combo);
+			return WidgetProperties.widgetSelection().observe(realm, combo);
 		}
 
 		@Override
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/CComboObservableValueTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/CComboObservableValueTest.java
index 658b8f4cf47..57bf9a44f04 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/CComboObservableValueTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/CComboObservableValueTest.java
@@ -65,7 +65,7 @@ public class CComboObservableValueTest extends AbstractSWTTestCase {
 	@Test
 	public void testSetValueWithNull() {
 		testSetValueWithNull(WidgetProperties.text());
-		testSetValueWithNull(WidgetProperties.selection());
+		testSetValueWithNull(WidgetProperties.widgetSelection());
 	}
 
 	protected void testSetValueWithNull(IValueProperty property) {
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/ComboObservableValueSelectionTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/ComboObservableValueSelectionTest.java
index 12320d20a2e..aa9bbb3cbb7 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/ComboObservableValueSelectionTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/ComboObservableValueSelectionTest.java
@@ -95,7 +95,7 @@ public class ComboObservableValueSelectionTest {
 
 		@Override
 		public IObservableValue createObservableValue(Realm realm) {
-			return WidgetProperties.selection().observe(realm, combo);
+			return WidgetProperties.comboSelection().observe(realm, combo);
 		}
 
 		@Override
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/ComboObservableValueTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/ComboObservableValueTest.java
index 927ed142b7e..bc62a9b2e87 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/ComboObservableValueTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/ComboObservableValueTest.java
@@ -65,7 +65,7 @@ public class ComboObservableValueTest extends AbstractSWTTestCase {
 	@Test
 	public void testSetValueWithNull() {
 		testSetValueWithNull(WidgetProperties.text());
-		testSetValueWithNull(WidgetProperties.selection());
+		testSetValueWithNull(WidgetProperties.widgetSelection());
 	}
 
 	protected void testSetValueWithNull(IValueProperty property) {
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/DateTimeCalendarObservableValueTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/DateTimeCalendarObservableValueTest.java
index 4777dd60d97..ad13d43b005 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/DateTimeCalendarObservableValueTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/DateTimeCalendarObservableValueTest.java
@@ -44,7 +44,7 @@ public class DateTimeCalendarObservableValueTest extends AbstractSWTTestCase {
 	public void setUp() throws Exception {
 		super.setUp();
 		dateTime = new DateTime(getShell(), SWT.CALENDAR);
-		dateObservable = WidgetProperties.selection().observe(dateTime);
+		dateObservable = WidgetProperties.dateTimeSelection().observe(dateTime);
 	}
 
 	@Test
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/DateTimeDateObservableValueTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/DateTimeDateObservableValueTest.java
index cdd13c377aa..ad039981aa3 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/DateTimeDateObservableValueTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/DateTimeDateObservableValueTest.java
@@ -44,7 +44,7 @@ public class DateTimeDateObservableValueTest extends AbstractSWTTestCase {
 	public void setUp() throws Exception {
 		super.setUp();
 		dateTime = new DateTime(getShell(), SWT.DATE);
-		dateObservable = WidgetProperties.selection().observe(dateTime);
+		dateObservable = WidgetProperties.dateTimeSelection().observe(dateTime);
 	}
 
 	@Test
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/DateTimeTimeObservableValueTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/DateTimeTimeObservableValueTest.java
index 90c176343a6..cab6bb48534 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/DateTimeTimeObservableValueTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/DateTimeTimeObservableValueTest.java
@@ -44,7 +44,7 @@ public class DateTimeTimeObservableValueTest extends AbstractSWTTestCase {
 	public void setUp() throws Exception {
 		super.setUp();
 		dateTime = new DateTime(getShell(), SWT.TIME);
-		dateObservable = WidgetProperties.selection().observe(dateTime);
+		dateObservable = WidgetProperties.dateTimeSelection().observe(dateTime);
 	}
 
 	@Test
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/ScaleObservableValueSelectionTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/ScaleObservableValueSelectionTest.java
index cec9d528301..949222b50e8 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/ScaleObservableValueSelectionTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/ScaleObservableValueSelectionTest.java
@@ -104,7 +104,7 @@ public class ScaleObservableValueSelectionTest extends ObservableDelegateTest {
 
 		@Override
 		public IObservableValue createObservableValue(Realm realm) {
-			return WidgetProperties.selection().observe(realm, scale);
+			return WidgetProperties.scaleSelection().observe(realm, scale);
 		}
 
 		@Override
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/SpinnerObservableValueSelectionTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/SpinnerObservableValueSelectionTest.java
index 655c653efb2..9aaf169ab30 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/SpinnerObservableValueSelectionTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/SpinnerObservableValueSelectionTest.java
@@ -104,7 +104,7 @@ public class SpinnerObservableValueSelectionTest extends ObservableDelegateTest
 
 		@Override
 		public IObservableValue createObservableValue(Realm realm) {
-			return WidgetProperties.selection().observe(realm, spinner);
+			return WidgetProperties.spinnerSelection().observe(realm, spinner);
 		}
 
 		@Override