Bug 497466 - Using generics in databinding
- remove deprecated databinding api
- update all target files to newest versions
Change-Id: Ibc3a6faaaf0196b4f5921d83d9077518a27c949b
Signed-off-by: Eugen Neufeld <eneufeld@eclipsesource.com>
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.edit.swt/META-INF/MANIFEST.MF
index 84f64d2..673b70c 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/META-INF/MANIFEST.MF
@@ -50,7 +50,9 @@
org.eclipse.jface.action;version="0.0.0",
org.eclipse.jface.databinding.fieldassist;version="0.0.0",
org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
+ org.eclipse.jface.databinding.viewers.typed;version="0.0.0",
org.eclipse.jface.dialogs;version="0.0.0",
org.eclipse.jface.fieldassist;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/AbstractTextControl.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/AbstractTextControl.java
index dad017e..1128a10 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/AbstractTextControl.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/AbstractTextControl.java
@@ -26,8 +26,7 @@
import org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.VTTextControlEnablementStyleProperty;
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.emfforms.spi.localization.LocalizationServiceHelper;
-import org.eclipse.jface.databinding.swt.SWTObservables;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.layout.GridData;
@@ -161,7 +160,7 @@
@Override
public Binding bindValue() {
- final IObservableValue value = SWTObservables.observeText(text, SWT.FocusOut);
+ final IObservableValue value = WidgetProperties.text(SWT.FocusOut).observe(text);
final TargetToModelUpdateStrategy targetToModelUpdateStrategy = new TargetToModelUpdateStrategy();
final ModelToTargetUpdateStrategy modelToTargetUpdateStrategy = new ModelToTargetUpdateStrategy();
final Binding binding = getDataBindingContext().bindValue(value, getModelValue(),
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/BooleanControl.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/BooleanControl.java
index f950ca6..3e946ad 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/BooleanControl.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/BooleanControl.java
@@ -17,7 +17,7 @@
import org.eclipse.core.databinding.Binding;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.emfforms.spi.localization.LocalizationServiceHelper;
-import org.eclipse.jface.databinding.swt.SWTObservables;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Button;
@@ -59,7 +59,7 @@
@Override
public Binding bindValue() {
- final IObservableValue targetValue = SWTObservables.observeSelection(check);
+ final IObservableValue targetValue = WidgetProperties.buttonSelection().observe(check);
return getDataBindingContext().bindValue(targetValue, getModelValue());
}
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/DateTimeControl.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/DateTimeControl.java
index 5196bc5..7b08edc 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/DateTimeControl.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/DateTimeControl.java
@@ -18,7 +18,7 @@
import org.eclipse.core.databinding.observable.value.DateAndTimeObservableValue;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.emfforms.spi.localization.LocalizationServiceHelper;
-import org.eclipse.jface.databinding.swt.SWTObservables;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.swt.SWT;
@@ -86,8 +86,8 @@
@Override
public Binding bindValue() {
- final IObservableValue dateObserver = SWTObservables.observeSelection(dateWidget);
- final IObservableValue timeObserver = SWTObservables.observeSelection(timeWidget);
+ final IObservableValue dateObserver = WidgetProperties.dateTimeSelection().observe(dateWidget);
+ final IObservableValue timeObserver = WidgetProperties.dateTimeSelection().observe(timeWidget);
final IObservableValue target = new DateAndTimeObservableValue(dateObserver, timeObserver);
final Binding binding = getDataBindingContext().bindValue(target, getModelValue());
return binding;
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/EEnumControl.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/EEnumControl.java
index 0846cd1..5410cf6 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/EEnumControl.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/EEnumControl.java
@@ -19,8 +19,8 @@
import org.eclipse.emf.ecore.EStructuralFeature.Setting;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emfforms.spi.localization.LocalizationServiceHelper;
-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.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.jface.viewers.LabelProvider;
@@ -70,7 +70,7 @@
@Override
public Binding bindValue() {
- final IObservableValue target = ViewersObservables.observeSingleSelection(combo);
+ final IObservableValue target = ViewerProperties.singleSelection().observe(combo);
final Binding bindValue = getDataBindingContext().bindValue(target, getModelValue());
getDataBindingContext().bindValue(WidgetProperties.tooltipText().observe(combo.getControl()), getModelValue());
return bindValue;
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/NumericalControl.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/NumericalControl.java
index 709a211..280df23 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/NumericalControl.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/NumericalControl.java
@@ -27,7 +27,7 @@
import org.eclipse.emf.ecp.edit.spi.swt.util.ECPDialogExecutor;
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.emfforms.spi.localization.LocalizationServiceHelper;
-import org.eclipse.jface.databinding.swt.SWTObservables;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.dialogs.IDialogLabelKeys;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.resource.JFaceResources;
@@ -90,7 +90,7 @@
@Override
public Binding bindValue() {
// TODO: FocusOut doesn't seem to fire in case the same invalid text is entered twice
- final IObservableValue value = SWTObservables.observeText(getText(), SWT.FocusOut);
+ final IObservableValue value = WidgetProperties.text(SWT.FocusOut).observe(getText());
final NumericalTargetToModelUpdateStrategy targetToModelStrategy = new NumericalTargetToModelUpdateStrategy();
final NumericalModelToTargetUpdateStrategy modelToTargetStrategy = new NumericalModelToTargetUpdateStrategy();
final Binding binding = getDataBindingContext().bindValue(value, getModelValue(), targetToModelStrategy,
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/TableControl.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/TableControl.java
index 84e8733..85df318 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/TableControl.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/TableControl.java
@@ -55,7 +55,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
import org.eclipse.emfforms.spi.localization.LocalizationServiceHelper;
-import org.eclipse.jface.databinding.swt.SWTObservables;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
import org.eclipse.jface.databinding.viewers.ObservableMapCellLabelProvider;
import org.eclipse.jface.dialogs.IDialogConstants;
@@ -1119,7 +1119,7 @@
if (ECPCellEditor.class.isInstance(cellEditor)) {
return ((ECPCellEditor) cellEditor).getValueProperty().observe(cellEditor);
}
- return SWTObservables.observeText(cellEditor.getControl(), SWT.FocusOut);
+ return WidgetProperties.text(SWT.FocusOut).observe(cellEditor.getControl());
}
@Override
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/XmlDateControlText.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/XmlDateControlText.java
index be869e8..46a094a 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/XmlDateControlText.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/XmlDateControlText.java
@@ -31,7 +31,7 @@
import org.eclipse.emf.ecp.edit.spi.swt.util.ECPDialogExecutor;
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.emfforms.spi.localization.LocalizationServiceHelper;
-import org.eclipse.jface.databinding.swt.SWTObservables;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.dialogs.IDialogLabelKeys;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.layout.GridDataFactory;
@@ -106,7 +106,7 @@
@Override
public Binding bindValue() {
- final IObservableValue value = SWTObservables.observeText(getText(), SWT.FocusOut);
+ final IObservableValue value = WidgetProperties.text(SWT.FocusOut).observe(getText());
final DateTargetToModelUpdateStrategy targetToModelUpdateStrategy = new DateTargetToModelUpdateStrategy();
final DateModelToTargetUpdateStrategy modelToTargetUpdateStrategy = new DateModelToTargetUpdateStrategy();
final Binding binding = getDataBindingContext().bindValue(value, getModelValue(),
@@ -133,7 +133,7 @@
}
calendar.setDate(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH));
- final IObservableValue dateObserver = SWTObservables.observeSelection(calendar);
+ final IObservableValue dateObserver = WidgetProperties.dateTimeSelection().observe(calendar);
final Binding binding = getDataBindingContext().bindValue(dateObserver, getModelValue(),
new DateTargetToModelUpdateStrategy(), new DateModelToTargetUpdateStrategy());
binding.updateModelToTarget();
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/reference/LinkControl.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/reference/LinkControl.java
index 37cbc70..30fda2e 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/reference/LinkControl.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/reference/LinkControl.java
@@ -36,7 +36,7 @@
import org.eclipse.emfforms.spi.core.services.editsupport.EMFFormsEditSupport;
import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
import org.eclipse.emfforms.spi.localization.LocalizationServiceHelper;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/NumberCellEditor.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/NumberCellEditor.java
index 2a01c20..0116899 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/NumberCellEditor.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/NumberCellEditor.java
@@ -32,7 +32,7 @@
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.emfforms.spi.common.locale.EMFFormsLocaleProvider;
import org.eclipse.emfforms.spi.localization.LocalizationServiceHelper;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.databinding.viewers.CellEditorProperties;
import org.eclipse.jface.dialogs.IDialogLabelKeys;
import org.eclipse.jface.dialogs.MessageDialog;
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/MultiStringCellEditor.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/MultiStringCellEditor.java
index eab15b3..1256fd2 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/MultiStringCellEditor.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/MultiStringCellEditor.java
@@ -22,7 +22,7 @@
import org.eclipse.emf.databinding.EMFUpdateValueStrategy;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.databinding.viewers.CellEditorProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
@@ -101,7 +101,7 @@
super(parent, style);
}
- @SuppressWarnings({ "rawtypes", "unchecked" })
+ @SuppressWarnings({ "rawtypes" })
@Override
public IValueProperty getValueProperty() {
return CellEditorProperties.control().value(WidgetProperties.text(SWT.FocusOut));
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/StringCellEditor.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/StringCellEditor.java
index a9c866e..d96b559 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/StringCellEditor.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/StringCellEditor.java
@@ -19,7 +19,7 @@
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.databinding.viewers.CellEditorProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emf2web.ui/META-INF/MANIFEST.MF
index b260d72..08d0d3f 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui/META-INF/MANIFEST.MF
@@ -22,6 +22,7 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.emf2web.ui
Import-Package: org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.jface.databinding.wizard;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0"
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui/src/org/eclipse/emf/ecp/emf2web/ui/wizard/SelectLocationPage.java b/bundles/org.eclipse.emf.ecp.emf2web.ui/src/org/eclipse/emf/ecp/emf2web/ui/wizard/SelectLocationPage.java
index 030ff1a..3bd6160 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.ui/src/org/eclipse/emf/ecp/emf2web/ui/wizard/SelectLocationPage.java
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui/src/org/eclipse/emf/ecp/emf2web/ui/wizard/SelectLocationPage.java
@@ -17,7 +17,7 @@
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.UpdateValueStrategy;
-import org.eclipse.core.databinding.beans.PojoProperties;
+import org.eclipse.core.databinding.beans.typed.PojoProperties;
import org.eclipse.core.databinding.conversion.IConverter;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.validation.IValidator;
@@ -32,7 +32,7 @@
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecp.emf2web.controller.xtend.GenerationInfo;
import org.eclipse.emf.ecp.emf2web.ui.messages.Messages;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.databinding.wizard.WizardPageSupport;
import org.eclipse.jface.fieldassist.ControlDecoration;
import org.eclipse.jface.fieldassist.FieldDecoration;
@@ -194,7 +194,7 @@
* Indicates if this page was already shown to the user.
*
* @return
- * {@code true} if this page was already shown to the user, {@code false} if this page was never shown to
+ * {@code true} if this page was already shown to the user, {@code false} if this page was never shown to
* the user.
*/
public boolean wasAlreadyVisible() {
@@ -389,7 +389,8 @@
null);
if (generationInfo.getWrapper() != null) {
- final IObservableValue observeSelectionBtnWrapObserveWidget = WidgetProperties.selection().observe(btnWrap);
+ final IObservableValue observeSelectionBtnWrapObserveWidget = WidgetProperties.buttonSelection()
+ .observe(btnWrap);
final IObservableValue wrapGenerationInfoObserveValue = PojoProperties.value("wrap") //$NON-NLS-1$
.observe(generationInfo);
bindingContext.bindValue(observeSelectionBtnWrapObserveWidget, wrapGenerationInfoObserveValue, null, null);
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/META-INF/MANIFEST.MF
index 046bb5d..a9512bc 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/META-INF/MANIFEST.MF
@@ -52,6 +52,7 @@
org.eclipse.emfforms.spi.common.report;version="[1.27.0,1.28.0)",
org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.27.0,1.28.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
org.eclipse.jface.resource;version="0.0.0",
org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ControlRootEClassControl2SWTRenderer.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ControlRootEClassControl2SWTRenderer.java
index 1f488b3..0d5ff80 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ControlRootEClassControl2SWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ControlRootEClassControl2SWTRenderer.java
@@ -36,7 +36,7 @@
import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedReport;
import org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding;
import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/DomainModelReferenceControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/DomainModelReferenceControlSWTRenderer.java
index 110f85d..ce90272 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/DomainModelReferenceControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/DomainModelReferenceControlSWTRenderer.java
@@ -74,7 +74,7 @@
import org.eclipse.emfforms.spi.localization.LocalizationServiceHelper;
import org.eclipse.jface.action.Action;
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.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.viewers.TreeViewer;
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/EReferenceLabelControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/EReferenceLabelControlSWTRenderer.java
index beabf38..990a52f 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/EReferenceLabelControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/EReferenceLabelControlSWTRenderer.java
@@ -33,7 +33,7 @@
import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedReport;
import org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding;
import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/EditableEReferenceLabelControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/EditableEReferenceLabelControlSWTRenderer.java
index a65ef96..8929510 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/EditableEReferenceLabelControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/EditableEReferenceLabelControlSWTRenderer.java
@@ -27,7 +27,7 @@
import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedException;
import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
import org.eclipse.emfforms.spi.core.services.label.NoLabelFoundException;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.dialogs.IDialogLabelKeys;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.layout.GridLayoutFactory;
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ExpectedValueControlRenderer.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ExpectedValueControlRenderer.java
index 7a87b6e..f6dd831 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ExpectedValueControlRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ExpectedValueControlRenderer.java
@@ -138,7 +138,7 @@
final TargetToModelUpdateStrategy targetToModelUpdateStrategy = new TargetToModelUpdateStrategy();
final ModelToTargetUpdateStrategy modelToTargetUpdateStrategy = new ModelToTargetUpdateStrategy();
- final IObservableValue value = org.eclipse.jface.databinding.swt.WidgetProperties.text().observe(text);
+ final IObservableValue value = org.eclipse.jface.databinding.swt.typed.WidgetProperties.text().observe(text);
final Binding binding = getDataBindingContext().bindValue(value, getModelValue(),
withPreSetValidation(targetToModelUpdateStrategy), modelToTargetUpdateStrategy);
@@ -157,7 +157,8 @@
*/
protected Binding createTooltipBinding(Control text, IObservableValue modelValue,
DataBindingContext dataBindingContext, UpdateValueStrategy targetToModel, UpdateValueStrategy modelToTarget) {
- final IObservableValue toolTip = org.eclipse.jface.databinding.swt.WidgetProperties.tooltipText().observe(text);
+ final IObservableValue toolTip = org.eclipse.jface.databinding.swt.typed.WidgetProperties.tooltipText()
+ .observe(text);
return dataBindingContext.bindValue(toolTip, modelValue, targetToModel, modelToTarget);
}
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableColumnsDMRTableControl.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableColumnsDMRTableControl.java
index bf3363c..dce6498 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableColumnsDMRTableControl.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableColumnsDMRTableControl.java
@@ -75,7 +75,7 @@
import org.eclipse.emfforms.spi.localization.LocalizationServiceHelper;
import org.eclipse.emfforms.spi.swt.core.layout.GridDescriptionFactory;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridDescription;
-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.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableDetailViewControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableDetailViewControlSWTRenderer.java
index 7f716ea..c31141f 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableDetailViewControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableDetailViewControlSWTRenderer.java
@@ -49,7 +49,7 @@
import org.eclipse.emfforms.spi.core.services.editsupport.EMFFormsEditSupport;
import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
import org.eclipse.jface.action.Action;
-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.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.categorization.swt/META-INF/MANIFEST.MF
index 5eacadb..d0eae40 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.swt/META-INF/MANIFEST.MF
@@ -28,6 +28,7 @@
org.eclipse.emfforms.spi.common.report;version="[1.27.0,1.28.0)",
org.eclipse.emfforms.spi.core.services.databinding;version="[1.27.0,1.28.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.jface.resource;version="0.0.0",
org.eclipse.jface.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/spi/categorization/swt/AbstractSWTTabRenderer.java b/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/spi/categorization/swt/AbstractSWTTabRenderer.java
index b765c6a..dc45bb0 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/spi/categorization/swt/AbstractSWTTabRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/spi/categorization/swt/AbstractSWTTabRenderer.java
@@ -48,7 +48,7 @@
import org.eclipse.emfforms.spi.swt.core.layout.GridDescriptionFactory;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridDescription;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/spi/categorization/swt/SWTCategorizationRenderer.java b/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/spi/categorization/swt/SWTCategorizationRenderer.java
index 8f62918..c0e69b0 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/spi/categorization/swt/SWTCategorizationRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/spi/categorization/swt/SWTCategorizationRenderer.java
@@ -35,7 +35,7 @@
import org.eclipse.emfforms.spi.swt.core.layout.GridDescriptionFactory;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridDescription;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/META-INF/MANIFEST.MF
index 32f8d61..d644aab 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/META-INF/MANIFEST.MF
@@ -22,6 +22,7 @@
Import-Package: javax.inject;version="1.0.0",
org.eclipse.emfforms.spi.common.report;version="[1.27.0,1.28.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.graphics;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/src/org/eclipse/emf/ecp/view/spi/compoundcontrol/swt/CompoundControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/src/org/eclipse/emf/ecp/view/spi/compoundcontrol/swt/CompoundControlSWTRenderer.java
index 5f0ebdc..86aa50e 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/src/org/eclipse/emf/ecp/view/spi/compoundcontrol/swt/CompoundControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/src/org/eclipse/emf/ecp/view/spi/compoundcontrol/swt/CompoundControlSWTRenderer.java
@@ -60,7 +60,7 @@
import org.eclipse.emfforms.spi.swt.core.layout.GridDescriptionFactory;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridDescription;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
diff --git a/bundles/org.eclipse.emf.ecp.view.control.multireference/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.control.multireference/META-INF/MANIFEST.MF
index b386e2a..3e8002f 100644
--- a/bundles/org.eclipse.emf.ecp.view.control.multireference/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.control.multireference/META-INF/MANIFEST.MF
@@ -30,6 +30,7 @@
org.eclipse.emfforms.spi.common.report;version="[1.27.0,1.28.0)",
org.eclipse.emfforms.spi.swt.core;version="[1.27.0,1.28.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.jface.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.control.multireference/src/org/eclipse/emf/ecp/view/internal/control/multireference/MultiReferenceSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.control.multireference/src/org/eclipse/emf/ecp/view/internal/control/multireference/MultiReferenceSWTRenderer.java
index da538b4..e3cfaa6 100644
--- a/bundles/org.eclipse.emf.ecp.view.control.multireference/src/org/eclipse/emf/ecp/view/internal/control/multireference/MultiReferenceSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.control.multireference/src/org/eclipse/emf/ecp/view/internal/control/multireference/MultiReferenceSWTRenderer.java
@@ -79,7 +79,7 @@
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridDescription;
import org.eclipse.emfforms.spi.swt.core.ui.ObjectViewerComparator;
-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.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.core.swt/META-INF/MANIFEST.MF
index d839576..b33fac9 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/META-INF/MANIFEST.MF
@@ -32,7 +32,9 @@
org.eclipse.emfforms.spi.common.locale;version="[1.27.0,1.28.0)",
org.eclipse.emfforms.spi.common.report;version="[1.27.0,1.28.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
+ org.eclipse.jface.databinding.viewers.typed;version="0.0.0",
org.eclipse.jface.dialogs;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/BooleanControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/BooleanControlSWTRenderer.java
index 434b7ee..8cf1c5e 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/BooleanControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/BooleanControlSWTRenderer.java
@@ -28,7 +28,7 @@
import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
import org.eclipse.emfforms.spi.localization.LocalizationServiceHelper;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Button;
@@ -75,7 +75,8 @@
@Override
protected Binding[] createBindings(Control control) throws DatabindingFailedException {
- final Binding binding = getDataBindingContext().bindValue(WidgetProperties.selection().observe(control),
+ final Binding binding = getDataBindingContext().bindValue(
+ WidgetProperties.buttonSelection().observe((Button) control),
getModelValue(), withPreSetValidation(new UpdateValueStrategy()), null);
return new Binding[] { binding };
}
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/DateTimeControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/DateTimeControlSWTRenderer.java
index 3670630..1f45cab 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/DateTimeControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/DateTimeControlSWTRenderer.java
@@ -52,7 +52,7 @@
import org.eclipse.emfforms.spi.localization.EMFFormsLocalizationService;
import org.eclipse.emfforms.spi.swt.core.SWTDataElementIdHelper;
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.dialogs.IDialogLabelKeys;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
@@ -152,8 +152,8 @@
@Override
protected Binding[] createBindings(Control control) throws DatabindingFailedException {
- final ISWTObservableValue dateObserver = WidgetProperties.selection().observe(dateWidget);
- final ISWTObservableValue timeObserver = WidgetProperties.selection().observe(timeWidget);
+ final ISWTObservableValue dateObserver = WidgetProperties.dateTimeSelection().observe(dateWidget);
+ final ISWTObservableValue timeObserver = WidgetProperties.dateTimeSelection().observe(timeWidget);
final IObservableValue target = new DateAndTimeObservableValue(dateObserver, timeObserver);
final Binding binding = getDataBindingContext().bindValue(target, getModelValue(),
withPreSetValidation(new UpdateValueStrategy()),
@@ -431,7 +431,7 @@
dialog = new Shell(btn.getShell(), SWT.NONE);
dialog.setLayout(new GridLayout(1, false));
final DateTime calendar = new DateTime(dialog, SWT.CALENDAR | SWT.BORDER);
- final IObservableValue calendarObserver = WidgetProperties.selection().observe(calendar);
+ final IObservableValue calendarObserver = WidgetProperties.dateTimeSelection().observe(calendar);
final UpdateValueStrategy modelToTarget = new UpdateValueStrategy(UpdateValueStrategy.POLICY_UPDATE);
final Binding binding = getDataBindingContext().bindValue(calendarObserver, modelValue, modelToTarget,
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/EnumComboViewerSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/EnumComboViewerSWTRenderer.java
index 44ea86b..5effbc0 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/EnumComboViewerSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/EnumComboViewerSWTRenderer.java
@@ -54,9 +54,9 @@
import org.eclipse.emfforms.spi.core.services.editsupport.EMFFormsEditSupport;
import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
import org.eclipse.emfforms.spi.localization.LocalizationServiceHelper;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ViewerProperties;
-import org.eclipse.jface.databinding.viewers.ViewersObservables;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.IViewerValueProperty;
+import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.jface.viewers.LabelProvider;
@@ -100,14 +100,15 @@
protected Binding[] createBindings(Viewer viewer) throws DatabindingFailedException {
// This binding needs to fire before the value binding so that the value
// to be selected exists in the combo's items
- final IObservableValue<?> viewerInput = ViewerProperties.input().observe(viewer);
+ final IViewerValueProperty<ComboViewer, Object> viewerValueProperty = ViewerProperties.input();
+ final IObservableValue<?> viewerInput = viewerValueProperty.observe(viewer);
final Binding inputBinding = getDataBindingContext().bindValue(
viewerInput,
getAvailableChoicesValue());
final IObservableValue<?> modelValue = getModelValue();
- final Binding binding = getDataBindingContext().bindValue(ViewersObservables.observeSingleSelection(viewer),
+ final Binding binding = getDataBindingContext().bindValue(ViewerProperties.singleSelection().observe(viewer),
modelValue);
pushValue = ISideEffect.create(viewerInput::getValue, input -> {
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/LinkControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/LinkControlSWTRenderer.java
index db56026..efb4d59 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/LinkControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/LinkControlSWTRenderer.java
@@ -51,7 +51,7 @@
import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
import org.eclipse.emfforms.spi.core.services.label.NoLabelFoundException;
import org.eclipse.emfforms.spi.localization.EMFFormsLocalizationService;
-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.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/XMLDateControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/XMLDateControlSWTRenderer.java
index 5bea36d..80bb31b 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/XMLDateControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/XMLDateControlSWTRenderer.java
@@ -55,7 +55,7 @@
import org.eclipse.emfforms.spi.localization.EMFFormsLocalizationService;
import org.eclipse.emfforms.spi.localization.LocalizationServiceHelper;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.dialogs.IDialogLabelKeys;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.layout.GridDataFactory;
@@ -155,7 +155,7 @@
}
calendar.setDate(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH));
- final IObservableValue dateObserver = WidgetProperties.selection().observe(calendar);
+ final IObservableValue dateObserver = WidgetProperties.dateTimeSelection().observe(calendar);
final Binding binding = getDataBindingContext().bindValue(dateObserver, modelValue,
new DateTargetToModelUpdateStrategy(eStructuralFeature, text),
new DateModelToTargetUpdateStrategy(false, true));
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/AbstractControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/AbstractControlSWTRenderer.java
index 536f409..a15c165 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/AbstractControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/AbstractControlSWTRenderer.java
@@ -54,7 +54,7 @@
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
import org.eclipse.emfforms.spi.swt.core.ui.SWTValidationHelper;
import org.eclipse.emfforms.spi.swt.core.ui.SWTValidationUiService;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Image;
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/renderer/TextControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/renderer/TextControlSWTRenderer.java
index 8bbb8d5..6ddbd40 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/renderer/TextControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/renderer/TextControlSWTRenderer.java
@@ -61,7 +61,7 @@
import org.eclipse.emfforms.spi.swt.core.SWTDataElementIdHelper;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
import org.eclipse.emfforms.swt.core.EMFFormsSWTConstants;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/META-INF/MANIFEST.MF
index aa531d9..29c2cd9 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/META-INF/MANIFEST.MF
@@ -23,6 +23,7 @@
Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.27.0,1.28.0)",
org.eclipse.emfforms.spi.swt.core;version="[1.27.0,1.28.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
org.eclipse.jface.dialogs;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/src/org/eclipse/emf/ecp/view/spi/custom/swt/ECPAbstractCustomControlSWT.java b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/src/org/eclipse/emf/ecp/view/spi/custom/swt/ECPAbstractCustomControlSWT.java
index 07bf363..cc1b3f0 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/src/org/eclipse/emf/ecp/view/spi/custom/swt/ECPAbstractCustomControlSWT.java
+++ b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/src/org/eclipse/emf/ecp/view/spi/custom/swt/ECPAbstractCustomControlSWT.java
@@ -72,7 +72,7 @@
import org.eclipse.emfforms.spi.swt.core.layout.GridDescriptionFactory;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridDescription;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.databinding.viewers.ViewerSupport;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/META-INF/MANIFEST.MF
index 2aa6dd4..835e302 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/META-INF/MANIFEST.MF
@@ -22,6 +22,7 @@
org.eclipse.emfforms.spi.common.report;version="[1.27.0,1.28.0)",
org.eclipse.emfforms.spi.core.services.databinding;version="[1.27.0,1.28.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.events;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/src/org/eclipse/emf/ecp/view/group/swt/internal/collapsable/CollapsableGroupSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/src/org/eclipse/emf/ecp/view/group/swt/internal/collapsable/CollapsableGroupSWTRenderer.java
index d9e67b4..3bcfb7d 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/src/org/eclipse/emf/ecp/view/group/swt/internal/collapsable/CollapsableGroupSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/src/org/eclipse/emf/ecp/view/group/swt/internal/collapsable/CollapsableGroupSWTRenderer.java
@@ -32,7 +32,7 @@
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridDescription;
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.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.resource.FontDescriptor;
diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/META-INF/MANIFEST.MF
index e0f3377..5598174 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/META-INF/MANIFEST.MF
@@ -19,6 +19,7 @@
org.eclipse.core.runtime;version="3.4.0",
org.eclipse.emfforms.spi.common.report;version="[1.27.0,1.28.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0",
org.osgi.framework;version="1.6.0"
diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/src/org/eclipse/emf/ecp/view/alignmentgroup/internal/swt/EmbeddedGroupSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/src/org/eclipse/emf/ecp/view/alignmentgroup/internal/swt/EmbeddedGroupSWTRenderer.java
index 9f41d6c..04581e9 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/src/org/eclipse/emf/ecp/view/alignmentgroup/internal/swt/EmbeddedGroupSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/src/org/eclipse/emf/ecp/view/alignmentgroup/internal/swt/EmbeddedGroupSWTRenderer.java
@@ -44,7 +44,7 @@
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridDescription;
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.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
diff --git a/bundles/org.eclipse.emf.ecp.view.group.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.group.ui.swt/META-INF/MANIFEST.MF
index 66122d1..79c81eb 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.ui.swt/META-INF/MANIFEST.MF
@@ -24,6 +24,7 @@
org.eclipse.emfforms.spi.common.report;version="[1.27.0,1.28.0)",
org.eclipse.emfforms.spi.core.services.databinding;version="[1.27.0,1.28.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.graphics;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.group.ui.swt/src/org/eclipse/emf/ecp/view/spi/group/swt/GroupSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.group.ui.swt/src/org/eclipse/emf/ecp/view/spi/group/swt/GroupSWTRenderer.java
index ff8b8a9..a29cce4 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.ui.swt/src/org/eclipse/emf/ecp/view/spi/group/swt/GroupSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.group.ui.swt/src/org/eclipse/emf/ecp/view/spi/group/swt/GroupSWTRenderer.java
@@ -35,7 +35,7 @@
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridDescription;
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.swt.SWT;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Composite;
diff --git a/bundles/org.eclipse.emf.ecp.view.label.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.label.ui.swt/META-INF/MANIFEST.MF
index d13471e..2b6d38d 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.label.ui.swt/META-INF/MANIFEST.MF
@@ -23,6 +23,7 @@
org.eclipse.emfforms.spi.common.report;version="[1.27.0,1.28.0)",
org.eclipse.emfforms.spi.core.services.databinding;version="[1.27.0,1.28.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.events;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.label.ui.swt/src/org/eclipse/emf/ecp/view/spi/label/swt/LabelSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.label.ui.swt/src/org/eclipse/emf/ecp/view/spi/label/swt/LabelSWTRenderer.java
index c59645d..55416d5 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.ui.swt/src/org/eclipse/emf/ecp/view/spi/label/swt/LabelSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.label.ui.swt/src/org/eclipse/emf/ecp/view/spi/label/swt/LabelSWTRenderer.java
@@ -44,7 +44,7 @@
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridDescription;
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.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
diff --git a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/META-INF/MANIFEST.MF
index 8538193..9654330 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/META-INF/MANIFEST.MF
@@ -24,6 +24,7 @@
Import-Package: javax.inject;version="1.0.0",
org.eclipse.emfforms.spi.common.report;version="[1.27.0,1.28.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.graphics;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionLeafSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionLeafSWTRenderer.java
index ab5f4bc..8ce95ea 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionLeafSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionLeafSWTRenderer.java
@@ -28,7 +28,7 @@
import org.eclipse.emfforms.spi.common.report.ReportService;
import org.eclipse.emfforms.spi.swt.core.layout.GridDescriptionFactory;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridDescription;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionNodeSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionNodeSWTRenderer.java
index c79d231..bd6a159 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionNodeSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionNodeSWTRenderer.java
@@ -21,7 +21,7 @@
import javax.inject.Inject;
-import org.eclipse.core.databinding.beans.PojoProperties;
+import org.eclipse.core.databinding.beans.typed.PojoProperties;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.emf.databinding.edit.EMFEditObservables;
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap/META-INF/MANIFEST.MF
index 233c2d6..9530712 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap/META-INF/MANIFEST.MF
@@ -38,6 +38,7 @@
org.eclipse.emfforms.spi.swt.core.di;version="[1.27.0,1.28.0)",
org.eclipse.jface.action;version="0.0.0",
org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
org.eclipse.jface.dialogs;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/META-INF/MANIFEST.MF
index a5fccd1..4adf9bb 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/META-INF/MANIFEST.MF
@@ -36,6 +36,7 @@
org.eclipse.emfforms.spi.swt.core.di;version="[1.27.0,1.28.0)",
org.eclipse.jface.action;version="0.0.0",
org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
org.eclipse.jface.dialogs;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/META-INF/MANIFEST.MF
index 3e0379a..c86c710 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/META-INF/MANIFEST.MF
@@ -38,7 +38,9 @@
org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.27.0,1.28.0)",
org.eclipse.jface.bindings.keys;version="0.0.0",
org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
+ org.eclipse.jface.databinding.viewers.typed;version="0.0.0",
org.eclipse.jface.dialogs;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/ItemProviderEnumCellEditor.java b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/ItemProviderEnumCellEditor.java
index 594f556..aac5fd8 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/ItemProviderEnumCellEditor.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/ItemProviderEnumCellEditor.java
@@ -55,7 +55,7 @@
import org.eclipse.emfforms.spi.common.report.AbstractReport;
import org.eclipse.emfforms.spi.common.report.ReportService;
import org.eclipse.emfforms.spi.localization.EMFFormsLocalizationService;
-import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java
index 63c4a14..a06df32 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java
@@ -172,7 +172,7 @@
import org.eclipse.emfforms.spi.swt.table.action.ViewerActionContext;
import org.eclipse.emfforms.view.spi.multisegment.model.MultiSegmentUtil;
import org.eclipse.emfforms.view.spi.multisegment.model.VMultiDomainModelReferenceSegment;
-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.ObservableMapCellLabelProvider;
import org.eclipse.jface.dialogs.IDialogConstants;
@@ -398,7 +398,6 @@
return renderTableControl(gridCell, parent);
}
- @SuppressWarnings("unchecked")
@Override
protected Control createLabel(final Composite parent) {
final VDomainModelReference dmrToCheck = getDMRToMultiReference();
diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/AttributeSelectControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/AttributeSelectControlSWTRenderer.java
index 786e880..30f495d 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/AttributeSelectControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/AttributeSelectControlSWTRenderer.java
@@ -41,7 +41,6 @@
* @author Eugen Neufeld
*
*/
-@SuppressWarnings("restriction")
public class AttributeSelectControlSWTRenderer extends EditableEReferenceLabelControlSWTRenderer {
/**
diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/DMRSelectorControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/DMRSelectorControlSWTRenderer.java
index ca6822f..75d9a4b 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/DMRSelectorControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/DMRSelectorControlSWTRenderer.java
@@ -46,7 +46,6 @@
* @author Eugen Neufeld
*
*/
-@SuppressWarnings("restriction")
public class DMRSelectorControlSWTRenderer extends EditableEReferenceLabelControlSWTRenderer {
/**
diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/HexColorSelectionControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/HexColorSelectionControlSWTRenderer.java
index 9c74d01..96bcf9a 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/HexColorSelectionControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/HexColorSelectionControlSWTRenderer.java
@@ -32,7 +32,7 @@
import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedReport;
import org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding;
import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/URLSelectionControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/URLSelectionControlSWTRenderer.java
index e8ff02b..2cbff78 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/URLSelectionControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/URLSelectionControlSWTRenderer.java
@@ -38,7 +38,7 @@
import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedReport;
import org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding;
import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.viewers.ILabelProvider;
diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/ViewModelSelectControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/ViewModelSelectControlSWTRenderer.java
index 202cb52..fc33547 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/ViewModelSelectControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/ViewModelSelectControlSWTRenderer.java
@@ -48,7 +48,6 @@
* @author Eugen Neufeld
*
*/
-@SuppressWarnings("restriction")
public class ViewModelSelectControlSWTRenderer extends EditableEReferenceLabelControlSWTRenderer {
/**
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/controls/DataTypeControl.java b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/controls/DataTypeControl.java
index cdce36f..237d7ba 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/controls/DataTypeControl.java
+++ b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/controls/DataTypeControl.java
@@ -36,7 +36,7 @@
import org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding;
import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
import org.eclipse.emfforms.spi.editor.helpers.ResourceSetHelpers;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.fieldassist.AutoCompleteField;
import org.eclipse.jface.fieldassist.ComboContentAdapter;
import org.eclipse.jface.viewers.ArrayContentProvider;
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/controls/TypedElementBoundsRenderer.java b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/controls/TypedElementBoundsRenderer.java
index 047a50c..5e658bb 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/controls/TypedElementBoundsRenderer.java
+++ b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/controls/TypedElementBoundsRenderer.java
@@ -45,7 +45,7 @@
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridDescription;
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.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.swt.SWT;
@@ -215,14 +215,16 @@
final EObject domainObject = getViewModelContext().getDomainModel();
final DataBindingContext dbc = getDataBindingContext();
- final ISWTObservableValue lowerBoundSelectionTargetValue = WidgetProperties.selection().observe(lowerBound);
+ final ISWTObservableValue lowerBoundSelectionTargetValue = WidgetProperties.spinnerSelection()
+ .observe(lowerBound);
final IObservableValue lowerBoundModelValue = EMFEditObservables.observeValue(getEditingDomain(domainObject),
domainObject, EcorePackage.eINSTANCE.getETypedElement_LowerBound());
dbc.bindValue(lowerBoundSelectionTargetValue, lowerBoundModelValue);
final IObservableValue upperBoundModelValue = EMFEditObservables.observeValue(getEditingDomain(domainObject),
domainObject, EcorePackage.eINSTANCE.getETypedElement_UpperBound());
- final ISWTObservableValue upperBoundSelectionTargetValue = WidgetProperties.selection().observe(upperBound);
+ final ISWTObservableValue upperBoundSelectionTargetValue = WidgetProperties.spinnerSelection()
+ .observe(upperBound);
dbc.bindValue(upperBoundSelectionTargetValue, upperBoundModelValue);
bindUpperAndLowerBounds(dbc, lowerBoundModelValue, upperBoundModelValue);
@@ -242,7 +244,7 @@
});
/* The unbounded checkbox is selected, when the upperBound value is -1 (and vice versa) */
- final ISWTObservableValue unboundedSelectionTargetValue = WidgetProperties.selection().observe(unbounded);
+ final ISWTObservableValue unboundedSelectionTargetValue = WidgetProperties.buttonSelection().observe(unbounded);
dbc.bindValue(unboundedSelectionTargetValue, upperBoundModelValue,
new UpdateValueStrategy() {
@Override
diff --git a/bundles/org.eclipse.emfforms.ide.view.multisegment/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.ide.view.multisegment/META-INF/MANIFEST.MF
index 2a0d4c9..6c4df5e 100644
--- a/bundles/org.eclipse.emfforms.ide.view.multisegment/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.ide.view.multisegment/META-INF/MANIFEST.MF
@@ -37,6 +37,7 @@
org.eclipse.emf.edit.ui.dnd;version="0.0.0",
org.eclipse.emf.edit.ui.provider;version="0.0.0",
org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.jface.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/META-INF/MANIFEST.MF
index e7bd8f2..840861a 100644
--- a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/META-INF/MANIFEST.MF
@@ -26,6 +26,7 @@
org.eclipse.emf.edit.ui.provider;version="0.0.0",
org.eclipse.emfforms.spi.swt.core.di;version="[1.27.0,1.28.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.jface.resource;version="0.0.0",
org.eclipse.jface.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/src/org/eclipse/emfforms/internal/swt/categorization/expandbar/ExpandBarCategorizationElementRenderer.java b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/src/org/eclipse/emfforms/internal/swt/categorization/expandbar/ExpandBarCategorizationElementRenderer.java
index 5645081..5d1b339 100644
--- a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/src/org/eclipse/emfforms/internal/swt/categorization/expandbar/ExpandBarCategorizationElementRenderer.java
+++ b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/src/org/eclipse/emfforms/internal/swt/categorization/expandbar/ExpandBarCategorizationElementRenderer.java
@@ -53,7 +53,7 @@
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridDescription;
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.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.viewers.ISelectionChangedListener;
diff --git a/bundles/org.eclipse.emfforms.swt.control.multiattribute/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.control.multiattribute/META-INF/MANIFEST.MF
index fefbf2b..a473553 100644
--- a/bundles/org.eclipse.emfforms.swt.control.multiattribute/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.control.multiattribute/META-INF/MANIFEST.MF
@@ -29,6 +29,7 @@
org.eclipse.core.runtime;version="0.0.0",
org.eclipse.emf.edit.ui.provider;version="0.0.0",
org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.jface.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.control.multiattribute/src/org/eclipse/emfforms/spi/view/control/multiattribute/MultiAttributeSWTRenderer.java b/bundles/org.eclipse.emfforms.swt.control.multiattribute/src/org/eclipse/emfforms/spi/view/control/multiattribute/MultiAttributeSWTRenderer.java
index 4296c3a..3639e36 100644
--- a/bundles/org.eclipse.emfforms.swt.control.multiattribute/src/org/eclipse/emfforms/spi/view/control/multiattribute/MultiAttributeSWTRenderer.java
+++ b/bundles/org.eclipse.emfforms.swt.control.multiattribute/src/org/eclipse/emfforms/spi/view/control/multiattribute/MultiAttributeSWTRenderer.java
@@ -631,12 +631,11 @@
final CellEditor cellEditor = createCellEditor(tempInstance, attribute, tableViewer.getTable());
- @SuppressWarnings("deprecation")
- final IObservableValue textObservableValue = org.eclipse.jface.databinding.swt.SWTObservables
- .observeText(column.getColumn());
- @SuppressWarnings("deprecation")
- final IObservableValue tooltipObservableValue = org.eclipse.jface.databinding.swt.SWTObservables
- .observeTooltipText(column.getColumn());
+ final IObservableValue textObservableValue = org.eclipse.jface.databinding.swt.typed.WidgetProperties.text()
+ .observe(column.getColumn());
+ final IObservableValue tooltipObservableValue = org.eclipse.jface.databinding.swt.typed.WidgetProperties
+ .tooltipText()
+ .observe(column.getColumn());
try {
viewModelDBC.bindValue(textObservableValue, labelService
.getDisplayName(getVElement().getDomainModelReference(), getViewModelContext().getDomainModel()));
@@ -1042,12 +1041,12 @@
return getDataBindingContext().bindValue(target, model);
}
- @SuppressWarnings("deprecation")
protected IObservableValue doCreateCellEditorObservable(CellEditor cellEditor) {
if (ECPCellEditor.class.isInstance(cellEditor)) {
return ((ECPCellEditor) cellEditor).getValueProperty().observe(cellEditor);
}
- return org.eclipse.jface.databinding.swt.SWTObservables.observeText(cellEditor.getControl(), SWT.FocusOut);
+ return org.eclipse.jface.databinding.swt.typed.WidgetProperties.text(SWT.FocusOut)
+ .observe(cellEditor.getControl());
}
@Override
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/META-INF/MANIFEST.MF
index 6a3b577..0e962da 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/META-INF/MANIFEST.MF
@@ -23,6 +23,7 @@
Import-Package: javax.inject;version="1.0.0",
org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.27.0,1.28.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
org.eclipse.jface.fieldassist;version="0.0.0",
org.eclipse.jface.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/src/org/eclipse/emfforms/internal/swt/control/text/autocomplete/renderer/AutocompleteTextControlSWTRenderer.java b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/src/org/eclipse/emfforms/internal/swt/control/text/autocomplete/renderer/AutocompleteTextControlSWTRenderer.java
index d8fafac..eeb26b4 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/src/org/eclipse/emfforms/internal/swt/control/text/autocomplete/renderer/AutocompleteTextControlSWTRenderer.java
+++ b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/src/org/eclipse/emfforms/internal/swt/control/text/autocomplete/renderer/AutocompleteTextControlSWTRenderer.java
@@ -35,7 +35,7 @@
import org.eclipse.emfforms.spi.localization.LocalizationServiceHelper;
import org.eclipse.emfforms.spi.swt.control.text.autocomplete.viewservice.AutocompleteViewModelService;
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.fieldassist.AutoCompleteField;
import org.eclipse.jface.fieldassist.ComboContentAdapter;
import org.eclipse.jface.viewers.ArrayContentProvider;
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/src/org/eclipse/emfforms/spi/swt/control/text/richtext/renderer/RichTextControlSWTRenderer.java b/bundles/org.eclipse.emfforms.swt.control.text.richtext/src/org/eclipse/emfforms/spi/swt/control/text/richtext/renderer/RichTextControlSWTRenderer.java
index c079ef1..d413937 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.richtext/src/org/eclipse/emfforms/spi/swt/control/text/richtext/renderer/RichTextControlSWTRenderer.java
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/src/org/eclipse/emfforms/spi/swt/control/text/richtext/renderer/RichTextControlSWTRenderer.java
@@ -29,7 +29,7 @@
import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
import org.eclipse.emfforms.spi.swt.core.layout.EMFFormsSWTLayoutUtil;
import org.eclipse.emfforms.spi.swt.core.util.PopupWindow;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.emfforms.swt.table/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.table/META-INF/MANIFEST.MF
index 024a3c2..e52613a 100644
--- a/bundles/org.eclipse.emfforms.swt.table/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.table/META-INF/MANIFEST.MF
@@ -22,6 +22,7 @@
Import-Package: org.eclipse.emfforms.spi.localization;version="[1.27.0,1.28.0)",
org.eclipse.jface.bindings.keys;version="0.0.0",
org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.swt.typed;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
org.eclipse.jface.dialogs;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/internal/swt/table/util/DMREditingSupport.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/internal/swt/table/util/DMREditingSupport.java
index bc17308..38f9f82 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/internal/swt/table/util/DMREditingSupport.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/internal/swt/table/util/DMREditingSupport.java
@@ -21,7 +21,7 @@
import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedException;
import org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ColumnViewer;
import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/AbstractTableViewerColumnBuilder.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/AbstractTableViewerColumnBuilder.java
index a221479..423b445 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/AbstractTableViewerColumnBuilder.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/AbstractTableViewerColumnBuilder.java
@@ -18,7 +18,7 @@
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.emf.databinding.EMFDataBindingContext;
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.viewers.AbstractTableViewer;
import org.eclipse.jface.viewers.ViewerColumn;
import org.eclipse.swt.widgets.Item;
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/AbstractTableViewerComposite.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/AbstractTableViewerComposite.java
index e75ad15..5328436 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/AbstractTableViewerComposite.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/AbstractTableViewerComposite.java
@@ -26,7 +26,7 @@
import org.eclipse.emfforms.spi.swt.table.action.ActionBar;
import org.eclipse.emfforms.spi.swt.table.action.ActionBarProvider;
import org.eclipse.emfforms.spi.swt.table.action.ActionConfiguration;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.layout.AbstractColumnLayout;
import org.eclipse.jface.viewers.AbstractTableViewer;
import org.eclipse.jface.viewers.ColumnPixelData;
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/DefaultTableViewerColumnBuilder.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/DefaultTableViewerColumnBuilder.java
index 19c5d35..62452a4 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/DefaultTableViewerColumnBuilder.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/DefaultTableViewerColumnBuilder.java
@@ -14,7 +14,7 @@
package org.eclipse.emfforms.spi.swt.table;
import org.eclipse.emfforms.common.Optional;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.viewers.EditingSupport;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TableViewerColumn;
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF
index b9970e6..ce479f0 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF
@@ -29,6 +29,7 @@
org.eclipse.emfforms.spi.localization;version="[1.27.0,1.28.0)",
org.eclipse.jface.action;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
+ org.eclipse.jface.databinding.viewers.typed;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.jface.resource;version="0.0.0",
org.eclipse.jface.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/TreeMasterDetailComposite.java b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/TreeMasterDetailComposite.java
index b6728d8..faaddf5 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/TreeMasterDetailComposite.java
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/TreeMasterDetailComposite.java
@@ -55,7 +55,7 @@
import org.eclipse.emfforms.spi.core.services.reveal.EMFFormsRevealService;
import org.eclipse.emfforms.spi.swt.treemasterdetail.util.DetailPanelRenderingFinishedCallback;
import org.eclipse.emfforms.spi.swt.treemasterdetail.util.RootObject;
-import org.eclipse.jface.databinding.viewers.ViewersObservables;
+import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
@@ -196,8 +196,7 @@
detailManager.layoutDetailParent(detailParent);
/* enable optional delayed update mechanism */
- IObservableValue<?> treeViewerSelectionObservable = ViewersObservables
- .observeSingleSelection(treeViewer);
+ IObservableValue<?> treeViewerSelectionObservable = ViewerProperties.singleSelection().observe(treeViewer);
if (renderDelay > 0) {
treeViewerSelectionObservable = new DelayedObservableValue<>(renderDelay,
treeViewerSelectionObservable);
diff --git a/features/org.eclipse.emf.ecp.target.feature/feature.xml b/features/org.eclipse.emf.ecp.target.feature/feature.xml
index 834df87..e12bd18 100644
--- a/features/org.eclipse.emf.ecp.target.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.target.feature/feature.xml
@@ -531,13 +531,6 @@
unpack="false"/>
<plugin
- id="org.apache.batik.util.gui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.e4.ui.widgets"
download-size="0"
install-size="0"
@@ -834,20 +827,6 @@
unpack="false"/>
<plugin
- id="org.sat4j.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.sat4j.pb"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.equinox.simpleconfigurator"
download-size="0"
install-size="0"
@@ -915,4 +894,25 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.e4.ui.progress"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.sat4j.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.sat4j.pb"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.application.e4.product b/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.application.e4.product
index aa56202..44f392a 100644
--- a/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.application.e4.product
+++ b/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.application.e4.product
@@ -35,7 +35,6 @@
<plugin id="javax.xml"/>
<plugin id="org.apache.batik.css"/>
<plugin id="org.apache.batik.util"/>
- <plugin id="org.apache.batik.util.gui"/>
<plugin id="org.apache.commons.codec"/>
<plugin id="org.apache.commons.jxpath"/>
<plugin id="org.apache.commons.logging"/>
diff --git a/releng/org.eclipse.emf.ecp.rap.products/org.eclipse.emf.ecp.rap.product b/releng/org.eclipse.emf.ecp.rap.products/org.eclipse.emf.ecp.rap.product
index 1473bb8..4d34b2c 100644
--- a/releng/org.eclipse.emf.ecp.rap.products/org.eclipse.emf.ecp.rap.product
+++ b/releng/org.eclipse.emf.ecp.rap.products/org.eclipse.emf.ecp.rap.product
@@ -33,7 +33,7 @@
<plugin id="com.ibm.icu"/>
<plugin id="javax.annotation"/>
<plugin id="javax.inject"/>
- <plugin id="javax.servlet"/>
+ <plugin id="javax.servlet.jsp-api"/>
<plugin id="javax.xml"/>
<plugin id="org.apache.batik.constants"/>
<plugin id="org.apache.batik.css"/>
diff --git a/releng/org.eclipse.emf.ecp.target.next/next.target b/releng/org.eclipse.emf.ecp.target.next/next.target
index c8126d1..0ab2428 100644
--- a/releng/org.eclipse.emf.ecp.target.next/next.target
+++ b/releng/org.eclipse.emf.ecp.target.next/next.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="ECP RCP" sequenceNumber="1656665160">
+<target name="ECP RCP" sequenceNumber="1667215291">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -14,7 +14,10 @@
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.25-I-builds/"/>
+ <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
+ <unit id="org.sat4j.core" version="0.0.0"/>
+ <unit id="org.sat4j.pb" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/4.26-I-builds/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.emfstore.client.feature.feature.group" version="0.0.0"/>
@@ -28,27 +31,22 @@
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.mockito.mockito-core-hamcrest-modified" version="1.9.5"/>
+ <unit id="org.objenesis" version="1.4.0"/>
<repository location="https://download.eclipse.org/rt/rap/base-platforms/3.14/extra-dependencies/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="com.google.gson" version="2.2.4.v201311231704"/>
- <unit id="com.google.gson.source" version="2.2.4.v201311231704"/>
- <unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
- <unit id="javax.validation.source" version="1.0.0.GA_v201205091237"/>
- <unit id="javax.xml" version="1.3.4.v201005080400"/>
- <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
- <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
+ <unit id="com.google.gson" version="2.9.0.v20220704-0629"/>
+ <unit id="com.google.gson.source" version="2.9.0.v20220704-0629"/>
+ <unit id="javax.validation" version="1.1.0.v20200505-2127"/>
+ <unit id="javax.validation.source" version="1.1.0.v20200505-2127"/>
+ <unit id="javax.xml" version="1.4.1.v20220503-2331"/>
+ <unit id="org.apache.log4j" version="1.2.19.v20220208-1728"/>
+ <unit id="org.apache.log4j.source" version="1.2.19.v20220208-1728"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
- <unit id="org.h2" version="1.3.168.v201212121212"/>
- <unit id="org.h2.source" version="1.3.168.v201212121212"/>
<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
<unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
<unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
- <unit id="org.objenesis" version="1.0.0.v201505121915"/>
- <unit id="org.objenesis.source" version="1.0.0.v201505121915"/>
- <unit id="org.sat4j.pb" version="2.3.5.v201404071733"/>
- <unit id="org.sat4j.core" version="2.3.5.v201308161310"/>
- <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
+ <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.edapt.runtime.feature.feature.group" version="0.0.0"/>
@@ -78,7 +76,7 @@
<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rap.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.rap.sdk.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/releases/2022-09"/>
+ <repository location="http://download.eclipse.org/releases/2022-12"/>
</location>
</locations>
</target>
diff --git a/releng/org.eclipse.emf.ecp.target.next/next.tpd b/releng/org.eclipse.emf.ecp.target.next/next.tpd
index b3b0906..fd6949a 100644
--- a/releng/org.eclipse.emf.ecp.target.next/next.tpd
+++ b/releng/org.eclipse.emf.ecp.target.next/next.tpd
@@ -10,9 +10,12 @@
org.eclipse.swtbot.feature.group lazy
}
-location "http://download.eclipse.org/eclipse/updates/4.25-I-builds/" {
+location "http://download.eclipse.org/eclipse/updates/4.26-I-builds/" {
org.eclipse.equinox.sdk.feature.group lazy
org.eclipse.platform.ide lazy
+ org.eclipse.e4.ui.progress lazy
+ org.sat4j.core lazy
+ org.sat4j.pb lazy
}
location "http://download.eclipse.org/emfstore/releases_19" {
@@ -27,26 +30,21 @@
location "https://download.eclipse.org/rt/rap/base-platforms/3.14/extra-dependencies/" {
org.mockito.mockito-core-hamcrest-modified [1.9.5,1.9.5]
+ org.objenesis [1.4.0,2.0.0)
}
-location "https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/" {
- com.google.gson [2.2.4.v201311231704,2.2.4.v201311231704]
- com.google.gson.source [2.2.4.v201311231704,2.2.4.v201311231704]
- javax.validation [1.0.0.GA_v201205091237,1.0.0.GA_v201205091237]
- javax.validation.source [1.0.0.GA_v201205091237,1.0.0.GA_v201205091237]
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/" {
+ com.google.gson [2.9.0,3.0.0)
+ com.google.gson.source [2.9.0,3.0.0)
+ javax.validation [1.1.0,2.0.0)
+ javax.validation.source [1.1.0,2.0.0)
javax.xml [1.3.4,2.0.0)
- org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815]
- org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815]
+ org.apache.log4j [1.2.19,2.0.0)
+ org.apache.log4j.source [1.2.19,2.0.0)
org.apache.commons.codec [1.6.0,2.0.0)
- org.h2 [1.3.168.v201212121212,1.3.168.v201212121212]
- org.h2.source [1.3.168.v201212121212,1.3.168.v201212121212]
org.hamcrest.core [1.3.0,1.4.0)
org.hamcrest.library [1.3.0,1.4.0)
org.hamcrest.library.source [1.3.0,1.4.0)
- org.objenesis [1.0.0.v201505121915,1.0.0.v201505121915]
- org.objenesis.source [1.0.0.v201505121915,1.0.0.v201505121915]
- org.sat4j.pb [2.3.5,3.0.0)
- org.sat4j.core [2.3.5,3.0.0)
}
location "http://download.eclipse.org/edapt/releases/15x" {
@@ -58,7 +56,7 @@
org.eclipse.nebula.widgets.grid.feature.feature.group lazy
}
-location "http://download.eclipse.org/releases/2022-09" {
+location "http://download.eclipse.org/releases/2022-12" {
org.eclipse.emf.cdo.sdk.feature.group lazy
org.eclipse.emf.sdk.feature.group lazy
org.eclipse.emf.transaction.sdk.feature.group lazy
diff --git a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target
index 9e3c526..1714a81 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target
+++ b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="ECP RAP" sequenceNumber="1653379010">
+<target name="ECP RAP" sequenceNumber="1667215493">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -14,10 +14,14 @@
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.20"/>
+ <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
+ <unit id="org.sat4j.core" version="0.0.0"/>
+ <unit id="org.sat4j.pb" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/4.25"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.mockito.mockito-core-hamcrest-modified" version="1.9.5"/>
+ <unit id="org.objenesis" version="1.4.0"/>
<repository location="https://download.eclipse.org/rt/rap/base-platforms/3.14/extra-dependencies/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
@@ -45,11 +49,10 @@
<unit id="org.eclipse.net4j.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ocl.all.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
- <repository location="http://download.eclipse.org/releases/2021-06"/>
+ <repository location="http://download.eclipse.org/releases/2022-09"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.emfstore.client.ui.rap.feature.feature.group" version="0.0.0"/>
@@ -62,21 +65,19 @@
<repository location="http://download.eclipse.org/emfstore/releases_19"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="javax.servlet" version="0.0.0"/>
- <unit id="com.google.gson" version="2.2.4.v201311231704"/>
- <unit id="com.google.gson.source" version="2.2.4.v201311231704"/>
- <unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
- <unit id="javax.validation.source" version="1.0.0.GA_v201205091237"/>
- <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
- <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
- <unit id="org.h2" version="1.3.168.v201212121212"/>
- <unit id="org.h2.source" version="1.3.168.v201212121212"/>
+ <unit id="jakarta.servlet" version="0.0.0"/>
+ <unit id="com.google.gson" version="2.9.0.v20220704-0629"/>
+ <unit id="com.google.gson.source" version="2.9.0.v20220704-0629"/>
+ <unit id="javax.validation" version="1.1.0.v20200505-2127"/>
+ <unit id="javax.validation.source" version="1.1.0.v20200505-2127"/>
+ <unit id="javax.xml" version="1.4.1.v20220503-2331"/>
+ <unit id="org.apache.log4j" version="1.2.19.v20220208-1728"/>
+ <unit id="org.apache.log4j.source" version="1.2.19.v20220208-1728"/>
+ <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
<unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
<unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
- <unit id="org.objenesis" version="1.0.0.v201505121915"/>
- <unit id="org.objenesis.source" version="1.0.0.v201505121915"/>
- <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/"/>
+ <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/"/>
</location>
</locations>
</target>
diff --git a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.tpd b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.tpd
index 61ec5f4..0c7741a 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.tpd
+++ b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.tpd
@@ -4,7 +4,7 @@
include "../org.eclipse.emf.ecp.target.rcp/ecp.tpd"
-location "http://download.eclipse.org/releases/2021-06" {
+location "http://download.eclipse.org/releases/2022-09" {
org.eclipse.rap.equinox.target.feature.feature.group lazy
org.eclipse.rap.feature.feature.group lazy
org.eclipse.rap.sdk.feature.feature.group lazy
@@ -15,8 +15,8 @@
org.eclipse.emf.emfstore.client.ui.rap.feature.feature.group lazy
}
-location "https://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/" {
- javax.servlet lazy
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/" {
+ jakarta.servlet lazy
}
diff --git a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target
index 64c8ffd..a6b54e1 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target
+++ b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="ECP RAP with ECP" sequenceNumber="1653379001">
+<target name="ECP RAP with ECP" sequenceNumber="1667215515">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -14,10 +14,14 @@
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.20"/>
+ <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
+ <unit id="org.sat4j.core" version="0.0.0"/>
+ <unit id="org.sat4j.pb" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/4.25"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.mockito.mockito-core-hamcrest-modified" version="1.9.5"/>
+ <unit id="org.objenesis" version="1.4.0"/>
<repository location="https://download.eclipse.org/rt/rap/base-platforms/3.14/extra-dependencies/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
@@ -45,11 +49,10 @@
<unit id="org.eclipse.net4j.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ocl.all.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
- <repository location="http://download.eclipse.org/releases/2021-06"/>
+ <repository location="http://download.eclipse.org/releases/2022-09"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.emfstore.client.ui.rap.feature.feature.group" version="0.0.0"/>
@@ -62,21 +65,19 @@
<repository location="http://download.eclipse.org/emfstore/releases_19"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="javax.servlet" version="0.0.0"/>
- <unit id="com.google.gson" version="2.2.4.v201311231704"/>
- <unit id="com.google.gson.source" version="2.2.4.v201311231704"/>
- <unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
- <unit id="javax.validation.source" version="1.0.0.GA_v201205091237"/>
- <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
- <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
- <unit id="org.h2" version="1.3.168.v201212121212"/>
- <unit id="org.h2.source" version="1.3.168.v201212121212"/>
+ <unit id="jakarta.servlet" version="0.0.0"/>
+ <unit id="com.google.gson" version="2.9.0.v20220704-0629"/>
+ <unit id="com.google.gson.source" version="2.9.0.v20220704-0629"/>
+ <unit id="javax.validation" version="1.1.0.v20200505-2127"/>
+ <unit id="javax.validation.source" version="1.1.0.v20200505-2127"/>
+ <unit id="javax.xml" version="1.4.1.v20220503-2331"/>
+ <unit id="org.apache.log4j" version="1.2.19.v20220208-1728"/>
+ <unit id="org.apache.log4j.source" version="1.2.19.v20220208-1728"/>
+ <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
<unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
<unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
- <unit id="org.objenesis" version="1.0.0.v201505121915"/>
- <unit id="org.objenesis.source" version="1.0.0.v201505121915"/>
- <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/"/>
+ <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.ecp.rap.sdk.feature.feature.group" version="0.0.0"/>
diff --git a/releng/org.eclipse.emf.ecp.target.rcp/ecp.target b/releng/org.eclipse.emf.ecp.target.rcp/ecp.target
index 958db37..40d7b08 100644
--- a/releng/org.eclipse.emf.ecp.target.rcp/ecp.target
+++ b/releng/org.eclipse.emf.ecp.target.rcp/ecp.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="ECP RCP" sequenceNumber="1653379022">
+<target name="ECP RCP" sequenceNumber="1667218097">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -14,7 +14,10 @@
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.20"/>
+ <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
+ <unit id="org.sat4j.core" version="0.0.0"/>
+ <unit id="org.sat4j.pb" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/4.25"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.emfstore.client.feature.feature.group" version="0.0.0"/>
@@ -27,23 +30,23 @@
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.mockito.mockito-core-hamcrest-modified" version="1.9.5"/>
+ <unit id="org.objenesis" version="1.4.0"/>
<repository location="https://download.eclipse.org/rt/rap/base-platforms/3.14/extra-dependencies/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="com.google.gson" version="2.2.4.v201311231704"/>
- <unit id="com.google.gson.source" version="2.2.4.v201311231704"/>
- <unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
- <unit id="javax.validation.source" version="1.0.0.GA_v201205091237"/>
- <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
- <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
- <unit id="org.h2" version="1.3.168.v201212121212"/>
- <unit id="org.h2.source" version="1.3.168.v201212121212"/>
+ <unit id="com.google.gson" version="2.9.0.v20220704-0629"/>
+ <unit id="com.google.gson.source" version="2.9.0.v20220704-0629"/>
+ <unit id="javax.validation" version="1.1.0.v20200505-2127"/>
+ <unit id="javax.validation.source" version="1.1.0.v20200505-2127"/>
+ <unit id="javax.xml" version="1.4.1.v20220503-2331"/>
+ <unit id="org.apache.log4j" version="1.2.19.v20220208-1728"/>
+ <unit id="org.apache.log4j.source" version="1.2.19.v20220208-1728"/>
+ <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
+ <unit id="org.apache.commons.fileupload" version="1.3.2.v20170320-2229"/>
<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
<unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
<unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
- <unit id="org.objenesis" version="1.0.0.v201505121915"/>
- <unit id="org.objenesis.source" version="1.0.0.v201505121915"/>
- <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/"/>
+ <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.edapt.runtime.feature.feature.group" version="0.0.0"/>
@@ -66,11 +69,10 @@
<unit id="org.eclipse.net4j.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ocl.all.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
- <repository location="http://download.eclipse.org/releases/2021-06"/>
+ <repository location="http://download.eclipse.org/releases/2022-09"/>
</location>
</locations>
</target>
diff --git a/releng/org.eclipse.emf.ecp.target.rcp/ecp.tpd b/releng/org.eclipse.emf.ecp.target.rcp/ecp.tpd
index 0477724..c9792d1 100644
--- a/releng/org.eclipse.emf.ecp.target.rcp/ecp.tpd
+++ b/releng/org.eclipse.emf.ecp.target.rcp/ecp.tpd
@@ -10,9 +10,12 @@
org.eclipse.swtbot.feature.group lazy
}
-location "http://download.eclipse.org/eclipse/updates/4.20" {
+location "http://download.eclipse.org/eclipse/updates/4.25" {
org.eclipse.equinox.sdk.feature.group lazy
org.eclipse.platform.ide lazy
+ org.eclipse.e4.ui.progress lazy
+ org.sat4j.core lazy
+ org.sat4j.pb lazy
}
location "http://download.eclipse.org/emfstore/releases_19" {
@@ -26,22 +29,22 @@
location "https://download.eclipse.org/rt/rap/base-platforms/3.14/extra-dependencies/" {
org.mockito.mockito-core-hamcrest-modified [1.9.5,1.9.5]
+ org.objenesis [1.4.0,2.0.0)
}
-location "https://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/" {
- com.google.gson [2.2.4.v201311231704,2.2.4.v201311231704]
- com.google.gson.source [2.2.4.v201311231704,2.2.4.v201311231704]
- javax.validation [1.0.0.GA_v201205091237,1.0.0.GA_v201205091237]
- javax.validation.source [1.0.0.GA_v201205091237,1.0.0.GA_v201205091237]
- org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815]
- org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815]
- org.h2 [1.3.168.v201212121212,1.3.168.v201212121212]
- org.h2.source [1.3.168.v201212121212,1.3.168.v201212121212]
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/" {
+ com.google.gson [2.9.0,3.0.0)
+ com.google.gson.source [2.9.0,3.0.0)
+ javax.validation [1.1.0,2.0.0)
+ javax.validation.source [1.1.0,2.0.0)
+ javax.xml [1.3.4,2.0.0)
+ org.apache.log4j [1.2.19,2.0.0)
+ org.apache.log4j.source [1.2.19,2.0.0)
+ org.apache.commons.codec [1.14.0,2.0.0)
+ org.apache.commons.fileupload [1.3.2,2.0.0)
org.hamcrest.core [1.3.0,1.4.0)
org.hamcrest.library [1.3.0,1.4.0)
org.hamcrest.library.source [1.3.0,1.4.0)
- org.objenesis [1.0.0.v201505121915,1.0.0.v201505121915]
- org.objenesis.source [1.0.0.v201505121915,1.0.0.v201505121915]
}
location "http://download.eclipse.org/edapt/releases/15x" {
@@ -53,7 +56,7 @@
org.eclipse.nebula.widgets.grid.feature.feature.group lazy
}
-location "http://download.eclipse.org/releases/2021-06" {
+location "http://download.eclipse.org/releases/2022-09" {
org.eclipse.emf.cdo.sdk.feature.group lazy
org.eclipse.emf.sdk.feature.group lazy
org.eclipse.emf.transaction.sdk.feature.group lazy
@@ -65,7 +68,6 @@
org.eclipse.net4j.sdk.feature.group lazy
org.eclipse.ocl.all.sdk.feature.group lazy
org.eclipse.pde.feature.group lazy
- org.eclipse.xpand.sdk.feature.group lazy
org.eclipse.xtend.sdk.feature.group lazy
org.eclipse.xtext.sdk.feature.group lazy
com.google.guava [30.1.0,31.0.0)
diff --git a/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.target/emfforms_spreadsheet.target b/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.target/emfforms_spreadsheet.target
index 9dd09a8..f05211e 100644
--- a/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.target/emfforms_spreadsheet.target
+++ b/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.target/emfforms_spreadsheet.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="emfforms_spreadsheet" sequenceNumber="1653379035">
+<target name="emfforms_spreadsheet" sequenceNumber="1667221720">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -14,7 +14,10 @@
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.20"/>
+ <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
+ <unit id="org.sat4j.core" version="0.0.0"/>
+ <unit id="org.sat4j.pb" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/4.25"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.emfstore.client.feature.feature.group" version="0.0.0"/>
@@ -27,9 +30,25 @@
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.mockito.mockito-core-hamcrest-modified" version="1.9.5"/>
+ <unit id="org.objenesis" version="1.4.0"/>
<repository location="https://download.eclipse.org/rt/rap/base-platforms/3.14/extra-dependencies/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+ <unit id="com.google.gson" version="2.9.0.v20220704-0629"/>
+ <unit id="com.google.gson.source" version="2.9.0.v20220704-0629"/>
+ <unit id="javax.validation" version="1.1.0.v20200505-2127"/>
+ <unit id="javax.validation.source" version="1.1.0.v20200505-2127"/>
+ <unit id="javax.xml" version="1.4.1.v20220503-2331"/>
+ <unit id="org.apache.log4j" version="1.2.19.v20220208-1728"/>
+ <unit id="org.apache.log4j.source" version="1.2.19.v20220208-1728"/>
+ <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
+ <unit id="org.apache.commons.fileupload" version="1.3.2.v20170320-2229"/>
+ <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
+ <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
+ <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
+ <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/"/>
+ </location>
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.edapt.runtime.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.edapt.runtime.feature.source.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/edapt/releases/15x"/>
@@ -50,29 +69,15 @@
<unit id="org.eclipse.net4j.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ocl.all.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
- <repository location="http://download.eclipse.org/releases/2021-06"/>
+ <repository location="http://download.eclipse.org/releases/2022-09"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.apache.commons.codec" version="0.0.0"/>
<unit id="org.apache.poi" version="0.0.0"/>
<unit id="org.apache.poi.source" version="0.0.0"/>
- <unit id="com.google.gson" version="2.2.4.v201311231704"/>
- <unit id="com.google.gson.source" version="2.2.4.v201311231704"/>
- <unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
- <unit id="javax.validation.source" version="1.0.0.GA_v201205091237"/>
- <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
- <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
- <unit id="org.h2" version="1.3.168.v201212121212"/>
- <unit id="org.h2.source" version="1.3.168.v201212121212"/>
- <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
- <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
- <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
- <unit id="org.objenesis" version="1.0.0.v201505121915"/>
- <unit id="org.objenesis.source" version="1.0.0.v201505121915"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/"/>
</location>
</locations>
diff --git a/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF
index 001e7e4..d8e2046 100644
--- a/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF
@@ -18,8 +18,7 @@
org.eclipse.emf.ecp.view.model;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,1.10.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.27.0,1.28.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.emfforms.common;bundle-version="[1.27.0,1.28.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.ide.util.test
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/META-INF/MANIFEST.MF
index 7343a34..f1b93ba 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/META-INF/MANIFEST.MF
@@ -20,7 +20,6 @@
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
org.eclipse.emf.ecp.view.group.model;bundle-version="[1.27.0,1.28.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.ecp.test.common;bundle-version="[1.27.0,1.28.0)",
org.eclipse.swtbot.swt.finder;bundle-version="[4.0.0,5.0.0)",
org.apache.log4j;bundle-version="[1.2.15,2.0.0)",
diff --git a/tests/org.eclipse.emf.ecp.ui.view.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.swt.test/META-INF/MANIFEST.MF
index 4f63159..a5b4266 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.swt.test/META-INF/MANIFEST.MF
@@ -30,8 +30,7 @@
org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.27.0,1.28.0)",
- org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.swt.test
Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.27.0,1.28.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/META-INF/MANIFEST.MF
index 598908f..3829cab 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@
Export-Package: org.eclipse.emf.ecp.view.categorization.model.edit.test;version="1.27.0";x-internal:=true,
org.eclipse.emf.ecp.view.spi.categorization.model.provider;version="1.27.0"
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.categorization.model.edit.test
diff --git a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/META-INF/MANIFEST.MF
index 8566ceb..8f1f7ab 100644
--- a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/META-INF/MANIFEST.MF
@@ -13,7 +13,6 @@
org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.9.0,2.0.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.hamcrest.library;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.core.swt.tests/META-INF/MANIFEST.MF
index 729fb37..64af211 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/META-INF/MANIFEST.MF
@@ -31,11 +31,10 @@
org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.27.0,1.28.0)",
- org.objenesis;bundle-version="1.0.0",
org.eclipse.emfforms.swt.common.test;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.core.swt.tests
-Import-Package: com.ibm.icu.text;version="52.1.1",
+Import-Package: com.ibm.icu.text;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0"
diff --git a/tests/org.eclipse.emf.ecp.view.migrator.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.migrator.test/META-INF/MANIFEST.MF
index 8d176a3..ff449d3 100644
--- a/tests/org.eclipse.emf.ecp.view.migrator.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.migrator.test/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@
Fragment-Host: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.27.0,1.28.0)"
Export-Package: org.eclipse.emf.ecp.spi.view.migrator;version="1.27.0"
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.migrator.test
diff --git a/tests/org.eclipse.emf.ecp.view.model.preview.common.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.preview.common.test/META-INF/MANIFEST.MF
index fd39165..5b0dbe2 100644
--- a/tests/org.eclipse.emf.ecp.view.model.preview.common.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.preview.common.test/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@
Export-Package: org.eclipse.emf.ecp.view.model.preview.common.test;version="0.0.0"
Require-Bundle: org.eclipse.swt;bundle-version="[3.106.2,4.0.0)",
org.junit;bundle-version="[4.12.0,5.0.0)",
- org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.model.preview.common.test
diff --git a/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/META-INF/MANIFEST.MF
index e99ae01..eec771f 100644
--- a/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@
Fragment-Host: org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.27.0,1.28.0)"
Export-Package: org.eclipse.emf.ecp.view.model.generator;version="1.27.0"
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.model.provider.generator.test
diff --git a/tests/org.eclipse.emf.ecp.view.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.test/META-INF/MANIFEST.MF
index c246c3a..0fd8fe7 100644
--- a/tests/org.eclipse.emf.ecp.view.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.test/META-INF/MANIFEST.MF
@@ -9,8 +9,7 @@
org.eclipse.emf.ecp.view.spi.model;version="1.27.0"
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="1.0.0"
+ org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.model.test
Import-Package: org.eclipse.emf.ecp.view.spi.group.model;version="[1.27.0,1.28.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF
index 1c3783b..1896419 100644
--- a/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF
@@ -30,8 +30,7 @@
org.eclipse.emf.ecp.validation;bundle-version="[1.27.0,1.28.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="1.9.5",
org.eclipse.emfforms.core.services.emf;bundle-version="[1.27.0,1.28.0)",
- org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.rule.test
Import-Package: org.eclipse.emf.ecp.view.spi.validation;version="[1.27.0,1.28.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/META-INF/MANIFEST.MF
index 421e7fe..c65e747 100644
--- a/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@
Export-Package: org.eclipse.emf.ecp.view.spi.section.swt;version="1.27.0"
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.0,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.ecp.test.common;bundle-version="[1.27.0,1.28.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.section.ui.swt.test
diff --git a/tests/org.eclipse.emf.ecp.view.table.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.model.test/META-INF/MANIFEST.MF
index 844b761..3db5451 100644
--- a/tests/org.eclipse.emf.ecp.view.table.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.model.test/META-INF/MANIFEST.MF
@@ -9,7 +9,6 @@
org.eclipse.emf.ecp.view.table.model.test;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.4.0,2.0.0)",
- org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.table.model.test
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/META-INF/MANIFEST.MF
index 3f74888..116a0e9 100644
--- a/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/META-INF/MANIFEST.MF
@@ -30,8 +30,7 @@
org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.27.0,1.28.0)",
org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.view.table.ui.nebula.grid.test
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF
index 6010018..47c5d5f 100644
--- a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF
@@ -43,7 +43,6 @@
org.eclipse.emf.edit;bundle-version="[2.11.1,3.0.0)",
org.eclipse.emf.ecp.edit.swt;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.27.0,1.28.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
org.eclipse.emfforms.core.services.segments.multi;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emf.ecp.test.common;bundle-version="[1.27.0,1.28.0)",
diff --git a/tests/org.eclipse.emf.ecp.view.table.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.validation.test/META-INF/MANIFEST.MF
index 8b4d9f9..8407bb6 100644
--- a/tests/org.eclipse.emf.ecp.view.table.validation.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.validation.test/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@
org.eclipse.emf.ecp.view.table.validation.test;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
org.eclipse.emf.ecp.test.common;bundle-version="[1.27.0,1.28.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.view.template.service.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.template.service.test/META-INF/MANIFEST.MF
index c272607..94d4af0 100644
--- a/tests/org.eclipse.emf.ecp.view.template.service.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.template.service.test/META-INF/MANIFEST.MF
@@ -11,8 +11,7 @@
Require-Bundle: org.eclipse.emf.ecp.view.label.model;bundle-version="[1.27.0,1.28.0)",
org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.27.0,1.28.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.27.0,1.28.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.template.service.test
Import-Package: org.eclipse.emf.edit.domain;version="0.0.0",
diff --git a/tests/org.eclipse.emf.ecp.view.template.tooling.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.template.tooling.test/META-INF/MANIFEST.MF
index b2a9f68..408e4d3 100644
--- a/tests/org.eclipse.emf.ecp.view.template.tooling.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.template.tooling.test/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@
Export-Package: org.eclipse.emf.ecp.view.template.internal.tooling.controls;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.ecp.test.common;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.27.0,1.28.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF
index 96d7498..1d0ecf2 100644
--- a/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.ecp.view.model;bundle-version="[1.27.0,1.28.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.test.common
diff --git a/tests/org.eclipse.emfforms.common.validation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.common.validation.tests/META-INF/MANIFEST.MF
index aec6b4b..8109568 100644
--- a/tests/org.eclipse.emfforms.common.validation.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.common.validation.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,6 @@
org.eclipse.emfforms.common.validation.tests;version="1.27.0"
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.common.validation.tests
diff --git a/tests/org.eclipse.emfforms.core.bazaar.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.bazaar.tests/META-INF/MANIFEST.MF
index 20e1e74..aabfe53 100644
--- a/tests/org.eclipse.emfforms.core.bazaar.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.bazaar.tests/META-INF/MANIFEST.MF
@@ -6,8 +6,7 @@
Fragment-Host: org.eclipse.emfforms.core.bazaar;bundle-version="[1.27.0,1.28.0)"
Export-Package: org.eclipse.emfforms.bazaar.internal;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.bazaar.tests
Import-Package: org.eclipse.core.runtime;version="[3.5.0,4.0.0)",
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/META-INF/MANIFEST.MF
index 78d6538..bf96d8e 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@
org.eclipse.emfforms.internal.core.services.databinding.featurepath;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.27.0,1.28.0)"
Import-Package: org.osgi.framework;version="[1.1.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.index.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.index.tests/META-INF/MANIFEST.MF
index 16015b4..c66f66f 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.index.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.index.tests/META-INF/MANIFEST.MF
@@ -9,8 +9,7 @@
org.eclipse.emfforms.internal.core.services.databinding.index;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.27.0,1.28.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.27.0,1.28.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.index.tests
Import-Package: org.osgi.framework;version="[1.3.0,2.0.0]"
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/META-INF/MANIFEST.MF
index 670bb19..74d8c61 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/META-INF/MANIFEST.MF
@@ -11,7 +11,6 @@
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.11.0,3.0.0)",
org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.27.0,1.28.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.27.0,1.28.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.27.0,1.28.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.keyattribute.tests
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/META-INF/MANIFEST.MF
index 1721408..c87e3a2 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/META-INF/MANIFEST.MF
@@ -9,8 +9,7 @@
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.27.0,1.28.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.27.0,1.28.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.27.0,1.28.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.mapping.tests
Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.datatemplate.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.datatemplate.test/META-INF/MANIFEST.MF
index 6fb8705..5ebc857 100644
--- a/tests/org.eclipse.emfforms.core.services.datatemplate.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.datatemplate.test/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@
org.eclipse.emfforms.internal.core.services.datatemplate;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF
index ffdb8f1..89dc4a2 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF
@@ -9,8 +9,7 @@
org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.27.0,1.28.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.27.0,1.28.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.domainexpander.default.tests
Import-Package: org.osgi.framework;version="1.3.0"
diff --git a/tests/org.eclipse.emfforms.core.services.emf.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.emf.tests/META-INF/MANIFEST.MF
index 52bb360..2f55d2e 100644
--- a/tests/org.eclipse.emfforms.core.services.emf.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.emf.tests/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.eclipse.emf.ecp.test.common;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.27.0,1.28.0)",
- org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.emf.tests
diff --git a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/META-INF/MANIFEST.MF
index f4161ed..7dad6d3 100644
--- a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@
Export-Package: org.eclipse.emfforms.core.services.mappingprovider.table.test;version="1.27.0";x-internal:=true,
org.eclipse.emfforms.internal.core.services.mappingprovider.table.panel;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.mappingprovider.table.panel.test
diff --git a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/META-INF/MANIFEST.MF
index 27e2242..4b21bbb 100644
--- a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@
Export-Package: org.eclipse.emfforms.core.services.mappingprovider.table.test;version="1.27.0";x-internal:=true,
org.eclipse.emfforms.internal.core.services.mappingprovider.table;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.mappingprovider.table.test
diff --git a/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/META-INF/MANIFEST.MF
index dbfdd70..d2c4b8a 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/META-INF/MANIFEST.MF
@@ -9,8 +9,7 @@
org.eclipse.emfforms.internal.core.services.segments.featurepath;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.27.0,1.28.0)",
- org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.segments.featurepath.test
Import-Package: org.osgi.framework;version="0.0.0"
diff --git a/tests/org.eclipse.emfforms.core.services.segments.index.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.segments.index.test/META-INF/MANIFEST.MF
index 8ba771e..6e2288f 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.index.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.segments.index.test/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emf.ecp.test.common;bundle-version="[1.27.0,1.28.0)",
- org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.segments.index.test
diff --git a/tests/org.eclipse.emfforms.core.services.segments.mapping.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.segments.mapping.test/META-INF/MANIFEST.MF
index 8e3a1a6..f7ce94f 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.mapping.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.segments.mapping.test/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.27.0,1.28.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.ecp.test.common;bundle-version="[1.27.0,1.28.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.segments.mapping.test
diff --git a/tests/org.eclipse.emfforms.core.services.segments.multi.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.segments.multi.test/META-INF/MANIFEST.MF
index c888174..55874bd 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.multi.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.segments.multi.test/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@
org.eclipse.emfforms.internal.core.services.segments.multi;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.ecp.test.common;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.27.0,1.28.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emfforms.core.services.segments.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.segments.test/META-INF/MANIFEST.MF
index 4055c10..fef0418 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.segments.test/META-INF/MANIFEST.MF
@@ -9,7 +9,6 @@
org.eclipse.emfforms.internal.core.services.segments;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.27.0,1.28.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.segments.test
diff --git a/tests/org.eclipse.emfforms.core.services.structuralchange.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.structuralchange.test/META-INF/MANIFEST.MF
index ae29e3b..b7aa5cb 100644
--- a/tests/org.eclipse.emfforms.core.services.structuralchange.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.structuralchange.test/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@
Export-Package: org.eclipse.emfforms.core.services.structuralchange.test;version="1.27.0";x-internal:=true,
org.eclipse.emfforms.internal.core.services.structuralchange;version="1.27.0";x-internal:=true
Require-Bundle: org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.junit;bundle-version="[4.12.0,5.0.0)",
org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.27.0,1.28.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF
index adc0b8e..6fa501d 100644
--- a/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF
@@ -9,8 +9,7 @@
org.eclipse.emfforms.internal.core.services.scoped;version="1.27.0";x-internal:=true,
org.eclipse.emfforms.internal.core.services.tests;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.tests
Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.27.0,1.28.0)",
diff --git a/tests/org.eclipse.emfforms.datatemplate.tooling.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.datatemplate.tooling.tests/META-INF/MANIFEST.MF
index 566390d..a5f2b8f 100644
--- a/tests/org.eclipse.emfforms.datatemplate.tooling.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.datatemplate.tooling.tests/META-INF/MANIFEST.MF
@@ -13,4 +13,3 @@
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.datatemplate.tooling.tests
-Import-Package: org.objenesis;version="1.0.0"
diff --git a/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/META-INF/MANIFEST.MF
index 978f72a..4905813 100644
--- a/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@
Export-Package: org.eclipse.emfforms.internal.ide.view.mappingsegment;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.eclipse.swtbot.swt.finder;bundle-version="[4.0.0,5.0.0)",
org.eclipse.swtbot.junit4_x;bundle-version="[4.0.0,5.0.0)",
org.apache.log4j;bundle-version="[1.2.15,2.0.0)",
diff --git a/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/META-INF/MANIFEST.MF
index 307ae01..451529f 100644
--- a/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/META-INF/MANIFEST.MF
@@ -9,7 +9,6 @@
org.eclipse.emfforms.internal.view.multisegment.tooling;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.27.0,1.28.0)",
org.eclipse.swtbot.swt.finder;bundle-version="[4.0.0,5.0.0)"
diff --git a/tests/org.eclipse.emfforms.ide.view.multisegment.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.ide.view.multisegment.test/META-INF/MANIFEST.MF
index a2cba92..b9a2d35 100644
--- a/tests/org.eclipse.emfforms.ide.view.multisegment.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.ide.view.multisegment.test/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@
Export-Package: org.eclipse.emfforms.ide.view.multisegment.test;version="1.27.0";x-internal:=true,
org.eclipse.emfforms.internal.view.multisegment.tooling;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.27.0,1.28.0)",
org.eclipse.swtbot.swt.finder;bundle-version="[4.0.0,5.0.0)",
diff --git a/tests/org.eclipse.emfforms.ide.view.segments.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.ide.view.segments.test/META-INF/MANIFEST.MF
index 6605fd2..b4ba29c 100644
--- a/tests/org.eclipse.emfforms.ide.view.segments.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.ide.view.segments.test/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@
Fragment-Host: org.eclipse.emfforms.ide.view.segments;bundle-version="[1.27.0,1.28.0)"
Export-Package: org.eclipse.emfforms.internal.ide.view.segments;version="1.21.0"
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.27.0,1.28.0)",
diff --git a/tests/org.eclipse.emfforms.rulerepository.tooling.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.rulerepository.tooling.test/META-INF/MANIFEST.MF
index fd3460b..fe32121 100644
--- a/tests/org.eclipse.emfforms.rulerepository.tooling.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.rulerepository.tooling.test/META-INF/MANIFEST.MF
@@ -9,7 +9,6 @@
org.eclipse.emfforms.internal.rulerepository.tooling.wizard;version="1.27.0";x-internal:=true,
org.eclipse.emfforms.rulerepository.tooling.test;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)"
+ org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.rulerepository.tooling.test
diff --git a/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF
index e0a663e..fb1da22 100644
--- a/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@
org.eclipse.emfforms.swt.core.tests;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.27.0,1.28.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emfforms.swt.table.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.table.test/META-INF/MANIFEST.MF
index 6321126..b36b40d 100644
--- a/tests/org.eclipse.emfforms.swt.table.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.table.test/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@
org.eclipse.emfforms.swt.table.test;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.27.0,1.28.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.swt.table.test
