remove use of deprecated APIs

refs #92
eclipse-efx · Feb 20, 2023 · 9a01848 · 9a01848
1 parent d2524a5
commit 9a01848
Show file tree

Hide file tree

Showing 22 changed files with 107 additions and 91 deletions.
diff --git a/...or.ldef/.launch/Generate Language Infrastructure (org.eclipse.fx.code.editor.ldef).launch b/...or.ldef/.launch/Generate Language Infrastructure (org.eclipse.fx.code.editor.ldef).launch
@@ -1,18 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1299248699643_13&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.fx.code.editor.ldef&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.fx.code.editor.ldef.generator&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.fx.code.editor.ldef.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.fx.code.editor.ldef.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.fx.code.editor.ldef"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/fx/code/editor/ldef/GenerateLDef.mwe2"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.fx.code.editor.ldef"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
+    <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.fx.code.editor.ldef&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.fx.code.editor.ldef.generator&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.fx.code.editor.ldef.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.fx.code.editor.ldef.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+        <listEntry value="/org.eclipse.fx.code.editor.ldef"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+        <listEntry value="4"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+    </listAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JRE [17.0.1]/"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.eclipse.fx.code.editor.ldef"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/fx/code/editor/ldef/GenerateLDef.mwe2"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.fx.code.editor.ldef"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
 </launchConfiguration>
diff --git a/bundles/tooling/org.eclipse.fx.code.editor.ldef/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.code.editor.ldef/META-INF/MANIFEST.MF
@@ -5,13 +5,14 @@ Bundle-Vendor: Eclipse.org
 Bundle-Version: 3.9.0.qualifier
 Bundle-SymbolicName: org.eclipse.fx.code.editor.ldef; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext;visibility:=reexport,
+Require-Bundle: org.antlr.runtime,
+ org.eclipse.emf.common,
+ org.eclipse.emf.ecore,
  org.eclipse.equinox.common;bundle-version="3.6.0",
+ org.eclipse.xtend.lib;bundle-version="2.29.0",
+ org.eclipse.xtext;visibility:=reexport,
  org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
  org.eclipse.xtext.xbase.lib,
- org.antlr.runtime,
  org.eclipse.xtext.common.types,
  org.objectweb.asm;bundle-version="[5.0.1,8.0.0)";resolution:=optional,
  org.eclipse.fx.code.editor.configuration;bundle-version="2.3.0"

diff --git a/bundles/tooling/org.eclipse.fx.code.editor.ldef/build.properties b/bundles/tooling/org.eclipse.fx.code.editor.ldef/build.properties
@@ -19,10 +19,10 @@ bin.includes = model/,\
                plugin.xml,\
                about.html
 additional.bundles = org.eclipse.xtext.xbase,\
-                     org.eclipse.xtext.generator,\
                      org.apache.commons.logging,\
                      org.eclipse.emf.codegen.ecore,\
                      org.eclipse.emf.mwe.utils,\
                      org.eclipse.emf.mwe2.launch,\
                      org.eclipse.xtext.common.types,\
-                     org.objectweb.asm
+                     org.objectweb.asm,\
+                     org.eclipse.xtext.xtext.generator
diff --git a/...ipse.fx.ide.css.cssext.ui/src/org/eclipse/fx/ide/css/cssext/ui/CSSEditorPropertyPage.java b/...ipse.fx.ide.css.cssext.ui/src/org/eclipse/fx/ide/css/cssext/ui/CSSEditorPropertyPage.java
@@ -17,7 +17,7 @@
 import java.util.List;
 
 import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeansObservables;
