546457: supress some deprecation and rawtype warnings
That's required if we still want to target older Eclipse platforms
Change-Id: I56d0cd627be5e53c6296ba30c94e8ab2a69d2d0d
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=546457
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
diff --git a/plugins/org.eclipse.emf.parsley.common/src/org/eclipse/emf/parsley/composite/AbstractControlFactory.java b/plugins/org.eclipse.emf.parsley.common/src/org/eclipse/emf/parsley/composite/AbstractControlFactory.java
index c6525bd..6ade542 100644
--- a/plugins/org.eclipse.emf.parsley.common/src/org/eclipse/emf/parsley/composite/AbstractControlFactory.java
+++ b/plugins/org.eclipse.emf.parsley.common/src/org/eclipse/emf/parsley/composite/AbstractControlFactory.java
@@ -405,6 +405,7 @@
return proposalCreator.proposals(owner, feature);
}
+ @SuppressWarnings("deprecation")
protected ControlObservablePair createControlAndObservableWithPredefinedProposals(
List<?> proposals) {
ComboViewer comboViewer = createComboViewer(SWT.READ_ONLY);
diff --git a/plugins/org.eclipse.emf.parsley.common/src/org/eclipse/emf/parsley/util/DatabindingUtil.java b/plugins/org.eclipse.emf.parsley.common/src/org/eclipse/emf/parsley/util/DatabindingUtil.java
index 1d2f450..8e39723 100644
--- a/plugins/org.eclipse.emf.parsley.common/src/org/eclipse/emf/parsley/util/DatabindingUtil.java
+++ b/plugins/org.eclipse.emf.parsley.common/src/org/eclipse/emf/parsley/util/DatabindingUtil.java
@@ -24,6 +24,7 @@
* @author Lorenzo Bettini - initial API and implementation
*
*/
+@SuppressWarnings("deprecation")
public class DatabindingUtil {
protected DatabindingUtil() {
@@ -45,6 +46,7 @@
* @throws IllegalArgumentException
* if <code>control</code> type is unsupported
*/
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public static ISWTObservableValue observeText(Control control, int event) {
return WidgetProperties.text(event).observe(control);
}
@@ -71,6 +73,7 @@
* @throws IllegalArgumentException
* if the type of <code>widget</code> is unsupported
*/
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public static ISWTObservableValue observeText(Widget widget) {
return WidgetProperties.text().observe(widget);
}
@@ -93,6 +96,7 @@
* @throws IllegalArgumentException
* if <code>control</code> type is unsupported
*/
+ @SuppressWarnings({ "rawtypes", "unchecked" })
public static ISWTObservableValue observeSelection(Widget widget) {
return WidgetProperties.selection().observe(widget);
}
diff --git a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/EmfValidationTargetToModelUpdateValueStrategyTest.xtend b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/EmfValidationTargetToModelUpdateValueStrategyTest.xtend
index 6a49b1d..cae57ca 100644
--- a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/EmfValidationTargetToModelUpdateValueStrategyTest.xtend
+++ b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/EmfValidationTargetToModelUpdateValueStrategyTest.xtend
@@ -157,7 +157,7 @@
initializeDatabindingInternal(feature, o, target);
}
- private def Binding initializeDatabindingInternal(EStructuralFeature feature, EObject o, ISWTObservableValue target) {
+ private def Binding initializeDatabindingInternal(EStructuralFeature feature, EObject o, ISWTObservableValue<?> target) {
val source = EMFEditProperties.value(editingDomain, feature).observe(o);
val targetToModelUpdateValueStrategy =
new EmfValidationTargetToModelUpdateValueStrategy(
