Bug 550254 - Rename layoutData method
And give it a wildcard. To make it less error prone because of
the overload with an Object parameter.
Change-Id: Iec4f5db5472c5482061ae613d6fc5c3c34b5ecfe
Signed-off-by: Jens Lidestrom <jens@lidestrom.se>
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/AbstractControlFactory.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/AbstractControlFactory.java
index 2c65f3a..14ad411 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/AbstractControlFactory.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/AbstractControlFactory.java
@@ -70,20 +70,20 @@
*
* <pre>
* GridDataFactory gridDataFactory = GridDataFactory.fillDefaults().grab(true, false);
- * ButtonFactory.newButton(SWT.PUSH).layoutData(gridDataFactory::create);
+ * ButtonFactory.newButton(SWT.PUSH).supplyLayoutData(gridDataFactory::create);
* </pre>
*
* or without GridDataFactory:
*
* <pre>
- * ButtonFactory.newButton(SWT.PUSH).layoutData(() -> new GridData());
+ * ButtonFactory.newButton(SWT.PUSH).supplyLayoutData(GridData::new);
* </pre>
*
* @param layoutDataSupplier {@link Supplier} creating a new layout data
* instance
* @return this
*/
- public F layoutData(Supplier<Object> layoutDataSupplier) {
+ public F supplyLayoutData(Supplier<?> layoutDataSupplier) {
addProperty(c -> c.setLayoutData(layoutDataSupplier.get()));
return cast(this);
}
diff --git a/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/dialogs/UriSchemeHandlerPreferencePage.java b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/dialogs/UriSchemeHandlerPreferencePage.java
index 772c350..f7eb992 100644
--- a/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/dialogs/UriSchemeHandlerPreferencePage.java
+++ b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/dialogs/UriSchemeHandlerPreferencePage.java
@@ -142,7 +142,7 @@
gd.horizontalSpan = 2;
gd.heightHint = pixelConverter.convertHeightInCharsToPixels(1) / 2;
- WidgetFactory.label(SWT.LEFT).layoutData(() -> gd).create(composite);
+ WidgetFactory.label(SWT.LEFT).layoutData(gd).create(composite);
}
private void createTableViewerForSchemes(Composite parent) {
@@ -201,7 +201,7 @@
WidgetFactory.label(SWT.NONE).text(UrlHandlerPreferencePage_Handler_Label).create(handlerComposite);
handlerLocation = WidgetFactory.text(SWT.READ_ONLY | SWT.BORDER)
- .layoutData(() -> new GridData(SWT.FILL, SWT.CENTER, true, false)).create(handlerComposite);
+ .layoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)).create(handlerComposite);
handlerComposite.setVisible(false); // set visible on table selection
}
diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/widgets/TestUnitControlFactory.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/widgets/TestUnitControlFactory.java
index 5bc0da9..dfb3392 100644
--- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/widgets/TestUnitControlFactory.java
+++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/widgets/TestUnitControlFactory.java
@@ -77,7 +77,7 @@
@Test
public void testUniqueLayoutData() {
GridDataFactory gridDataFactory = GridDataFactory.fillDefaults().grab(true, false);
- LabelFactory factory = LabelFactory.newLabel(SWT.NONE).layoutData(gridDataFactory::create);
+ LabelFactory factory = LabelFactory.newLabel(SWT.NONE).supplyLayoutData(gridDataFactory::create);
Label label = factory.create(shell);
Label label2 = factory.create(shell);