+import org.eclipse.core.databinding.beans.typed.BeanProperties;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.IValueChangeListener;
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
@@ -38,7 +38,7 @@
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.databinding.swt.ISWTObservableValue;
-import org.eclipse.jface.databinding.swt.SWTObservables;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -92,14 +92,14 @@ protected Control createContents(Composite parent) {
 
 		final Button b = new Button(area, SWT.CHECK);
 		b.setText("Use custom definition");
-		IObservableValue useCustomObsModel = BeansObservables.observeDetailValue(master, "useCustom", Boolean.class);
-		ISWTObservableValue useCustomObsUI = SWTObservables.observeSelection(b);
+		IObservableValue useCustomObsModel = BeanProperties.value("useCustom").observeDetail(master);
+		ISWTObservableValue useCustomObsUI = WidgetProperties.buttonSelection().observe(b);
 		dbc.bindValue(useCustomObsUI, useCustomObsModel);
 
 
 		final Label l = new Label(area, SWT.NONE);
 		l.setEnabled(useCustom);
-		ISWTObservableValue lEnabled = SWTObservables.observeEnabled(l);
+		ISWTObservableValue lEnabled = WidgetProperties.enabled().observe(l);
 		dbc.bindValue(lEnabled, useCustomObsModel);
 
 		l.setText("Computed Extensions:");
@@ -175,12 +175,12 @@ public String getText(Object element) {
 
 		extensionViewer.getTable().setHeaderVisible(true);
 		extensionViewer.setContentProvider(new ArrayContentProvider());
-		ISWTObservableValue vClasspathEnabled = SWTObservables.observeEnabled(extensionViewer.getControl());
+		ISWTObservableValue vClasspathEnabled = WidgetProperties.enabled().observe(extensionViewer.getControl());
 		dbc.bindValue(vClasspathEnabled, useCustomObsModel);
 
 		final Label l2 = new Label(area, SWT.NONE);
 		l2.setEnabled(useCustom);
-		ISWTObservableValue l2Enabled = SWTObservables.observeEnabled(l2);
+		ISWTObservableValue l2Enabled = WidgetProperties.enabled().observe(l2);
 		dbc.bindValue(l2Enabled, useCustomObsModel);
 		l2.setText("User Extensions:");
 
@@ -194,7 +194,7 @@ public String getText(Object element) {
 			}
 		});
 		vUser.setContentProvider(new ArrayContentProvider());
