diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.security.ui/src')
5 files changed, 13 insertions, 12 deletions
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/dialogs/FilterTreeSelectionDialog.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/dialogs/FilterTreeSelectionDialog.java index fae1e18f47..1582bf482d 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/dialogs/FilterTreeSelectionDialog.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/dialogs/FilterTreeSelectionDialog.java @@ -37,6 +37,7 @@ public class FilterTreeSelectionDialog extends ElementTreeSelectionDialog @Override protected TreeViewer doCreateTreeViewer(Composite parent, int style) { + @SuppressWarnings("deprecation") FilteredTree tree = new FilteredTree(parent, style, filter, true); tree.setLayoutData(new GridData(GridData.FILL_BOTH)); tree.setQuickSelectionMode(false); diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java index 2daddc2131..6796fd8ac6 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java @@ -31,8 +31,8 @@ import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry; -import org.eclipse.jface.databinding.swt.WidgetProperties; -import org.eclipse.jface.databinding.viewers.ViewersObservables; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; +import org.eclipse.jface.databinding.viewers.typed.ViewerProperties; import org.eclipse.jface.fieldassist.ControlDecoration; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.ComboViewer; @@ -287,7 +287,7 @@ public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSec result.setContentProvider(new ArrayContentProvider()); result.setInput(attribute.getEAttributeType().getInstanceClass().getEnumConstants()); - getContext().bindValue(ViewersObservables.observeSingleSelection(result), + getContext().bindValue(ViewerProperties.singleSelection().observe(result), EMFEditObservables.observeDetailValue(getRealm(), getEditingDomain(), getValue(), attribute)); getContext().bindValue(WidgetProperties.enabled().observe(result.getControl()), getValue(), null, ObjectWritableConverter.createUpdateValueStrategy(attribute)); diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractSectionPart.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractSectionPart.java index 37df5f6398..98c11a6e7b 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractSectionPart.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractSectionPart.java @@ -21,7 +21,7 @@ import org.eclipse.core.databinding.observable.Realm; import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.core.databinding.observable.value.WritableValue; 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.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.SWT; @@ -172,7 +172,7 @@ public abstract class AbstractSectionPart<T extends EObject> extends AbstractFor return value; } - protected ISWTObservableValue observeText(Text text) + protected ISWTObservableValue<?> observeText(Text text) { return WidgetProperties.text(new int[] { SWT.DefaultSelection, SWT.FocusOut }).observe(text); } diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java index c661c10054..0b4f58f5ef 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java @@ -39,12 +39,12 @@ import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry; -import org.eclipse.core.databinding.beans.PojoProperties; +import org.eclipse.core.databinding.beans.typed.PojoProperties; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.ToolBarManager; -import org.eclipse.jface.databinding.viewers.ViewersObservables; +import org.eclipse.jface.databinding.viewers.typed.ViewerProperties; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.util.LocalSelectionTransfer; import org.eclipse.jface.viewers.ISelectionChangedListener; @@ -108,7 +108,7 @@ public abstract class TableSection<T extends EObject> extends AbstractSectionPar addFilters(viewer); forwardSelection(viewer); - getContext().bindValue(ViewersObservables.observeInput(viewer), getValue()); + getContext().bindValue(ViewerProperties.<StructuredViewer, Object> input().observe(viewer), getValue()); configureDragSupport(viewer); configureDropSupport(viewer); diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java index 693fe066dd..f52313a1de 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java @@ -50,9 +50,9 @@ import org.eclipse.core.databinding.observable.list.IObservableList; import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.core.databinding.observable.value.WritableValue; import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.databinding.swt.WidgetProperties; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.jface.databinding.viewers.ObservableListContentProvider; -import org.eclipse.jface.databinding.viewers.ViewersObservables; +import org.eclipse.jface.databinding.viewers.typed.ViewerProperties; import org.eclipse.jface.layout.TableColumnLayout; import org.eclipse.jface.util.LocalSelectionTransfer; import org.eclipse.jface.viewers.IFilter; @@ -186,7 +186,7 @@ public class OneToManyBlock viewer.setLabelProvider(labels); } - viewer.setContentProvider(new ObservableListContentProvider()); + viewer.setContentProvider(new ObservableListContentProvider<Object>()); SecurityUIUtil.applySupportedElementFilter(viewer, itemType); if (itemType != reference.getEReferenceType()) { @@ -226,7 +226,7 @@ public class OneToManyBlock removeButton = toolkit.createButton(buttons, Messages.OneToManyBlock_2, SWT.PUSH); - final IObservableValue<?> selection = ViewersObservables.observeSingleSelection(viewer); + final IObservableValue<?> selection = ViewerProperties.singleSelection().observe(viewer); context.bindValue(WidgetProperties.enabled().observe(newButton), input, null, ObjectWritableConverter.createUpdateValueStrategy()); if (addButton != null) |