diff options
| author | Camille Letavernier | 2014-04-23 14:00:22 +0000 |
|---|---|---|
| committer | Camille Letavernier | 2014-04-23 14:01:15 +0000 |
| commit | b5c0c2d39203b38ca8514622743cee09a9396a61 (patch) | |
| tree | 8833f94aaaf54d6c024707ae03d16680195f59f7 /plugins | |
| parent | 786225eb6e329c9326bbc35207fabb0e373e44db (diff) | |
| parent | 9a2ec81d1453ea0b511eebd593e42941b2ad3b76 (diff) | |
| download | org.eclipse.papyrus-b5c0c2d39203b38ca8514622743cee09a9396a61.tar.gz org.eclipse.papyrus-b5c0c2d39203b38ca8514622743cee09a9396a61.tar.xz org.eclipse.papyrus-b5c0c2d39203b38ca8514622743cee09a9396a61.zip | |
Synchronize with master
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerMatcher.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerMatcher.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerMatcher.java index 23fa5a99dd0..900b320c2c7 100644 --- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerMatcher.java +++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerMatcher.java @@ -90,9 +90,7 @@ public class InvariantContainerMatcher implements IInvariantElementMatcher<Invar IElementType parentType = ElementTypeRegistry.getInstance().getElementType(container); if(parentType != null) { // check if necessary all super types of the direct parent - List<String> parentIds = new ArrayList<String>(); - parentIds.add(parentType.getId()); - if(forbiddenParents.contains(parentIds)) { + if(forbiddenParents.contains(parentType.getId())) { return false; } else { // check also super types ids, if not strict permission @@ -119,9 +117,7 @@ public class InvariantContainerMatcher implements IInvariantElementMatcher<Invar IElementType parentType = ElementTypeRegistry.getInstance().getElementType(container); if(parentType != null) { // check if necessary all super types of the direct parent - List<String> parentIds = new ArrayList<String>(); - parentIds.add(parentType.getId()); - if(allowedParents.contains(parentIds)) { + if(allowedParents.contains(parentType.getId())) { matches = true; } else { // check also super types ids, if not strict permission |