summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordhubner2009-02-04 03:43:52 (EST)
committerdhubner2009-02-04 03:43:52 (EST)
commita13120f4c864e16af9d7a7fba7b74516cde3df4a (patch)
treeecd7b88b22e096e715722033ea5c13b7d6d52ad2
parent76438ff79689e188d98746601cfa7d55b6fa2c16 (diff)
downloadorg.eclipse.xpand-a13120f4c864e16af9d7a7fba7b74516cde3df4a.zip
org.eclipse.xpand-a13120f4c864e16af9d7a7fba7b74516cde3df4a.tar.gz
org.eclipse.xpand-a13120f4c864e16af9d7a7fba7b74516cde3df4a.tar.bz2
changed to jface databinding 1.2 and higher
-rw-r--r--examples/org.eclipse.emf.generic.editor/META-INF/MANIFEST.MF2
-rw-r--r--examples/org.eclipse.emf.generic.editor/src/org/eclipse/emf/editor/ui/binding/EmfSwtBindingFactory.java6
2 files changed, 2 insertions, 6 deletions
diff --git a/examples/org.eclipse.emf.generic.editor/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.generic.editor/META-INF/MANIFEST.MF
index 6d128dc..d651ade 100644
--- a/examples/org.eclipse.emf.generic.editor/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.generic.editor/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore.editor,
org.eclipse.ui.forms,
org.eclipse.core.resources,
- org.eclipse.jface.databinding,
+ org.eclipse.jface.databinding;bundle-version="1.2.0",
org.eclipse.emf.databinding.edit,
org.eclipse.xtend,
org.eclipse.xtend.typesystem.emf,
diff --git a/examples/org.eclipse.emf.generic.editor/src/org/eclipse/emf/editor/ui/binding/EmfSwtBindingFactory.java b/examples/org.eclipse.emf.generic.editor/src/org/eclipse/emf/editor/ui/binding/EmfSwtBindingFactory.java
index 0c45aa3..d8a698a 100644
--- a/examples/org.eclipse.emf.generic.editor/src/org/eclipse/emf/editor/ui/binding/EmfSwtBindingFactory.java
+++ b/examples/org.eclipse.emf.generic.editor/src/org/eclipse/emf/editor/ui/binding/EmfSwtBindingFactory.java
@@ -46,7 +46,6 @@ import org.eclipse.jface.fieldassist.FieldDecoration;
import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
import org.eclipse.jface.fieldassist.SimpleContentProposalProvider;
import org.eclipse.jface.fieldassist.TextContentAdapter;
-import org.eclipse.jface.internal.databinding.viewers.SelectionProviderMultipleSelectionObservableList;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.swt.SWT;
@@ -54,7 +53,6 @@ import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.forms.widgets.FormToolkit;
@@ -62,7 +60,6 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
* @author Dennis Huebner
*
*/
-@SuppressWarnings("restriction")
public class EmfSwtBindingFactory {
private Composite parent = null;
private FormToolkit toolkit = null;
@@ -112,8 +109,7 @@ public class EmfSwtBindingFactory {
MultipleFeatureControl mfc = new MultipleFeatureControl(parent, toolkit, new AdapterFactoryLabelProvider(
adapterFactory), owner, feature, choice);
- IObservableList target = new SelectionProviderMultipleSelectionObservableList(SWTObservables.getRealm(Display
- .getDefault()), mfc.getInternalSelectionProvider(), Object.class);
+ IObservableList target = ViewersObservables.observeMultiSelection(mfc.getInternalSelectionProvider());
Binding binding = edbc.bindList(target, source, null, null);
binding.updateModelToTarget();
return mfc;