-		ISWTObservableValue vUserEnabled = SWTObservables.observeEnabled(vUser.getControl());
+		ISWTObservableValue vUserEnabled = WidgetProperties.enabled().observe(vUser.getControl());
 		dbc.bindValue(vUserEnabled, useCustomObsModel);
 
 		final IAction disable = new Action("disable") {

diff --git a/bundles/tooling/org.eclipse.fx.ide.css.tests/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.fx.ide.css;bundle-version="2.3.0",
  org.eclipse.core.runtime,
  org.eclipse.xtext,
  org.eclipse.xtext.junit4,
- org.eclipse.xtext.ui.junit,
  org.eclipse.ui.workbench;resolution:=optional,
  org.eclipse.xtend.lib,
  com.google.guava,

diff --git a/bundles/tooling/org.eclipse.fx.ide.css/GenerateCssDsl.mwe2.launch b/bundles/tooling/org.eclipse.fx.ide.css/GenerateCssDsl.mwe2.launch
@@ -1,14 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1299248699643_13&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.fx.ide.css&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.fx.ide.css.generator&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.fx.ide.css.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.fx.ide.css.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.fx.ide.css"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/fx/ide/css/GenerateCssDsl.mwe2"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.fx.ide.css"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
+    <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.fx.ide.css&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.fx.ide.css.generator&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.fx.ide.css.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.fx.ide.css.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+        <listEntry value="/org.eclipse.fx.ide.css"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+        <listEntry value="4"/>
+    </listAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JRE [17.0.1]/"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.eclipse.fx.ide.css"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/fx/ide/css/GenerateCssDsl.mwe2"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.fx.ide.css"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
 </launchConfiguration>
diff --git a/bundles/tooling/org.eclipse.fx.ide.fxgraph.tests/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.fxgraph.tests/META-INF/MANIFEST.MF
@@ -10,19 +10,16 @@ Require-Bundle: org.eclipse.fx.ide.fxgraph,
  org.eclipse.core.runtime,
  org.eclipse.xtext,
  org.eclipse.xtext.junit4,
- org.eclipse.xtext.ui.junit,
  org.eclipse.ui.workbench;resolution:=optional,
  org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional,
  org.eclipse.xtext.xbase.lib
-Import-Package: org.apache.log4j,
- org.apache.commons.logging,
+Import-Package: org.apache.commons.logging,
+ org.apache.log4j,
  org.junit;version="4.5.0",
  org.junit.runner;version="4.5.0",
  org.junit.runner.manipulation;version="4.5.0",
  org.junit.runner.notification;version="4.5.0",
  org.junit.runners;version="4.5.0",
- org.junit.runners.model;version="4.5.0",
- org.hamcrest,
- org.hamcrest.core
+ org.junit.runners.model;version="4.5.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.fx.ide.fxgraph
diff --git a/...clipse.fx.ide.fxgraph.ui/src/org/eclipse/fx/ide/fxgraph/ui/wizards/FXGraphWizardPage.java b/...clipse.fx.ide.fxgraph.ui/src/org/eclipse/fx/ide/fxgraph/ui/wizards/FXGraphWizardPage.java
@@ -18,7 +18,7 @@
 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.resources.IWorkspaceRoot;
 import org.eclipse.fx.ide.fxgraph.ui.internal.FXGraphActivator;
 import org.eclipse.fx.ide.fxgraph.ui.wizards.template.FXGraphElement;
@@ -31,8 +31,8 @@
 import org.eclipse.jdt.core.search.SearchEngine;
 import org.eclipse.jdt.ui.IJavaElementSearchConstants;
 import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -120,7 +120,7 @@ public void propertyChange(PropertyChangeEvent evt) {
 			l.setText("Dynamic Root (fx:root)");
 
 			Button b = new Button(parent, SWT.CHECK);
-			dbc.bindValue(WidgetProperties.selection().observe(b), BeanProperties.value("dynamic").observe(getClazz()));
+			dbc.bindValue(WidgetProperties.buttonSelection().observe(b), BeanProperties.value("dynamic").observe(getClazz()));
 		}
 	}
 

diff --git a/...oling/org.eclipse.fx.ide.fxml/src/org/eclipse/fx/ide/fxml/command/GenerateController.java b/...oling/org.eclipse.fx.ide.fxml/src/org/eclipse/fx/ide/fxml/command/GenerateController.java
@@ -25,7 +25,7 @@
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 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.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IResource;
@@ -47,7 +47,7 @@
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.internal.ui.JavaPluginImages;
 import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.text.IDocument;

diff --git a/...s/tooling/org.eclipse.fx.ide.fxml/src/org/eclipse/fx/ide/fxml/wizards/FXMLWizardPage.java b/...s/tooling/org.eclipse.fx.ide.fxml/src/org/eclipse/fx/ide/fxml/wizards/FXMLWizardPage.java
@@ -18,7 +18,7 @@
 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.resources.IWorkspaceRoot;
 import org.eclipse.fx.ide.fxml.Activator;
 import org.eclipse.fx.ide.fxml.wizards.template.FXMLElement;
@@ -31,8 +31,8 @@
 import org.eclipse.jdt.core.search.SearchEngine;
 import org.eclipse.jdt.ui.IJavaElementSearchConstants;
 import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -123,7 +123,7 @@ public void propertyChange(PropertyChangeEvent evt) {
 			l.setText(Messages.FXMLWizardPage_9);
 
 			Button b = new Button(parent, SWT.CHECK);
-			dbc.bindValue(WidgetProperties.selection().observe(b), BeanProperties.value("fxRoot").observe(getClazz())); //$NON-NLS-1$
+			dbc.bindValue(WidgetProperties.buttonSelection().observe(b), BeanProperties.value("fxRoot").observe(getClazz())); //$NON-NLS-1$
 		}
 	}