diff options
Diffstat (limited to 'plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OccurrenceSpecificationImpl.java')
| -rw-r--r-- | plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OccurrenceSpecificationImpl.java | 215 |
1 files changed, 73 insertions, 142 deletions
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OccurrenceSpecificationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OccurrenceSpecificationImpl.java index c701f390..e652bfdd 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OccurrenceSpecificationImpl.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OccurrenceSpecificationImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2011 IBM Corporation, CEA, and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,13 +7,13 @@ * * Contributors: * IBM - initial API and implementation + * Kenn Hussey (CEA) - 327039 * * $Id: OccurrenceSpecificationImpl.java,v 1.21 2007/04/25 17:47:01 khussey Exp $ */ package org.eclipse.uml2.uml.internal.impl; import java.util.Collection; -import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; @@ -22,14 +22,11 @@ import org.eclipse.emf.ecore.EAnnotation; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.uml2.uml.Comment; import org.eclipse.uml2.uml.Dependency; -import org.eclipse.uml2.uml.Event; import org.eclipse.uml2.uml.GeneralOrdering; import org.eclipse.uml2.uml.Interaction; import org.eclipse.uml2.uml.InteractionOperand; @@ -46,9 +43,8 @@ import org.eclipse.uml2.uml.VisibilityKind; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.uml2.uml.internal.impl.OccurrenceSpecificationImpl#getToBefores <em>To Before</em>}</li> - * <li>{@link org.eclipse.uml2.uml.internal.impl.OccurrenceSpecificationImpl#getEvent <em>Event</em>}</li> * <li>{@link org.eclipse.uml2.uml.internal.impl.OccurrenceSpecificationImpl#getToAfters <em>To After</em>}</li> + * <li>{@link org.eclipse.uml2.uml.internal.impl.OccurrenceSpecificationImpl#getToBefores <em>To Before</em>}</li> * <li>{@link org.eclipse.uml2.uml.internal.impl.OccurrenceSpecificationImpl#getCovereds <em>Covered</em>}</li> * </ul> * </p> @@ -60,34 +56,24 @@ public class OccurrenceSpecificationImpl implements OccurrenceSpecification { /** - * The cached value of the '{@link #getToBefores() <em>To Before</em>}' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getToBefores() - * @generated - * @ordered - */ - protected EList<GeneralOrdering> toBefores; - - /** - * The cached value of the '{@link #getEvent() <em>Event</em>}' reference. + * The cached value of the '{@link #getToAfters() <em>To After</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getEvent() + * @see #getToAfters() * @generated * @ordered */ - protected Event event; + protected EList<GeneralOrdering> toAfters; /** - * The cached value of the '{@link #getToAfters() <em>To After</em>}' reference list. + * The cached value of the '{@link #getToBefores() <em>To Before</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getToAfters() + * @see #getToBefores() * @generated * @ordered */ - protected EList<GeneralOrdering> toAfters; + protected EList<GeneralOrdering> toBefores; /** * <!-- begin-user-doc --> @@ -153,47 +139,6 @@ public class OccurrenceSpecificationImpl * <!-- end-user-doc --> * @generated */ - public Event getEvent() { - if (event != null && event.eIsProxy()) { - InternalEObject oldEvent = (InternalEObject) event; - event = (Event) eResolveProxy(oldEvent); - if (event != oldEvent) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, - UMLPackage.OCCURRENCE_SPECIFICATION__EVENT, oldEvent, - event)); - } - } - return event; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Event basicGetEvent() { - return event; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setEvent(Event newEvent) { - Event oldEvent = event; - event = newEvent; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, - UMLPackage.OCCURRENCE_SPECIFICATION__EVENT, oldEvent, event)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ public EList<GeneralOrdering> getToAfters() { if (toAfters == null) { toAfters = new EObjectWithInverseResolvingEList<GeneralOrdering>( @@ -250,7 +195,6 @@ public class OccurrenceSpecificationImpl * <!-- end-user-doc --> * @generated */ - @Override public Lifeline getCovered(String name) { return getCovered(name, false); } @@ -260,7 +204,6 @@ public class OccurrenceSpecificationImpl * <!-- end-user-doc --> * @generated */ - @Override public Lifeline getCovered(String name, boolean ignoreCase) { coveredLoop : for (Lifeline covered : getCovereds()) { if (name != null && !(ignoreCase @@ -310,12 +253,12 @@ public class OccurrenceSpecificationImpl msgs = eBasicRemoveFromContainer(msgs); return basicSetEnclosingOperand((InteractionOperand) otherEnd, msgs); - case UMLPackage.OCCURRENCE_SPECIFICATION__TO_BEFORE : - return ((InternalEList<InternalEObject>) (InternalEList<?>) getToBefores()) - .basicAdd(otherEnd, msgs); case UMLPackage.OCCURRENCE_SPECIFICATION__TO_AFTER : return ((InternalEList<InternalEObject>) (InternalEList<?>) getToAfters()) .basicAdd(otherEnd, msgs); + case UMLPackage.OCCURRENCE_SPECIFICATION__TO_BEFORE : + return ((InternalEList<InternalEObject>) (InternalEList<?>) getToBefores()) + .basicAdd(otherEnd, msgs); } return eDynamicInverseAdd(otherEnd, featureID, msgs); } @@ -343,19 +286,19 @@ public class OccurrenceSpecificationImpl case UMLPackage.OCCURRENCE_SPECIFICATION__COVERED : return ((InternalEList<?>) getCovereds()).basicRemove(otherEnd, msgs); - case UMLPackage.OCCURRENCE_SPECIFICATION__GENERAL_ORDERING : - return ((InternalEList<?>) getGeneralOrderings()).basicRemove( - otherEnd, msgs); case UMLPackage.OCCURRENCE_SPECIFICATION__ENCLOSING_INTERACTION : return basicSetEnclosingInteraction(null, msgs); case UMLPackage.OCCURRENCE_SPECIFICATION__ENCLOSING_OPERAND : return basicSetEnclosingOperand(null, msgs); - case UMLPackage.OCCURRENCE_SPECIFICATION__TO_BEFORE : - return ((InternalEList<?>) getToBefores()).basicRemove( + case UMLPackage.OCCURRENCE_SPECIFICATION__GENERAL_ORDERING : + return ((InternalEList<?>) getGeneralOrderings()).basicRemove( otherEnd, msgs); case UMLPackage.OCCURRENCE_SPECIFICATION__TO_AFTER : return ((InternalEList<?>) getToAfters()).basicRemove(otherEnd, msgs); + case UMLPackage.OCCURRENCE_SPECIFICATION__TO_BEFORE : + return ((InternalEList<?>) getToBefores()).basicRemove( + otherEnd, msgs); } return eDynamicInverseRemove(otherEnd, featureID, msgs); } @@ -370,34 +313,32 @@ public class OccurrenceSpecificationImpl switch (featureID) { case UMLPackage.OCCURRENCE_SPECIFICATION__EANNOTATIONS : return getEAnnotations(); + case UMLPackage.OCCURRENCE_SPECIFICATION__OWNED_COMMENT : + return getOwnedComments(); case UMLPackage.OCCURRENCE_SPECIFICATION__OWNED_ELEMENT : return getOwnedElements(); case UMLPackage.OCCURRENCE_SPECIFICATION__OWNER : if (resolve) return getOwner(); return basicGetOwner(); - case UMLPackage.OCCURRENCE_SPECIFICATION__OWNED_COMMENT : - return getOwnedComments(); - case UMLPackage.OCCURRENCE_SPECIFICATION__NAME : - return getName(); - case UMLPackage.OCCURRENCE_SPECIFICATION__VISIBILITY : - return getVisibility(); - case UMLPackage.OCCURRENCE_SPECIFICATION__QUALIFIED_NAME : - return getQualifiedName(); case UMLPackage.OCCURRENCE_SPECIFICATION__CLIENT_DEPENDENCY : return getClientDependencies(); - case UMLPackage.OCCURRENCE_SPECIFICATION__NAMESPACE : - if (resolve) - return getNamespace(); - return basicGetNamespace(); + case UMLPackage.OCCURRENCE_SPECIFICATION__NAME : + return getName(); case UMLPackage.OCCURRENCE_SPECIFICATION__NAME_EXPRESSION : if (resolve) return getNameExpression(); return basicGetNameExpression(); + case UMLPackage.OCCURRENCE_SPECIFICATION__NAMESPACE : + if (resolve) + return getNamespace(); + return basicGetNamespace(); + case UMLPackage.OCCURRENCE_SPECIFICATION__QUALIFIED_NAME : + return getQualifiedName(); + case UMLPackage.OCCURRENCE_SPECIFICATION__VISIBILITY : + return getVisibility(); case UMLPackage.OCCURRENCE_SPECIFICATION__COVERED : return getCovereds(); - case UMLPackage.OCCURRENCE_SPECIFICATION__GENERAL_ORDERING : - return getGeneralOrderings(); case UMLPackage.OCCURRENCE_SPECIFICATION__ENCLOSING_INTERACTION : if (resolve) return getEnclosingInteraction(); @@ -406,14 +347,12 @@ public class OccurrenceSpecificationImpl if (resolve) return getEnclosingOperand(); return basicGetEnclosingOperand(); - case UMLPackage.OCCURRENCE_SPECIFICATION__TO_BEFORE : - return getToBefores(); - case UMLPackage.OCCURRENCE_SPECIFICATION__EVENT : - if (resolve) - return getEvent(); - return basicGetEvent(); + case UMLPackage.OCCURRENCE_SPECIFICATION__GENERAL_ORDERING : + return getGeneralOrderings(); case UMLPackage.OCCURRENCE_SPECIFICATION__TO_AFTER : return getToAfters(); + case UMLPackage.OCCURRENCE_SPECIFICATION__TO_BEFORE : + return getToBefores(); } return eDynamicGet(featureID, resolve, coreType); } @@ -437,48 +376,45 @@ public class OccurrenceSpecificationImpl getOwnedComments().addAll( (Collection<? extends Comment>) newValue); return; - case UMLPackage.OCCURRENCE_SPECIFICATION__NAME : - setName((String) newValue); - return; - case UMLPackage.OCCURRENCE_SPECIFICATION__VISIBILITY : - setVisibility((VisibilityKind) newValue); - return; case UMLPackage.OCCURRENCE_SPECIFICATION__CLIENT_DEPENDENCY : getClientDependencies().clear(); getClientDependencies().addAll( (Collection<? extends Dependency>) newValue); return; + case UMLPackage.OCCURRENCE_SPECIFICATION__NAME : + setName((String) newValue); + return; case UMLPackage.OCCURRENCE_SPECIFICATION__NAME_EXPRESSION : setNameExpression((StringExpression) newValue); return; + case UMLPackage.OCCURRENCE_SPECIFICATION__VISIBILITY : + setVisibility((VisibilityKind) newValue); + return; case UMLPackage.OCCURRENCE_SPECIFICATION__COVERED : getCovereds().clear(); getCovereds().addAll((Collection<? extends Lifeline>) newValue); return; - case UMLPackage.OCCURRENCE_SPECIFICATION__GENERAL_ORDERING : - getGeneralOrderings().clear(); - getGeneralOrderings().addAll( - (Collection<? extends GeneralOrdering>) newValue); - return; case UMLPackage.OCCURRENCE_SPECIFICATION__ENCLOSING_INTERACTION : setEnclosingInteraction((Interaction) newValue); return; case UMLPackage.OCCURRENCE_SPECIFICATION__ENCLOSING_OPERAND : setEnclosingOperand((InteractionOperand) newValue); return; - case UMLPackage.OCCURRENCE_SPECIFICATION__TO_BEFORE : - getToBefores().clear(); - getToBefores().addAll( + case UMLPackage.OCCURRENCE_SPECIFICATION__GENERAL_ORDERING : + getGeneralOrderings().clear(); + getGeneralOrderings().addAll( (Collection<? extends GeneralOrdering>) newValue); return; - case UMLPackage.OCCURRENCE_SPECIFICATION__EVENT : - setEvent((Event) newValue); - return; case UMLPackage.OCCURRENCE_SPECIFICATION__TO_AFTER : getToAfters().clear(); getToAfters().addAll( (Collection<? extends GeneralOrdering>) newValue); return; + case UMLPackage.OCCURRENCE_SPECIFICATION__TO_BEFORE : + getToBefores().clear(); + getToBefores().addAll( + (Collection<? extends GeneralOrdering>) newValue); + return; } eDynamicSet(featureID, newValue); } @@ -497,39 +433,36 @@ public class OccurrenceSpecificationImpl case UMLPackage.OCCURRENCE_SPECIFICATION__OWNED_COMMENT : getOwnedComments().clear(); return; - case UMLPackage.OCCURRENCE_SPECIFICATION__NAME : - unsetName(); - return; - case UMLPackage.OCCURRENCE_SPECIFICATION__VISIBILITY : - unsetVisibility(); - return; case UMLPackage.OCCURRENCE_SPECIFICATION__CLIENT_DEPENDENCY : getClientDependencies().clear(); return; + case UMLPackage.OCCURRENCE_SPECIFICATION__NAME : + unsetName(); + return; case UMLPackage.OCCURRENCE_SPECIFICATION__NAME_EXPRESSION : setNameExpression((StringExpression) null); return; + case UMLPackage.OCCURRENCE_SPECIFICATION__VISIBILITY : + unsetVisibility(); + return; case UMLPackage.OCCURRENCE_SPECIFICATION__COVERED : getCovereds().clear(); return; - case UMLPackage.OCCURRENCE_SPECIFICATION__GENERAL_ORDERING : - getGeneralOrderings().clear(); - return; case UMLPackage.OCCURRENCE_SPECIFICATION__ENCLOSING_INTERACTION : setEnclosingInteraction((Interaction) null); return; case UMLPackage.OCCURRENCE_SPECIFICATION__ENCLOSING_OPERAND : setEnclosingOperand((InteractionOperand) null); return; - case UMLPackage.OCCURRENCE_SPECIFICATION__TO_BEFORE : - getToBefores().clear(); - return; - case UMLPackage.OCCURRENCE_SPECIFICATION__EVENT : - setEvent((Event) null); + case UMLPackage.OCCURRENCE_SPECIFICATION__GENERAL_ORDERING : + getGeneralOrderings().clear(); return; case UMLPackage.OCCURRENCE_SPECIFICATION__TO_AFTER : getToAfters().clear(); return; + case UMLPackage.OCCURRENCE_SPECIFICATION__TO_BEFORE : + getToBefores().clear(); + return; } eDynamicUnset(featureID); } @@ -544,41 +477,39 @@ public class OccurrenceSpecificationImpl switch (featureID) { case UMLPackage.OCCURRENCE_SPECIFICATION__EANNOTATIONS : return eAnnotations != null && !eAnnotations.isEmpty(); + case UMLPackage.OCCURRENCE_SPECIFICATION__OWNED_COMMENT : + return ownedComments != null && !ownedComments.isEmpty(); case UMLPackage.OCCURRENCE_SPECIFICATION__OWNED_ELEMENT : return isSetOwnedElements(); case UMLPackage.OCCURRENCE_SPECIFICATION__OWNER : return isSetOwner(); - case UMLPackage.OCCURRENCE_SPECIFICATION__OWNED_COMMENT : - return ownedComments != null && !ownedComments.isEmpty(); + case UMLPackage.OCCURRENCE_SPECIFICATION__CLIENT_DEPENDENCY : + return clientDependencies != null + && !clientDependencies.isEmpty(); case UMLPackage.OCCURRENCE_SPECIFICATION__NAME : return isSetName(); - case UMLPackage.OCCURRENCE_SPECIFICATION__VISIBILITY : - return isSetVisibility(); + case UMLPackage.OCCURRENCE_SPECIFICATION__NAME_EXPRESSION : + return nameExpression != null; + case UMLPackage.OCCURRENCE_SPECIFICATION__NAMESPACE : + return isSetNamespace(); case UMLPackage.OCCURRENCE_SPECIFICATION__QUALIFIED_NAME : return QUALIFIED_NAME_EDEFAULT == null ? getQualifiedName() != null : !QUALIFIED_NAME_EDEFAULT.equals(getQualifiedName()); - case UMLPackage.OCCURRENCE_SPECIFICATION__CLIENT_DEPENDENCY : - return clientDependencies != null - && !clientDependencies.isEmpty(); - case UMLPackage.OCCURRENCE_SPECIFICATION__NAMESPACE : - return isSetNamespace(); - case UMLPackage.OCCURRENCE_SPECIFICATION__NAME_EXPRESSION : - return nameExpression != null; + case UMLPackage.OCCURRENCE_SPECIFICATION__VISIBILITY : + return isSetVisibility(); case UMLPackage.OCCURRENCE_SPECIFICATION__COVERED : return isSetCovereds(); - case UMLPackage.OCCURRENCE_SPECIFICATION__GENERAL_ORDERING : - return generalOrderings != null && !generalOrderings.isEmpty(); case UMLPackage.OCCURRENCE_SPECIFICATION__ENCLOSING_INTERACTION : return basicGetEnclosingInteraction() != null; case UMLPackage.OCCURRENCE_SPECIFICATION__ENCLOSING_OPERAND : return basicGetEnclosingOperand() != null; - case UMLPackage.OCCURRENCE_SPECIFICATION__TO_BEFORE : - return toBefores != null && !toBefores.isEmpty(); - case UMLPackage.OCCURRENCE_SPECIFICATION__EVENT : - return event != null; + case UMLPackage.OCCURRENCE_SPECIFICATION__GENERAL_ORDERING : + return generalOrderings != null && !generalOrderings.isEmpty(); case UMLPackage.OCCURRENCE_SPECIFICATION__TO_AFTER : return toAfters != null && !toAfters.isEmpty(); + case UMLPackage.OCCURRENCE_SPECIFICATION__TO_BEFORE : + return toBefores != null && !toBefores.isEmpty(); } return eDynamicIsSet(featureID); } |