Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Le Menez2018-10-17 12:51:48 -0400
committerQuentin Le Menez2018-10-18 10:38:52 -0400
commit353489b4cc8f511882f97c38f98772ddd710df53 (patch)
treefe2ec9e8e64e54be1f0eeb7647d6f4f4c48583f1 /plugins
parent650d58215b7a118c49c7a8a3551df64ead060abb (diff)
downloadorg.eclipse.papyrus-353489b4cc8f511882f97c38f98772ddd710df53.tar.gz
org.eclipse.papyrus-353489b4cc8f511882f97c38f98772ddd710df53.tar.xz
org.eclipse.papyrus-353489b4cc8f511882f97c38f98772ddd710df53.zip
Bug 539022 - [Releng] Update target platforms for 2018-12M1
- The tests seem to react poorly to the new eclipse sdk, a patch must be made in order to proceed in the train - patched UMLModelElement in order to suppress an excessive check on UMLContentProvider type Change-Id: Ia0a72ef2d92c1fb6a6149482d12328d032a69611 Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java
index a44b6db1b5c..1863a29c024 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java
@@ -207,7 +207,7 @@ public class UMLModelElement extends EMFModelElement {
.map(interaction -> element -> isAncestor(interaction, element));
}
- return isValid.map(
+ return isValid.<UMLContentProvider> map(
valid -> new UMLContentProvider(source, feature, null, resourceSet) {
@Override
public boolean isValidValue(Object element) {
@@ -236,7 +236,7 @@ public class UMLModelElement extends EMFModelElement {
EReference reference = (EReference) feature;
if (reference == UMLPackage.eINSTANCE.getMessage_Argument()) {
if (source instanceof Message) {
- Set<ParameterDirectionKind> directions = new HashSet<ParameterDirectionKind>();
+ Set<ParameterDirectionKind> directions = new HashSet<>();
switch (((Message) source).getMessageSort()) {
case REPLY_LITERAL:
directions.add(OUT_LITERAL);
@@ -279,7 +279,7 @@ public class UMLModelElement extends EMFModelElement {
protected List<EClass> getAvailableEClasses() {
// according to the UML norm 2.5, section 17.4.3.1
// The signature of a Message refers to either an Operation or a Signal.
- final List<EClass> eClasses = new ArrayList<EClass>();
+ final List<EClass> eClasses = new ArrayList<>();
eClasses.add(UMLPackage.eINSTANCE.getOperation());
eClasses.add(UMLPackage.eINSTANCE.getSignal());
return eClasses;
@@ -325,7 +325,7 @@ public class UMLModelElement extends EMFModelElement {
/**
* The set of all EStructuralFeature representing subsets of {@link Namespace#getOwnedRules()}
*/
- public static final Set<EStructuralFeature> ownedRuleSubsets = new HashSet<EStructuralFeature>();
+ public static final Set<EStructuralFeature> ownedRuleSubsets = new HashSet<>();
static {
// Behavior

Back to the top