[160679] Regenerating based on changes in EMF.
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AbstractionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AbstractionImpl.java
index f626f98..5b24693 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AbstractionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AbstractionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: AbstractionImpl.java,v 1.17 2006/05/24 20:54:27 khussey Exp $
+ * $Id: AbstractionImpl.java,v 1.18 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -91,6 +91,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -174,6 +175,7 @@
* @generated
*/
public void setMapping(OpaqueExpression newMapping) {
+
if (newMapping != mapping) {
NotificationChain msgs = null;
if (mapping != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AcceptCallActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AcceptCallActionImpl.java
index e0fc7b0..7d8093f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AcceptCallActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AcceptCallActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: AcceptCallActionImpl.java,v 1.16 2006/05/24 20:54:27 khussey Exp $
+ * $Id: AcceptCallActionImpl.java,v 1.17 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -98,6 +98,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -187,6 +188,7 @@
* @generated
*/
public void setReturnInformation(OutputPin newReturnInformation) {
+
if (newReturnInformation != returnInformation) {
NotificationChain msgs = null;
if (returnInformation != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AcceptEventActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AcceptEventActionImpl.java
index a36c036..855bd90 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AcceptEventActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AcceptEventActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: AcceptEventActionImpl.java,v 1.22 2006/05/24 20:54:28 khussey Exp $
+ * $Id: AcceptEventActionImpl.java,v 1.23 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -132,6 +132,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -164,6 +165,7 @@
* @generated
*/
public void setIsUnmarshall(boolean newIsUnmarshall) {
+
boolean oldIsUnmarshall = (eFlags & IS_UNMARSHALL_EFLAG) != 0;
if (newIsUnmarshall)
eFlags |= IS_UNMARSHALL_EFLAG;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionExecutionSpecificationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionExecutionSpecificationImpl.java
index d5cf3b0..cfc0288 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionExecutionSpecificationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionExecutionSpecificationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ActionExecutionSpecificationImpl.java,v 1.12 2006/04/10 19:16:20 khussey Exp $
+ * $Id: ActionExecutionSpecificationImpl.java,v 1.13 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -114,6 +114,7 @@
* @generated
*/
public void setAction(Action newAction) {
+
Action oldAction = action;
action = newAction;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionImpl.java
index 6e78807..f7748df 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ActionImpl.java,v 1.24 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ActionImpl.java,v 1.25 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -110,6 +110,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -174,6 +175,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -198,6 +200,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionInputPinImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionInputPinImpl.java
index acada58..8bb3808 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionInputPinImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionInputPinImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ActionInputPinImpl.java,v 1.24 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ActionInputPinImpl.java,v 1.25 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -101,6 +101,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -187,6 +188,7 @@
* @generated
*/
public void setFromAction(Action newFromAction) {
+
if (newFromAction != fromAction) {
NotificationChain msgs = null;
if (fromAction != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityEdgeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityEdgeImpl.java
index 4332d45..bc8a75c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityEdgeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityEdgeImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ActivityEdgeImpl.java,v 1.21 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ActivityEdgeImpl.java,v 1.22 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -178,6 +178,7 @@
* @generated
*/
public EList getInGroups() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -202,6 +203,7 @@
* @generated
*/
public EList getRedefinedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -228,6 +230,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -287,6 +290,7 @@
* @generated
*/
public void setActivity(Activity newActivity) {
+
if (newActivity != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.ACTIVITY_EDGE__ACTIVITY && newActivity != null)) {
if (EcoreUtil.isAncestor(this, newActivity))
@@ -390,6 +394,7 @@
* @generated
*/
public void setInStructuredNode(StructuredActivityNode newInStructuredNode) {
+
if (newInStructuredNode != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.ACTIVITY_EDGE__IN_STRUCTURED_NODE && newInStructuredNode != null)) {
if (EcoreUtil.isAncestor(this, newInStructuredNode))
@@ -467,6 +472,7 @@
* @generated
*/
public void setTarget(ActivityNode newTarget) {
+
if (newTarget != target) {
NotificationChain msgs = null;
if (target != null)
@@ -594,6 +600,7 @@
* @generated
*/
public void setGuard(ValueSpecification newGuard) {
+
if (newGuard != guard) {
NotificationChain msgs = null;
if (guard != null)
@@ -693,6 +700,7 @@
* @generated
*/
public void setWeight(ValueSpecification newWeight) {
+
if (newWeight != weight) {
NotificationChain msgs = null;
if (weight != null)
@@ -783,6 +791,7 @@
* @generated
*/
public void setInterrupts(InterruptibleActivityRegion newInterrupts) {
+
if (newInterrupts != interrupts) {
NotificationChain msgs = null;
if (interrupts != null)
@@ -862,6 +871,7 @@
* @generated
*/
public void setSource(ActivityNode newSource) {
+
if (newSource != source) {
NotificationChain msgs = null;
if (source != null)
@@ -1300,6 +1310,7 @@
* @generated
*/
public Element basicGetOwner() {
+
Activity activity = basicGetActivity();
if (activity != null) {
return activity;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityGroupImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityGroupImpl.java
index 65193cb..5ba328c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityGroupImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityGroupImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ActivityGroupImpl.java,v 1.16 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ActivityGroupImpl.java,v 1.17 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -92,6 +92,7 @@
* @generated
*/
public EList getSubgroups() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -116,6 +117,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -140,6 +142,7 @@
* @generated
*/
public EList getContainedNodes() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -194,6 +197,7 @@
* @generated
*/
public EList getContainedEdges() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -283,6 +287,7 @@
* @generated
*/
public void setInActivity(Activity newInActivity) {
+
if (newInActivity != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.ACTIVITY_GROUP__IN_ACTIVITY && newInActivity != null)) {
if (EcoreUtil.isAncestor(this, newInActivity))
@@ -531,6 +536,7 @@
* @generated
*/
public ActivityGroup basicGetSuperGroup() {
+
return null;
}
@@ -573,6 +579,7 @@
* @generated
*/
public Element basicGetOwner() {
+
if (isSetSuperGroup()) {
return basicGetSuperGroup();
}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityImpl.java
index a2d3163..9acae59 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ActivityImpl.java,v 1.28 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ActivityImpl.java,v 1.29 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -200,6 +200,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -224,6 +225,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -341,6 +343,7 @@
* @generated
*/
public void setIsReadOnly(boolean newIsReadOnly) {
+
boolean oldIsReadOnly = (eFlags & IS_READ_ONLY_EFLAG) != 0;
if (newIsReadOnly)
eFlags |= IS_READ_ONLY_EFLAG;
@@ -367,6 +370,7 @@
* @generated
*/
public void setIsSingleExecution(boolean newIsSingleExecution) {
+
boolean oldIsSingleExecution = (eFlags & IS_SINGLE_EXECUTION_EFLAG) != 0;
if (newIsSingleExecution)
eFlags |= IS_SINGLE_EXECUTION_EFLAG;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityNodeImpl.java
index d36f529..d402b98 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityNodeImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ActivityNodeImpl.java,v 1.17 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ActivityNodeImpl.java,v 1.18 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -153,6 +153,7 @@
* @generated
*/
public EList getInGroups() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -177,6 +178,7 @@
* @generated
*/
public EList getRedefinedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -323,6 +325,7 @@
* @generated
*/
public void setInStructuredNode(StructuredActivityNode newInStructuredNode) {
+
if (newInStructuredNode != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.ACTIVITY_NODE__IN_STRUCTURED_NODE && newInStructuredNode != null)) {
if (EcoreUtil.isAncestor(this, newInStructuredNode))
@@ -386,6 +389,7 @@
* @generated
*/
public void setActivity(Activity newActivity) {
+
if (newActivity != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.ACTIVITY_NODE__ACTIVITY && newActivity != null)) {
if (EcoreUtil.isAncestor(this, newActivity))
@@ -902,6 +906,7 @@
* @generated
*/
public Element basicGetOwner() {
+
Activity activity = basicGetActivity();
if (activity != null) {
return activity;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityParameterNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityParameterNodeImpl.java
index d60cb17..51e1725 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityParameterNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityParameterNodeImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ActivityParameterNodeImpl.java,v 1.14 2006/04/10 19:16:18 khussey Exp $
+ * $Id: ActivityParameterNodeImpl.java,v 1.15 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -117,6 +117,7 @@
* @generated
*/
public void setParameter(Parameter newParameter) {
+
Parameter oldParameter = parameter;
parameter = newParameter;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityPartitionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityPartitionImpl.java
index ef3b15e..67edb19 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityPartitionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityPartitionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ActivityPartitionImpl.java,v 1.22 2006/05/24 20:54:27 khussey Exp $
+ * $Id: ActivityPartitionImpl.java,v 1.23 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -185,6 +185,7 @@
* @generated
*/
public EList getSubgroups() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -210,6 +211,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -235,6 +237,7 @@
* @generated
*/
public EList getContainedNodes() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -291,6 +294,7 @@
* @generated
*/
public EList getContainedEdges() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -382,6 +386,7 @@
* @generated
*/
public void setInActivity(Activity newInActivity) {
+
if (newInActivity != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.ACTIVITY_PARTITION__IN_ACTIVITY && newInActivity != null)) {
if (EcoreUtil.isAncestor(this, newInActivity))
@@ -418,6 +423,7 @@
* @generated
*/
public void setIsDimension(boolean newIsDimension) {
+
boolean oldIsDimension = (eFlags & IS_DIMENSION_EFLAG) != 0;
if (newIsDimension)
eFlags |= IS_DIMENSION_EFLAG;
@@ -445,6 +451,7 @@
* @generated
*/
public void setIsExternal(boolean newIsExternal) {
+
boolean oldIsExternal = (eFlags & IS_EXTERNAL_EFLAG) != 0;
if (newIsExternal)
eFlags |= IS_EXTERNAL_EFLAG;
@@ -640,6 +647,7 @@
* @generated
*/
public void setSuperPartition(ActivityPartition newSuperPartition) {
+
if (newSuperPartition != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.ACTIVITY_PARTITION__SUPER_PARTITION && newSuperPartition != null)) {
if (EcoreUtil.isAncestor(this, newSuperPartition))
@@ -696,6 +704,7 @@
* @generated
*/
public void setRepresents(Element newRepresents) {
+
Element oldRepresents = represents;
represents = newRepresents;
if (eNotificationRequired())
@@ -1225,6 +1234,7 @@
* @generated
*/
public ActivityGroup basicGetSuperGroup() {
+
ActivityPartition superPartition = basicGetSuperPartition();
if (superPartition != null) {
return superPartition;
@@ -1271,6 +1281,7 @@
* @generated
*/
public Element basicGetOwner() {
+
if (isSetSuperGroup()) {
return basicGetSuperGroup();
}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AddStructuralFeatureValueActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AddStructuralFeatureValueActionImpl.java
index eb10bc4..f3a0dd7 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AddStructuralFeatureValueActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AddStructuralFeatureValueActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: AddStructuralFeatureValueActionImpl.java,v 1.21 2006/05/24 20:54:27 khussey Exp $
+ * $Id: AddStructuralFeatureValueActionImpl.java,v 1.22 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -119,6 +119,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -152,6 +153,7 @@
* @generated
*/
public void setIsReplaceAll(boolean newIsReplaceAll) {
+
boolean oldIsReplaceAll = (eFlags & IS_REPLACE_ALL_EFLAG) != 0;
if (newIsReplaceAll)
eFlags |= IS_REPLACE_ALL_EFLAG;
@@ -240,6 +242,7 @@
* @generated
*/
public void setInsertAt(InputPin newInsertAt) {
+
if (newInsertAt != insertAt) {
NotificationChain msgs = null;
if (insertAt != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AddVariableValueActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AddVariableValueActionImpl.java
index 5decadb..fa69a32 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AddVariableValueActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AddVariableValueActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: AddVariableValueActionImpl.java,v 1.21 2006/05/24 20:54:28 khussey Exp $
+ * $Id: AddVariableValueActionImpl.java,v 1.22 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -119,6 +119,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -151,6 +152,7 @@
* @generated
*/
public void setIsReplaceAll(boolean newIsReplaceAll) {
+
boolean oldIsReplaceAll = (eFlags & IS_REPLACE_ALL_EFLAG) != 0;
if (newIsReplaceAll)
eFlags |= IS_REPLACE_ALL_EFLAG;
@@ -232,6 +234,7 @@
* @generated
*/
public void setInsertAt(InputPin newInsertAt) {
+
if (newInsertAt != insertAt) {
NotificationChain msgs = null;
if (insertAt != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ArtifactImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ArtifactImpl.java
index 5b67000..2f65820 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ArtifactImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ArtifactImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ArtifactImpl.java,v 1.25 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ArtifactImpl.java,v 1.26 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -173,6 +173,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -198,6 +199,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -222,6 +224,7 @@
* @generated
*/
public EList getFeatures() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -245,6 +248,7 @@
* @generated
*/
public EList getAttributes() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -292,6 +296,7 @@
* @generated
*/
public void setFileName(String newFileName) {
+
String oldFileName = fileName;
fileName = newFileName;
boolean oldFileNameESet = (eFlags & FILE_NAME_ESETFLAG) != 0;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AssociationClassImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AssociationClassImpl.java
index b5f921b..a47f3f2 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AssociationClassImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AssociationClassImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: AssociationClassImpl.java,v 1.26 2006/05/24 20:54:27 khussey Exp $
+ * $Id: AssociationClassImpl.java,v 1.27 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -156,6 +156,7 @@
* @generated
*/
public EList getRelatedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -182,6 +183,7 @@
* @generated
*/
public EList getMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -206,6 +208,7 @@
* @generated
*/
public EList getFeatures() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -230,6 +233,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -382,6 +386,7 @@
* @generated
*/
public void setIsDerived(boolean newIsDerived) {
+
boolean oldIsDerived = (eFlags & IS_DERIVED_EFLAG) != 0;
if (newIsDerived)
eFlags |= IS_DERIVED_EFLAG;
@@ -400,6 +405,7 @@
* @generated
*/
public EList getEndTypes() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
EList result = (EList) cache.get(this,
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AssociationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AssociationImpl.java
index 117944b..0f83302 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AssociationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AssociationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: AssociationImpl.java,v 1.26 2006/05/24 20:54:27 khussey Exp $
+ * $Id: AssociationImpl.java,v 1.27 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -153,6 +153,7 @@
* @generated
*/
public EList getRelatedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -178,6 +179,7 @@
* @generated
*/
public EList getMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -201,6 +203,7 @@
* @generated
*/
public EList getFeatures() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -226,6 +229,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -378,6 +382,7 @@
* @generated
*/
public void setIsDerived(boolean newIsDerived) {
+
boolean oldIsDerived = (eFlags & IS_DERIVED_EFLAG) != 0;
if (newIsDerived)
eFlags |= IS_DERIVED_EFLAG;
@@ -395,6 +400,7 @@
* @generated
*/
public EList getEndTypes() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
EList result = (EList) cache.get(this,
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehaviorExecutionSpecificationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehaviorExecutionSpecificationImpl.java
index 0131e31..0a5ac4d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehaviorExecutionSpecificationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehaviorExecutionSpecificationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: BehaviorExecutionSpecificationImpl.java,v 1.12 2006/04/10 19:16:18 khussey Exp $
+ * $Id: BehaviorExecutionSpecificationImpl.java,v 1.13 2006/11/14 18:02:15 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -108,6 +108,7 @@
* @generated
*/
public void setBehavior(Behavior newBehavior) {
+
Behavior oldBehavior = behavior;
behavior = newBehavior;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehaviorImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehaviorImpl.java
index 0f33d4b..ec907e4 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehaviorImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehaviorImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: BehaviorImpl.java,v 1.27 2006/05/24 20:54:27 khussey Exp $
+ * $Id: BehaviorImpl.java,v 1.28 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -187,6 +187,7 @@
* @generated
*/
public EList getRedefinedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -212,6 +213,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -237,6 +239,7 @@
* @generated
*/
public EList getRedefinitionContexts() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -275,6 +278,7 @@
* @generated
*/
public void setIsReentrant(boolean newIsReentrant) {
+
boolean oldIsReentrant = (eFlags & IS_REENTRANT_EFLAG) != 0;
if (newIsReentrant)
eFlags |= IS_REENTRANT_EFLAG;
@@ -408,6 +412,7 @@
* @generated
*/
public BehavioredClassifier basicGetContext() {
+
return BehaviorOperations.getContext(this);
}
@@ -658,6 +663,7 @@
* @generated
*/
public void setSpecification(BehavioralFeature newSpecification) {
+
if (newSpecification != specification) {
NotificationChain msgs = null;
if (specification != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehavioralFeatureImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehavioralFeatureImpl.java
index b57b9ce..eb7cb88 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehavioralFeatureImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehavioralFeatureImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: BehavioralFeatureImpl.java,v 1.19 2006/05/24 20:54:28 khussey Exp $
+ * $Id: BehavioralFeatureImpl.java,v 1.20 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -228,6 +228,7 @@
* @generated
*/
public EList getRedefinedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -286,6 +287,7 @@
* @generated
*/
public EList getRedefinitionContextsGen() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -385,6 +387,7 @@
* @generated
*/
public void setIsLeaf(boolean newIsLeaf) {
+
boolean oldIsLeaf = (eFlags & IS_LEAF_EFLAG) != 0;
if (newIsLeaf)
eFlags |= IS_LEAF_EFLAG;
@@ -402,6 +405,7 @@
* @generated
*/
public EList getFeaturingClassifiersGen() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -506,6 +510,7 @@
* @generated
*/
public void setIsStatic(boolean newIsStatic) {
+
boolean oldIsStatic = (eFlags & IS_STATIC_EFLAG) != 0;
if (newIsStatic)
eFlags |= IS_STATIC_EFLAG;
@@ -524,6 +529,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -619,6 +625,7 @@
* @generated
*/
public void setIsAbstract(boolean newIsAbstract) {
+
boolean oldIsAbstract = (eFlags & IS_ABSTRACT_EFLAG) != 0;
if (newIsAbstract)
eFlags |= IS_ABSTRACT_EFLAG;
@@ -688,6 +695,7 @@
* @generated
*/
public void setConcurrency(CallConcurrencyKind newConcurrency) {
+
CallConcurrencyKind oldConcurrency = concurrency;
concurrency = newConcurrency == null
? CONCURRENCY_EDEFAULT
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehavioredClassifierImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehavioredClassifierImpl.java
index b02e24c..9748270 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehavioredClassifierImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehavioredClassifierImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: BehavioredClassifierImpl.java,v 1.27 2006/05/24 20:54:27 khussey Exp $
+ * $Id: BehavioredClassifierImpl.java,v 1.28 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -143,6 +143,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -169,6 +170,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -297,6 +299,7 @@
* @generated
*/
public void setClassifierBehavior(Behavior newClassifierBehavior) {
+
Behavior oldClassifierBehavior = classifierBehavior;
classifierBehavior = newClassifierBehavior;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BroadcastSignalActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BroadcastSignalActionImpl.java
index d853617..de2bdca 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BroadcastSignalActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BroadcastSignalActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: BroadcastSignalActionImpl.java,v 1.13 2006/04/10 19:16:19 khussey Exp $
+ * $Id: BroadcastSignalActionImpl.java,v 1.14 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -114,6 +114,7 @@
* @generated
*/
public void setSignal(Signal newSignal) {
+
Signal oldSignal = signal;
signal = newSignal;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallActionImpl.java
index cfb8cff..5bcd087 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: CallActionImpl.java,v 1.21 2006/05/24 20:54:28 khussey Exp $
+ * $Id: CallActionImpl.java,v 1.22 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -122,6 +122,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -153,6 +154,7 @@
* @generated
*/
public void setIsSynchronous(boolean newIsSynchronous) {
+
boolean oldIsSynchronous = (eFlags & IS_SYNCHRONOUS_EFLAG) != 0;
if (newIsSynchronous)
eFlags |= IS_SYNCHRONOUS_EFLAG;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallBehaviorActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallBehaviorActionImpl.java
index 1ab3749..7ec5b49 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallBehaviorActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallBehaviorActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: CallBehaviorActionImpl.java,v 1.13 2006/04/10 19:16:20 khussey Exp $
+ * $Id: CallBehaviorActionImpl.java,v 1.14 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -114,6 +114,7 @@
* @generated
*/
public void setBehavior(Behavior newBehavior) {
+
Behavior oldBehavior = behavior;
behavior = newBehavior;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallEventImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallEventImpl.java
index 5876190..9f7ce34 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallEventImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallEventImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: CallEventImpl.java,v 1.10 2006/04/10 19:16:20 khussey Exp $
+ * $Id: CallEventImpl.java,v 1.11 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -106,6 +106,7 @@
* @generated
*/
public void setOperation(Operation newOperation) {
+
Operation oldOperation = operation;
operation = newOperation;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallOperationActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallOperationActionImpl.java
index 04b5c02..484ecdf 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallOperationActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallOperationActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: CallOperationActionImpl.java,v 1.21 2006/05/24 20:54:28 khussey Exp $
+ * $Id: CallOperationActionImpl.java,v 1.22 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -110,6 +110,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -162,6 +163,7 @@
* @generated
*/
public void setOperation(Operation newOperation) {
+
Operation oldOperation = operation;
operation = newOperation;
if (eNotificationRequired())
@@ -237,6 +239,7 @@
* @generated
*/
public void setTarget(InputPin newTarget) {
+
if (newTarget != target) {
NotificationChain msgs = null;
if (target != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ChangeEventImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ChangeEventImpl.java
index 2d4375b..3faf5b1 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ChangeEventImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ChangeEventImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ChangeEventImpl.java,v 1.17 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ChangeEventImpl.java,v 1.18 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -91,6 +91,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -178,6 +179,7 @@
* @generated
*/
public void setChangeExpression(ValueSpecification newChangeExpression) {
+
if (newChangeExpression != changeExpression) {
NotificationChain msgs = null;
if (changeExpression != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassImpl.java
index bafaf28..cc25187 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ClassImpl.java,v 1.36 2006/05/24 20:54:27 khussey Exp $
+ * $Id: ClassImpl.java,v 1.37 2006/11/14 18:02:15 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -219,6 +219,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -243,6 +244,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -368,6 +370,7 @@
* @generated
*/
public void setClassifierBehavior(Behavior newClassifierBehavior) {
+
Behavior oldClassifierBehavior = classifierBehavior;
classifierBehavior = newClassifierBehavior;
if (eNotificationRequired())
@@ -528,6 +531,7 @@
* @generated
*/
public EList getFeatures() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -551,6 +555,7 @@
* @generated
*/
public EList getAttributes() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -848,6 +853,7 @@
* @generated
*/
public void setIsActive(boolean newIsActive) {
+
boolean oldIsActive = (eFlags & IS_ACTIVE_EFLAG) != 0;
if (newIsActive)
eFlags |= IS_ACTIVE_EFLAG;
@@ -965,6 +971,7 @@
* @generated
*/
public EList getExtensions() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
EList result = (EList) cache.get(this,
@@ -1100,6 +1107,7 @@
* @generated
*/
public void setIsAbstract(boolean newIsAbstract) {
+
boolean oldIsAbstract = (eFlags & IS_ABSTRACT_EFLAG) != 0;
if (newIsAbstract)
eFlags |= IS_ABSTRACT_EFLAG;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassifierImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassifierImpl.java
index 7485359..5014801 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassifierImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassifierImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ClassifierImpl.java,v 1.36 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ClassifierImpl.java,v 1.37 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -299,6 +299,7 @@
* @generated
*/
public EList getRedefinedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -355,6 +356,7 @@
* @generated
*/
public EList getRedefinitionContextsGen() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -451,6 +453,7 @@
* @generated
*/
public void setIsLeaf(boolean newIsLeaf) {
+
boolean oldIsLeaf = (eFlags & IS_LEAF_EFLAG) != 0;
if (newIsLeaf)
eFlags |= IS_LEAF_EFLAG;
@@ -556,6 +559,7 @@
* @generated
*/
public void setTemplateParameter(TemplateParameter newTemplateParameter) {
+
if (newTemplateParameter != templateParameter) {
NotificationChain msgs = null;
if (templateParameter != null)
@@ -635,6 +639,7 @@
*/
public void setOwningTemplateParameter(
TemplateParameter newOwningTemplateParameter) {
+
if (newOwningTemplateParameter != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.CLASSIFIER__OWNING_TEMPLATE_PARAMETER && newOwningTemplateParameter != null)) {
if (EcoreUtil.isAncestor(this, newOwningTemplateParameter))
@@ -675,6 +680,7 @@
* @generated
*/
public void setVisibility(VisibilityKind newVisibility) {
+
VisibilityKind oldVisibility = visibility;
visibility = newVisibility == null
? VISIBILITY_EDEFAULT
@@ -762,6 +768,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -921,6 +928,7 @@
*/
public void setOwnedTemplateSignature(
TemplateSignature newOwnedTemplateSignature) {
+
if (newOwnedTemplateSignature != ownedTemplateSignature) {
NotificationChain msgs = null;
if (ownedTemplateSignature != null)
@@ -981,6 +989,7 @@
* @generated
*/
public EList getFeatures() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -1034,6 +1043,7 @@
* @generated
*/
public EList getMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -1057,6 +1067,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -1082,6 +1093,7 @@
* @generated
*/
public EList getAttributes() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -1219,6 +1231,7 @@
* @generated
*/
public void setIsAbstract(boolean newIsAbstract) {
+
boolean oldIsAbstract = (eFlags & IS_ABSTRACT_EFLAG) != 0;
if (newIsAbstract)
eFlags |= IS_ABSTRACT_EFLAG;
@@ -1294,6 +1307,7 @@
* @generated
*/
public EList getInheritedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
EList result = (EList) cache.get(this,
@@ -1387,6 +1401,7 @@
* @generated
*/
public EList getGenerals() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
EList result = (EList) cache.get(this,
@@ -1621,6 +1636,7 @@
* @generated
*/
public void setRepresentation(CollaborationUse newRepresentation) {
+
CollaborationUse oldRepresentation = representation;
representation = newRepresentation;
if (eNotificationRequired())
@@ -2771,6 +2787,7 @@
* @generated
*/
public Element basicGetOwner() {
+
TemplateParameter owningTemplateParameter = basicGetOwningTemplateParameter();
if (owningTemplateParameter != null) {
return owningTemplateParameter;
@@ -2794,6 +2811,7 @@
* @generated
*/
public Namespace basicGetNamespace() {
+
org.eclipse.uml2.uml.Package package_ = basicGetPackage();
if (package_ != null) {
return package_;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassifierTemplateParameterImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassifierTemplateParameterImpl.java
index a276b2e..59aacea 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassifierTemplateParameterImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassifierTemplateParameterImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ClassifierTemplateParameterImpl.java,v 1.16 2006/04/10 19:16:20 khussey Exp $
+ * $Id: ClassifierTemplateParameterImpl.java,v 1.17 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -128,6 +128,7 @@
* @generated
*/
public void setAllowSubstitutable(boolean newAllowSubstitutable) {
+
boolean oldAllowSubstitutable = (eFlags & ALLOW_SUBSTITUTABLE_EFLAG) != 0;
if (newAllowSubstitutable)
eFlags |= ALLOW_SUBSTITUTABLE_EFLAG;
@@ -176,6 +177,7 @@
* @generated
*/
public void setDefaultClassifier(Classifier newDefaultClassifier) {
+
Classifier oldDefaultClassifier = defaultClassifier;
defaultClassifier = newDefaultClassifier;
if (eNotificationRequired())
@@ -221,6 +223,7 @@
* @generated
*/
public void setConstrainingClassifier(Classifier newConstrainingClassifier) {
+
Classifier oldConstrainingClassifier = constrainingClassifier;
constrainingClassifier = newConstrainingClassifier;
if (eNotificationRequired())
@@ -316,6 +319,7 @@
* @generated
*/
public void setParameteredElement(ParameterableElement newParameteredElement) {
+
if (newParameteredElement != parameteredElement) {
NotificationChain msgs = null;
if (parameteredElement != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClauseImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClauseImpl.java
index cdde74b..710d21c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClauseImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClauseImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ClauseImpl.java,v 1.11 2006/04/10 19:16:18 khussey Exp $
+ * $Id: ClauseImpl.java,v 1.12 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -283,6 +283,7 @@
* @generated
*/
public void setDecider(OutputPin newDecider) {
+
OutputPin oldDecider = decider;
decider = newDecider;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClearAssociationActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClearAssociationActionImpl.java
index 07f39fe..33cf6d8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClearAssociationActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClearAssociationActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ClearAssociationActionImpl.java,v 1.21 2006/05/24 20:54:27 khussey Exp $
+ * $Id: ClearAssociationActionImpl.java,v 1.22 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -109,6 +109,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -194,6 +195,7 @@
* @generated
*/
public void setObject(InputPin newObject) {
+
if (newObject != object) {
NotificationChain msgs = null;
if (object != null)
@@ -274,6 +276,7 @@
* @generated
*/
public void setAssociation(Association newAssociation) {
+
Association oldAssociation = association;
association = newAssociation;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CollaborationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CollaborationImpl.java
index 46585fc..55c20f6 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CollaborationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CollaborationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: CollaborationImpl.java,v 1.25 2006/05/24 20:54:28 khussey Exp $
+ * $Id: CollaborationImpl.java,v 1.26 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -131,6 +131,7 @@
* @generated
*/
public EList getRoles() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -186,6 +187,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -211,6 +213,7 @@
* @generated
*/
public EList getAttributes() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -235,6 +238,7 @@
* @generated
*/
public EList getMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -260,6 +264,7 @@
* @generated
*/
public EList getFeatures() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CollaborationUseImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CollaborationUseImpl.java
index b3dff79..125bd9e 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CollaborationUseImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CollaborationUseImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: CollaborationUseImpl.java,v 1.17 2006/05/24 20:54:28 khussey Exp $
+ * $Id: CollaborationUseImpl.java,v 1.18 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -109,6 +109,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -160,6 +161,7 @@
* @generated
*/
public void setType(Collaboration newType) {
+
Collaboration oldType = type;
type = newType;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CombinedFragmentImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CombinedFragmentImpl.java
index dfd339a..3624d0b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CombinedFragmentImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CombinedFragmentImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: CombinedFragmentImpl.java,v 1.18 2006/05/24 20:54:28 khussey Exp $
+ * $Id: CombinedFragmentImpl.java,v 1.19 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -132,6 +132,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -166,6 +167,7 @@
*/
public void setInteractionOperator(
InteractionOperatorKind newInteractionOperator) {
+
InteractionOperatorKind oldInteractionOperator = interactionOperator;
interactionOperator = newInteractionOperator == null
? INTERACTION_OPERATOR_EDEFAULT
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CommentImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CommentImpl.java
index 4e133a6..95358e0 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CommentImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CommentImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005 IBM Corporation and others.
+ * Copyright (c) 2005, 2006 IBM Corporation 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
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: CommentImpl.java,v 1.9 2006/04/10 19:16:21 khussey Exp $
+ * $Id: CommentImpl.java,v 1.10 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -116,6 +116,7 @@
* @generated
*/
public void setBody(String newBody) {
+
String oldBody = body;
body = newBody;
boolean oldBodyESet = (eFlags & BODY_ESETFLAG) != 0;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentImpl.java
index 9fd2d49..1e93441 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ComponentImpl.java,v 1.28 2006/10/10 20:41:28 khussey Exp $
+ * $Id: ComponentImpl.java,v 1.29 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -140,6 +140,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -165,6 +166,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -198,6 +200,7 @@
* @generated
*/
public void setIsIndirectlyInstantiated(boolean newIsIndirectlyInstantiated) {
+
boolean oldIsIndirectlyInstantiated = (eFlags & IS_INDIRECTLY_INSTANTIATED_EFLAG) != 0;
if (newIsIndirectlyInstantiated)
eFlags |= IS_INDIRECTLY_INSTANTIATED_EFLAG;
@@ -216,6 +219,7 @@
* @generated
*/
public EList getRequireds() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
EList result = (EList) cache.get(this,
@@ -261,6 +265,7 @@
* @generated
*/
public EList getProvideds() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
EList result = (EList) cache.get(this,
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentRealizationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentRealizationImpl.java
index 0ec6b0d..6ddfd8e 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentRealizationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentRealizationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ComponentRealizationImpl.java,v 1.14 2006/05/24 20:54:27 khussey Exp $
+ * $Id: ComponentRealizationImpl.java,v 1.15 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -203,6 +203,7 @@
* @generated
*/
public void setAbstraction(Component newAbstraction) {
+
if (newAbstraction != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.COMPONENT_REALIZATION__ABSTRACTION && newAbstraction != null)) {
if (EcoreUtil.isAncestor(this, newAbstraction))
@@ -258,6 +259,7 @@
* @generated
*/
public void setRealizingClassifier(Classifier newRealizingClassifier) {
+
Classifier oldRealizingClassifier = realizingClassifier;
realizingClassifier = newRealizingClassifier;
if (eNotificationRequired())
@@ -598,6 +600,7 @@
* @generated
*/
public Element basicGetOwner() {
+
Component abstraction = basicGetAbstraction();
if (abstraction != null) {
return abstraction;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConditionalNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConditionalNodeImpl.java
index 0c4d5c8..3eba15e 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConditionalNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConditionalNodeImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ConditionalNodeImpl.java,v 1.20 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ConditionalNodeImpl.java,v 1.21 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -155,6 +155,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -179,6 +180,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -211,6 +213,7 @@
* @generated
*/
public void setIsDeterminate(boolean newIsDeterminate) {
+
boolean oldIsDeterminate = (eFlags & IS_DETERMINATE_EFLAG) != 0;
if (newIsDeterminate)
eFlags |= IS_DETERMINATE_EFLAG;
@@ -238,6 +241,7 @@
* @generated
*/
public void setIsAssured(boolean newIsAssured) {
+
boolean oldIsAssured = (eFlags & IS_ASSURED_EFLAG) != 0;
if (newIsAssured)
eFlags |= IS_ASSURED_EFLAG;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectableElementImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectableElementImpl.java
index e020b45..92ee435 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectableElementImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectableElementImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ConnectableElementImpl.java,v 1.15 2006/05/24 20:54:27 khussey Exp $
+ * $Id: ConnectableElementImpl.java,v 1.16 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -195,6 +195,7 @@
* @generated
*/
public void setTemplateParameter(TemplateParameter newTemplateParameter) {
+
if (newTemplateParameter != templateParameter) {
NotificationChain msgs = null;
if (templateParameter != null)
@@ -274,6 +275,7 @@
*/
public void setOwningTemplateParameter(
TemplateParameter newOwningTemplateParameter) {
+
if (newOwningTemplateParameter != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.CONNECTABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER && newOwningTemplateParameter != null)) {
if (EcoreUtil.isAncestor(this, newOwningTemplateParameter))
@@ -632,6 +634,7 @@
* @generated
*/
public Element basicGetOwner() {
+
TemplateParameter owningTemplateParameter = basicGetOwningTemplateParameter();
if (owningTemplateParameter != null) {
return owningTemplateParameter;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectableElementTemplateParameterImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectableElementTemplateParameterImpl.java
index 96fc458..62031d5 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectableElementTemplateParameterImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectableElementTemplateParameterImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ConnectableElementTemplateParameterImpl.java,v 1.13 2006/04/10 19:16:19 khussey Exp $
+ * $Id: ConnectableElementTemplateParameterImpl.java,v 1.14 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -146,6 +146,7 @@
* @generated
*/
public void setParameteredElement(ParameterableElement newParameteredElement) {
+
if (newParameteredElement != parameteredElement) {
NotificationChain msgs = null;
if (parameteredElement != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectionPointReferenceImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectionPointReferenceImpl.java
index d1349ea..b28b285 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectionPointReferenceImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectionPointReferenceImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ConnectionPointReferenceImpl.java,v 1.15 2006/05/24 20:54:27 khussey Exp $
+ * $Id: ConnectionPointReferenceImpl.java,v 1.16 2006/11/14 18:02:15 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -232,6 +232,7 @@
* @generated
*/
public void setState(State newState) {
+
if (newState != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.CONNECTION_POINT_REFERENCE__STATE && newState != null)) {
if (EcoreUtil.isAncestor(this, newState))
@@ -564,6 +565,7 @@
* @generated
*/
public Namespace basicGetNamespace() {
+
State state = basicGetState();
if (state != null) {
return state;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectorEndImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectorEndImpl.java
index 903f8f7..fbcd530 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectorEndImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectorEndImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ConnectorEndImpl.java,v 1.13 2006/04/10 19:16:19 khussey Exp $
+ * $Id: ConnectorEndImpl.java,v 1.14 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -110,6 +110,7 @@
* @generated
*/
public Property basicGetDefiningEnd() {
+
return ConnectorEndOperations.getDefiningEnd(this);
}
@@ -147,6 +148,7 @@
* @generated
*/
public void setPartWithPort(Property newPartWithPort) {
+
Property oldPartWithPort = partWithPort;
partWithPort = newPartWithPort;
if (eNotificationRequired())
@@ -211,6 +213,7 @@
* @generated
*/
public void setRole(ConnectableElement newRole) {
+
if (newRole != role) {
NotificationChain msgs = null;
if (role != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectorImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectorImpl.java
index 07203dd..7f28463 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectorImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectorImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ConnectorImpl.java,v 1.14 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ConnectorImpl.java,v 1.15 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -166,6 +166,7 @@
* @generated
*/
public EList getRedefinedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -191,6 +192,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -242,6 +244,7 @@
* @generated
*/
public void setType(Association newType) {
+
Association oldType = type;
type = newType;
if (eNotificationRequired())
@@ -329,6 +332,7 @@
* @generated
*/
public void setKind(ConnectorKind newKind) {
+
ConnectorKind oldKind = kind;
kind = newKind == null
? KIND_EDEFAULT
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConstraintImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConstraintImpl.java
index 180d5c0..8885f24 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConstraintImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConstraintImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ConstraintImpl.java,v 1.18 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ConstraintImpl.java,v 1.19 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -113,6 +113,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -211,6 +212,7 @@
* @generated
*/
public void setSpecification(ValueSpecification newSpecification) {
+
if (newSpecification != specification) {
NotificationChain msgs = null;
if (specification != null)
@@ -288,6 +290,7 @@
* @generated
*/
public void setContext(Namespace newContext) {
+
if (newContext != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.CONSTRAINT__CONTEXT && newContext != null)) {
if (EcoreUtil.isAncestor(this, newContext))
@@ -680,6 +683,7 @@
* @generated
*/
public Namespace basicGetNamespace() {
+
Namespace context = basicGetContext();
if (context != null) {
return context;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ContinuationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ContinuationImpl.java
index ccffd8b..32093ab 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ContinuationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ContinuationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ContinuationImpl.java,v 1.12 2006/04/10 19:16:20 khussey Exp $
+ * $Id: ContinuationImpl.java,v 1.13 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -102,6 +102,7 @@
* @generated
*/
public void setSetting(boolean newSetting) {
+
boolean oldSetting = (eFlags & SETTING_EFLAG) != 0;
if (newSetting)
eFlags |= SETTING_EFLAG;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CreateLinkObjectActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CreateLinkObjectActionImpl.java
index 1da8f1e..c544d8b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CreateLinkObjectActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CreateLinkObjectActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: CreateLinkObjectActionImpl.java,v 1.20 2006/05/24 20:54:28 khussey Exp $
+ * $Id: CreateLinkObjectActionImpl.java,v 1.21 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -97,6 +97,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -182,6 +183,7 @@
* @generated
*/
public void setResult(OutputPin newResult) {
+
if (newResult != result) {
NotificationChain msgs = null;
if (result != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CreateObjectActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CreateObjectActionImpl.java
index 4f1f6ca..7e28c77 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CreateObjectActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CreateObjectActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: CreateObjectActionImpl.java,v 1.20 2006/05/24 20:54:27 khussey Exp $
+ * $Id: CreateObjectActionImpl.java,v 1.21 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -109,6 +109,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -160,6 +161,7 @@
* @generated
*/
public void setClassifier(Classifier newClassifier) {
+
Classifier oldClassifier = classifier;
classifier = newClassifier;
if (eNotificationRequired())
@@ -235,6 +237,7 @@
* @generated
*/
public void setResult(OutputPin newResult) {
+
if (newResult != result) {
NotificationChain msgs = null;
if (result != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DataTypeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DataTypeImpl.java
index ec0b0c8..a889ad6 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DataTypeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DataTypeImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: DataTypeImpl.java,v 1.24 2006/05/24 20:54:28 khussey Exp $
+ * $Id: DataTypeImpl.java,v 1.25 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -110,6 +110,7 @@
* @generated
*/
public EList getAttributes() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -134,6 +135,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -159,6 +161,7 @@
* @generated
*/
public EList getFeatures() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DecisionNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DecisionNodeImpl.java
index df754fd..ae9d1dd 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DecisionNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DecisionNodeImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: DecisionNodeImpl.java,v 1.13 2006/04/10 19:16:19 khussey Exp $
+ * $Id: DecisionNodeImpl.java,v 1.14 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -113,6 +113,7 @@
* @generated
*/
public void setDecisionInput(Behavior newDecisionInput) {
+
Behavior oldDecisionInput = decisionInput;
decisionInput = newDecisionInput;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DependencyImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DependencyImpl.java
index 1f449c1..9756277 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DependencyImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DependencyImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: DependencyImpl.java,v 1.14 2006/05/24 20:54:28 khussey Exp $
+ * $Id: DependencyImpl.java,v 1.15 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -105,6 +105,7 @@
* @generated
*/
public EList getRelatedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -130,6 +131,7 @@
* @generated
*/
public EList getSources() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -153,6 +155,7 @@
* @generated
*/
public EList getTargets() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentImpl.java
index 6618478..495380c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: DeploymentImpl.java,v 1.18 2006/05/24 20:54:28 khussey Exp $
+ * $Id: DeploymentImpl.java,v 1.19 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -112,6 +112,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -312,6 +313,7 @@
* @generated
*/
public void setLocation(DeploymentTarget newLocation) {
+
if (newLocation != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.DEPLOYMENT__LOCATION && newLocation != null)) {
if (EcoreUtil.isAncestor(this, newLocation))
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentSpecificationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentSpecificationImpl.java
index 0663669..412a984 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentSpecificationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentSpecificationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: DeploymentSpecificationImpl.java,v 1.18 2006/04/10 19:16:19 khussey Exp $
+ * $Id: DeploymentSpecificationImpl.java,v 1.19 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -149,6 +149,7 @@
* @generated
*/
public void setDeploymentLocation(String newDeploymentLocation) {
+
String oldDeploymentLocation = deploymentLocation;
deploymentLocation = newDeploymentLocation;
boolean oldDeploymentLocationESet = (eFlags & DEPLOYMENT_LOCATION_ESETFLAG) != 0;
@@ -202,6 +203,7 @@
* @generated
*/
public void setExecutionLocation(String newExecutionLocation) {
+
String oldExecutionLocation = executionLocation;
executionLocation = newExecutionLocation;
boolean oldExecutionLocationESet = (eFlags & EXECUTION_LOCATION_ESETFLAG) != 0;
@@ -281,6 +283,7 @@
* @generated
*/
public void setDeployment(Deployment newDeployment) {
+
if (newDeployment != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.DEPLOYMENT_SPECIFICATION__DEPLOYMENT && newDeployment != null)) {
if (EcoreUtil.isAncestor(this, newDeployment))
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentTargetImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentTargetImpl.java
index 940f070..17c820e 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentTargetImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentTargetImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: DeploymentTargetImpl.java,v 1.18 2006/05/24 20:54:27 khussey Exp $
+ * $Id: DeploymentTargetImpl.java,v 1.19 2006/11/14 18:02:15 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -95,6 +95,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -192,6 +193,7 @@
* @generated
*/
public EList getDeployedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
EList result = (EList) cache.get(this,
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DestroyObjectActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DestroyObjectActionImpl.java
index cb82197..105b849 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DestroyObjectActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DestroyObjectActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: DestroyObjectActionImpl.java,v 1.21 2006/05/24 20:54:28 khussey Exp $
+ * $Id: DestroyObjectActionImpl.java,v 1.22 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -139,6 +139,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -172,6 +173,7 @@
* @generated
*/
public void setIsDestroyLinks(boolean newIsDestroyLinks) {
+
boolean oldIsDestroyLinks = (eFlags & IS_DESTROY_LINKS_EFLAG) != 0;
if (newIsDestroyLinks)
eFlags |= IS_DESTROY_LINKS_EFLAG;
@@ -199,6 +201,7 @@
* @generated
*/
public void setIsDestroyOwnedObjects(boolean newIsDestroyOwnedObjects) {
+
boolean oldIsDestroyOwnedObjects = (eFlags & IS_DESTROY_OWNED_OBJECTS_EFLAG) != 0;
if (newIsDestroyOwnedObjects)
eFlags |= IS_DESTROY_OWNED_OBJECTS_EFLAG;
@@ -277,6 +280,7 @@
* @generated
*/
public void setTarget(InputPin newTarget) {
+
if (newTarget != target) {
NotificationChain msgs = null;
if (target != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DirectedRelationshipImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DirectedRelationshipImpl.java
index e10f630..ac5e096 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DirectedRelationshipImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DirectedRelationshipImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: DirectedRelationshipImpl.java,v 1.10 2006/05/24 20:54:28 khussey Exp $
+ * $Id: DirectedRelationshipImpl.java,v 1.11 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -67,6 +67,7 @@
* @generated
*/
public EList getSources() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -90,6 +91,7 @@
* @generated
*/
public EList getRelatedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -116,6 +118,7 @@
* @generated
*/
public EList getTargets() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationConstraintImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationConstraintImpl.java
index f023e14..8da316b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationConstraintImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationConstraintImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: DurationConstraintImpl.java,v 1.18 2006/05/08 17:46:11 khussey Exp $
+ * $Id: DurationConstraintImpl.java,v 1.19 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -182,6 +182,7 @@
* @generated
*/
public void setSpecification(ValueSpecification newSpecification) {
+
if (newSpecification != specification) {
NotificationChain msgs = null;
if (specification != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationImpl.java
index b0efaf9..5910b87 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: DurationImpl.java,v 1.13 2006/04/10 19:16:21 khussey Exp $
+ * $Id: DurationImpl.java,v 1.14 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -125,6 +125,7 @@
* @generated
*/
public void setExpr(ValueSpecification newExpr) {
+
ValueSpecification oldExpr = expr;
expr = newExpr;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationIntervalImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationIntervalImpl.java
index 10c2209..1d14b9b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationIntervalImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationIntervalImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: DurationIntervalImpl.java,v 1.11 2006/04/10 19:16:19 khussey Exp $
+ * $Id: DurationIntervalImpl.java,v 1.12 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -93,6 +93,7 @@
* @generated
*/
public void setMinGen(ValueSpecification newMin) {
+
ValueSpecification oldMin = min;
min = newMin;
if (eNotificationRequired())
@@ -152,6 +153,7 @@
* @generated
*/
public void setMaxGen(ValueSpecification newMax) {
+
ValueSpecification oldMax = max;
max = newMax;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ElementImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ElementImpl.java
index e71618e..07f8b1c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ElementImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ElementImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ElementImpl.java,v 1.34 2006/11/08 17:22:10 khussey Exp $
+ * $Id: ElementImpl.java,v 1.35 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -101,6 +101,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -713,6 +714,7 @@
* @generated
*/
public Element basicGetOwnerGen() {
+
return null;
}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ElementImportImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ElementImportImpl.java
index 258ebe7..22d6682 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ElementImportImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ElementImportImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ElementImportImpl.java,v 1.13 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ElementImportImpl.java,v 1.14 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -150,6 +150,7 @@
* @generated
*/
public EList getTargets() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -173,6 +174,7 @@
* @generated
*/
public EList getSources() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -205,6 +207,7 @@
* @generated
*/
public void setVisibility(VisibilityKind newVisibility) {
+
VisibilityKind oldVisibility = visibility;
visibility = newVisibility == null
? VISIBILITY_EDEFAULT
@@ -231,6 +234,7 @@
* @generated
*/
public void setAlias(String newAlias) {
+
String oldAlias = alias;
alias = newAlias;
boolean oldAliasESet = (eFlags & ALIAS_ESETFLAG) != 0;
@@ -301,6 +305,7 @@
* @generated
*/
public void setImportedElement(PackageableElement newImportedElement) {
+
PackageableElement oldImportedElement = importedElement;
importedElement = newImportedElement;
if (eNotificationRequired())
@@ -351,6 +356,7 @@
* @generated
*/
public void setImportingNamespace(Namespace newImportingNamespace) {
+
if (newImportingNamespace != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.ELEMENT_IMPORT__IMPORTING_NAMESPACE && newImportingNamespace != null)) {
if (EcoreUtil.isAncestor(this, newImportingNamespace))
@@ -670,6 +676,7 @@
* @generated
*/
public Element basicGetOwner() {
+
Namespace importingNamespace = basicGetImportingNamespace();
if (importingNamespace != null) {
return importingNamespace;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/EnumerationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/EnumerationImpl.java
index 4efdb9b..fb13146 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/EnumerationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/EnumerationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: EnumerationImpl.java,v 1.22 2006/05/24 20:54:27 khussey Exp $
+ * $Id: EnumerationImpl.java,v 1.23 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -91,6 +91,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/EnumerationLiteralImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/EnumerationLiteralImpl.java
index ae5131b..67ee673 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/EnumerationLiteralImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/EnumerationLiteralImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: EnumerationLiteralImpl.java,v 1.14 2006/05/24 20:54:27 khussey Exp $
+ * $Id: EnumerationLiteralImpl.java,v 1.15 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -122,6 +122,7 @@
* @generated
*/
public void setEnumeration(Enumeration newEnumeration) {
+
if (newEnumeration != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.ENUMERATION_LITERAL__ENUMERATION && newEnumeration != null)) {
if (EcoreUtil.isAncestor(this, newEnumeration))
@@ -463,6 +464,7 @@
* @generated
*/
public Namespace basicGetNamespace() {
+
Enumeration enumeration = basicGetEnumeration();
if (enumeration != null) {
return enumeration;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExceptionHandlerImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExceptionHandlerImpl.java
index 5298300..8d0f6ea 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExceptionHandlerImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExceptionHandlerImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ExceptionHandlerImpl.java,v 1.13 2006/05/24 20:54:27 khussey Exp $
+ * $Id: ExceptionHandlerImpl.java,v 1.14 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -156,6 +156,7 @@
* @generated
*/
public void setHandlerBody(ExecutableNode newHandlerBody) {
+
ExecutableNode oldHandlerBody = handlerBody;
handlerBody = newHandlerBody;
if (eNotificationRequired())
@@ -199,6 +200,7 @@
* @generated
*/
public void setExceptionInput(ObjectNode newExceptionInput) {
+
ObjectNode oldExceptionInput = exceptionInput;
exceptionInput = newExceptionInput;
if (eNotificationRequired())
@@ -292,6 +294,7 @@
* @generated
*/
public void setProtectedNode(ExecutableNode newProtectedNode) {
+
if (newProtectedNode != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.EXCEPTION_HANDLER__PROTECTED_NODE && newProtectedNode != null)) {
if (EcoreUtil.isAncestor(this, newProtectedNode))
@@ -540,6 +543,7 @@
* @generated
*/
public Element basicGetOwner() {
+
ExecutableNode protectedNode = basicGetProtectedNode();
if (protectedNode != null) {
return protectedNode;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutableNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutableNodeImpl.java
index 3e8eb1f..954c0df 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutableNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutableNodeImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ExecutableNodeImpl.java,v 1.17 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ExecutableNodeImpl.java,v 1.18 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -89,6 +89,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutionOccurrenceSpecificationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutionOccurrenceSpecificationImpl.java
index 417d68d..aabc6d8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutionOccurrenceSpecificationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutionOccurrenceSpecificationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ExecutionOccurrenceSpecificationImpl.java,v 1.12 2006/04/10 19:16:21 khussey Exp $
+ * $Id: ExecutionOccurrenceSpecificationImpl.java,v 1.13 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -112,6 +112,7 @@
* @generated
*/
public void setExecution(ExecutionSpecification newExecution) {
+
ExecutionSpecification oldExecution = execution;
execution = newExecution;
if (eNotificationRequired())
@@ -155,6 +156,7 @@
* @generated
*/
public void setEventGen(Event newEvent) {
+
Event oldEvent = event;
event = newEvent;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutionSpecificationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutionSpecificationImpl.java
index 07ff81a..3b0612c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutionSpecificationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutionSpecificationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ExecutionSpecificationImpl.java,v 1.12 2006/04/10 19:16:19 khussey Exp $
+ * $Id: ExecutionSpecificationImpl.java,v 1.13 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -124,6 +124,7 @@
* @generated
*/
public void setStart(OccurrenceSpecification newStart) {
+
OccurrenceSpecification oldStart = start;
start = newStart;
if (eNotificationRequired())
@@ -166,6 +167,7 @@
* @generated
*/
public void setFinish(OccurrenceSpecification newFinish) {
+
OccurrenceSpecification oldFinish = finish;
finish = newFinish;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpansionNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpansionNodeImpl.java
index 9a39ebd..bf21d48 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpansionNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpansionNodeImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ExpansionNodeImpl.java,v 1.15 2006/04/10 19:16:19 khussey Exp $
+ * $Id: ExpansionNodeImpl.java,v 1.16 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -147,6 +147,7 @@
* @generated
*/
public void setRegionAsOutput(ExpansionRegion newRegionAsOutput) {
+
if (newRegionAsOutput != regionAsOutput) {
NotificationChain msgs = null;
if (regionAsOutput != null)
@@ -223,6 +224,7 @@
* @generated
*/
public void setRegionAsInput(ExpansionRegion newRegionAsInput) {
+
if (newRegionAsInput != regionAsInput) {
NotificationChain msgs = null;
if (regionAsInput != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpansionRegionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpansionRegionImpl.java
index 4981a1f..adb76c2 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpansionRegionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpansionRegionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ExpansionRegionImpl.java,v 1.16 2006/04/10 19:16:21 khussey Exp $
+ * $Id: ExpansionRegionImpl.java,v 1.17 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -135,6 +135,7 @@
* @generated
*/
public void setMode(ExpansionKind newMode) {
+
ExpansionKind oldMode = mode;
mode = newMode == null
? MODE_EDEFAULT
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpressionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpressionImpl.java
index bbbade8..911d654 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpressionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpressionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ExpressionImpl.java,v 1.17 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ExpressionImpl.java,v 1.18 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -123,6 +123,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -156,6 +157,7 @@
* @generated
*/
public void setSymbol(String newSymbol) {
+
String oldSymbol = symbol;
symbol = newSymbol;
boolean oldSymbolESet = (eFlags & SYMBOL_ESETFLAG) != 0;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtendImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtendImpl.java
index ea64ead..3a77c47 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtendImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtendImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ExtendImpl.java,v 1.19 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ExtendImpl.java,v 1.20 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -128,6 +128,7 @@
* @generated
*/
public EList getRelatedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -153,6 +154,7 @@
* @generated
*/
public EList getSources() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -176,6 +178,7 @@
* @generated
*/
public EList getTargets() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -199,6 +202,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -251,6 +255,7 @@
* @generated
*/
public void setExtendedCase(UseCase newExtendedCase) {
+
UseCase oldExtendedCase = extendedCase;
extendedCase = newExtendedCase;
if (eNotificationRequired())
@@ -325,6 +330,7 @@
* @generated
*/
public void setCondition(Constraint newCondition) {
+
if (newCondition != condition) {
NotificationChain msgs = null;
if (condition != null)
@@ -448,6 +454,7 @@
* @generated
*/
public void setExtension(UseCase newExtension) {
+
if (newExtension != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.EXTEND__EXTENSION && newExtension != null)) {
if (EcoreUtil.isAncestor(this, newExtension))
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionEndImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionEndImpl.java
index 0bc21b5..ef4fab5 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionEndImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionEndImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ExtensionEndImpl.java,v 1.19 2006/04/10 19:16:20 khussey Exp $
+ * $Id: ExtensionEndImpl.java,v 1.20 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -98,6 +98,7 @@
* @generated
*/
public void setType(Type newType) {
+
Type oldType = type;
type = newType;
if (eNotificationRequired())
@@ -121,6 +122,7 @@
* @generated
*/
public int getLower() {
+
return ExtensionEndOperations.getLower(this);
}
@@ -130,6 +132,7 @@
* @generated
*/
public void setLower(int newLower) {
+
ExtensionEndOperations.setLower(this, newLower);
}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionImpl.java
index dd59026..3d2090c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ExtensionImpl.java,v 1.24 2006/05/08 17:46:10 khussey Exp $
+ * $Id: ExtensionImpl.java,v 1.25 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -166,6 +166,7 @@
* @generated
*/
public boolean isRequired() {
+
return ExtensionOperations.isRequired(this);
}
@@ -187,6 +188,7 @@
* @generated
*/
public org.eclipse.uml2.uml.Class basicGetMetaclass() {
+
return ExtensionOperations.getMetaclass(this);
}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionPointImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionPointImpl.java
index c17ebd7..325b7fd 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionPointImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionPointImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ExtensionPointImpl.java,v 1.13 2006/04/10 19:16:18 khussey Exp $
+ * $Id: ExtensionPointImpl.java,v 1.14 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -112,6 +112,7 @@
* @generated
*/
public void setUseCase(UseCase newUseCase) {
+
if (newUseCase != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.EXTENSION_POINT__USE_CASE && newUseCase != null)) {
if (EcoreUtil.isAncestor(this, newUseCase))
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/FeatureImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/FeatureImpl.java
index 5f26411..4c05fdc 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/FeatureImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/FeatureImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: FeatureImpl.java,v 1.13 2006/05/24 20:54:28 khussey Exp $
+ * $Id: FeatureImpl.java,v 1.14 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -94,6 +94,7 @@
* @generated
*/
public EList getFeaturingClassifiersGen() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -184,6 +185,7 @@
* @generated
*/
public void setIsStatic(boolean newIsStatic) {
+
boolean oldIsStatic = (eFlags & IS_STATIC_EFLAG) != 0;
if (newIsStatic)
eFlags |= IS_STATIC_EFLAG;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralOrderingImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralOrderingImpl.java
index c183453..6460267 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralOrderingImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralOrderingImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: GeneralOrderingImpl.java,v 1.11 2006/04/10 19:16:19 khussey Exp $
+ * $Id: GeneralOrderingImpl.java,v 1.12 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -140,6 +140,7 @@
* @generated
*/
public void setBefore(OccurrenceSpecification newBefore) {
+
if (newBefore != before) {
NotificationChain msgs = null;
if (before != null)
@@ -214,6 +215,7 @@
* @generated
*/
public void setAfter(OccurrenceSpecification newAfter) {
+
if (newAfter != after) {
NotificationChain msgs = null;
if (after != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralizationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralizationImpl.java
index a2eeb35..244464f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralizationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralizationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: GeneralizationImpl.java,v 1.14 2006/05/24 20:54:28 khussey Exp $
+ * $Id: GeneralizationImpl.java,v 1.15 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -141,6 +141,7 @@
* @generated
*/
public EList getTargets() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -164,6 +165,7 @@
* @generated
*/
public EList getSources() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -196,6 +198,7 @@
* @generated
*/
public void setIsSubstitutable(boolean newIsSubstitutable) {
+
boolean oldIsSubstitutable = (eFlags & IS_SUBSTITUTABLE_EFLAG) != 0;
if (newIsSubstitutable)
eFlags |= IS_SUBSTITUTABLE_EFLAG;
@@ -272,6 +275,7 @@
* @generated
*/
public void setGeneral(Classifier newGeneral) {
+
Classifier oldGeneral = general;
general = newGeneral;
if (eNotificationRequired())
@@ -364,6 +368,7 @@
* @generated
*/
public void setSpecific(Classifier newSpecific) {
+
if (newSpecific != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.GENERALIZATION__SPECIFIC && newSpecific != null)) {
if (EcoreUtil.isAncestor(this, newSpecific))
@@ -670,6 +675,7 @@
* @generated
*/
public Element basicGetOwner() {
+
Classifier specific = basicGetSpecific();
if (specific != null) {
return specific;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralizationSetImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralizationSetImpl.java
index 46a467d..6dfe5fc 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralizationSetImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralizationSetImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: GeneralizationSetImpl.java,v 1.13 2006/04/10 19:16:19 khussey Exp $
+ * $Id: GeneralizationSetImpl.java,v 1.14 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -154,6 +154,7 @@
* @generated
*/
public void setIsCovering(boolean newIsCovering) {
+
boolean oldIsCovering = (eFlags & IS_COVERING_EFLAG) != 0;
if (newIsCovering)
eFlags |= IS_COVERING_EFLAG;
@@ -181,6 +182,7 @@
* @generated
*/
public void setIsDisjoint(boolean newIsDisjoint) {
+
boolean oldIsDisjoint = (eFlags & IS_DISJOINT_EFLAG) != 0;
if (newIsDisjoint)
eFlags |= IS_DISJOINT_EFLAG;
@@ -249,6 +251,7 @@
* @generated
*/
public void setPowertype(Classifier newPowertype) {
+
if (newPowertype != powertype) {
NotificationChain msgs = null;
if (powertype != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ImageImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ImageImpl.java
index ad90b96..4275c29 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ImageImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ImageImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005 IBM Corporation and others.
+ * Copyright (c) 2005, 2006 IBM Corporation 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
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ImageImpl.java,v 1.4 2006/04/10 19:16:20 khussey Exp $
+ * $Id: ImageImpl.java,v 1.5 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -162,6 +162,7 @@
* @generated
*/
public void setContent(String newContent) {
+
String oldContent = content;
content = newContent;
boolean oldContentESet = (eFlags & CONTENT_ESETFLAG) != 0;
@@ -212,6 +213,7 @@
* @generated
*/
public void setLocation(String newLocation) {
+
String oldLocation = location;
location = newLocation;
boolean oldLocationESet = (eFlags & LOCATION_ESETFLAG) != 0;
@@ -263,6 +265,7 @@
* @generated
*/
public void setFormat(String newFormat) {
+
String oldFormat = format;
format = newFormat;
boolean oldFormatESet = (eFlags & FORMAT_ESETFLAG) != 0;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IncludeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IncludeImpl.java
index 9541173..3be6e01 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IncludeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IncludeImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: IncludeImpl.java,v 1.14 2006/05/24 20:54:27 khussey Exp $
+ * $Id: IncludeImpl.java,v 1.15 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -95,6 +95,7 @@
* @generated
*/
public EList getRelatedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -120,6 +121,7 @@
* @generated
*/
public EList getSources() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -143,6 +145,7 @@
* @generated
*/
public EList getTargets() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -193,6 +196,7 @@
* @generated
*/
public void setAddition(UseCase newAddition) {
+
UseCase oldAddition = addition;
addition = newAddition;
if (eNotificationRequired())
@@ -242,6 +246,7 @@
* @generated
*/
public void setIncludingCase(UseCase newIncludingCase) {
+
if (newIncludingCase != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.INCLUDE__INCLUDING_CASE && newIncludingCase != null)) {
if (EcoreUtil.isAncestor(this, newIncludingCase))
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InformationFlowImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InformationFlowImpl.java
index 937ea64..7e9c48e 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InformationFlowImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InformationFlowImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: InformationFlowImpl.java,v 1.12 2006/05/24 20:54:27 khussey Exp $
+ * $Id: InformationFlowImpl.java,v 1.13 2006/11/14 18:02:15 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -164,6 +164,7 @@
* @generated
*/
public EList getRelatedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -190,6 +191,7 @@
* @generated
*/
public EList getSources() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -213,6 +215,7 @@
* @generated
*/
public EList getTargets() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InstanceSpecificationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InstanceSpecificationImpl.java
index f804f82..b4a1d0c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InstanceSpecificationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InstanceSpecificationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: InstanceSpecificationImpl.java,v 1.17 2006/05/24 20:54:28 khussey Exp $
+ * $Id: InstanceSpecificationImpl.java,v 1.18 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -214,6 +214,7 @@
* @generated
*/
public void setTemplateParameter(TemplateParameter newTemplateParameter) {
+
if (newTemplateParameter != templateParameter) {
NotificationChain msgs = null;
if (templateParameter != null)
@@ -284,6 +285,7 @@
*/
public void setOwningTemplateParameter(
TemplateParameter newOwningTemplateParameter) {
+
if (newOwningTemplateParameter != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.INSTANCE_SPECIFICATION__OWNING_TEMPLATE_PARAMETER && newOwningTemplateParameter != null)) {
if (EcoreUtil.isAncestor(this, newOwningTemplateParameter))
@@ -324,6 +326,7 @@
* @generated
*/
public void setVisibility(VisibilityKind newVisibility) {
+
VisibilityKind oldVisibility = visibility;
visibility = newVisibility == null
? VISIBILITY_EDEFAULT
@@ -350,6 +353,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -482,6 +486,7 @@
* @generated
*/
public void setSpecification(ValueSpecification newSpecification) {
+
if (newSpecification != specification) {
NotificationChain msgs = null;
if (specification != null)
@@ -982,6 +987,7 @@
* @generated
*/
public Element basicGetOwner() {
+
TemplateParameter owningTemplateParameter = basicGetOwningTemplateParameter();
if (owningTemplateParameter != null) {
return owningTemplateParameter;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InstanceValueImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InstanceValueImpl.java
index 14bf53a..edb3df8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InstanceValueImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InstanceValueImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: InstanceValueImpl.java,v 1.11 2006/04/10 19:16:20 khussey Exp $
+ * $Id: InstanceValueImpl.java,v 1.12 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -109,6 +109,7 @@
* @generated
*/
public void setInstance(InstanceSpecification newInstance) {
+
InstanceSpecification oldInstance = instance;
instance = newInstance;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionConstraintImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionConstraintImpl.java
index 5de3012..95aae23 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionConstraintImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionConstraintImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: InteractionConstraintImpl.java,v 1.19 2006/05/24 20:54:28 khussey Exp $
+ * $Id: InteractionConstraintImpl.java,v 1.20 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -109,6 +109,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -196,6 +197,7 @@
* @generated
*/
public void setMinint(ValueSpecification newMinint) {
+
if (newMinint != minint) {
NotificationChain msgs = null;
if (minint != null)
@@ -298,6 +300,7 @@
* @generated
*/
public void setMaxint(ValueSpecification newMaxint) {
+
if (newMaxint != maxint) {
NotificationChain msgs = null;
if (maxint != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionFragmentImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionFragmentImpl.java
index 442da0e..ac7bd68 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionFragmentImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionFragmentImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: InteractionFragmentImpl.java,v 1.18 2006/05/24 20:54:28 khussey Exp $
+ * $Id: InteractionFragmentImpl.java,v 1.19 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -111,6 +111,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -268,6 +269,7 @@
* @generated
*/
public void setEnclosingInteraction(Interaction newEnclosingInteraction) {
+
if (newEnclosingInteraction != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.INTERACTION_FRAGMENT__ENCLOSING_INTERACTION && newEnclosingInteraction != null)) {
if (EcoreUtil.isAncestor(this, newEnclosingInteraction))
@@ -331,6 +333,7 @@
* @generated
*/
public void setEnclosingOperand(InteractionOperand newEnclosingOperand) {
+
if (newEnclosingOperand != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.INTERACTION_FRAGMENT__ENCLOSING_OPERAND && newEnclosingOperand != null)) {
if (EcoreUtil.isAncestor(this, newEnclosingOperand))
@@ -654,6 +657,7 @@
* @generated
*/
public Namespace basicGetNamespace() {
+
InteractionOperand enclosingOperand = basicGetEnclosingOperand();
if (enclosingOperand != null) {
return enclosingOperand;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionImpl.java
index 0f80afa..39294b2 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: InteractionImpl.java,v 1.26 2006/05/24 20:54:28 khussey Exp $
+ * $Id: InteractionImpl.java,v 1.27 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -177,6 +177,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -333,6 +334,7 @@
* @generated
*/
public void setEnclosingInteraction(Interaction newEnclosingInteraction) {
+
if (newEnclosingInteraction != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.INTERACTION__ENCLOSING_INTERACTION && newEnclosingInteraction != null)) {
if (EcoreUtil.isAncestor(this, newEnclosingInteraction))
@@ -396,6 +398,7 @@
* @generated
*/
public void setEnclosingOperand(InteractionOperand newEnclosingOperand) {
+
if (newEnclosingOperand != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.INTERACTION__ENCLOSING_OPERAND && newEnclosingOperand != null)) {
if (EcoreUtil.isAncestor(this, newEnclosingOperand))
@@ -424,6 +427,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -1782,6 +1786,7 @@
* @generated
*/
public Namespace basicGetNamespace() {
+
InteractionOperand enclosingOperand = basicGetEnclosingOperand();
if (enclosingOperand != null) {
return enclosingOperand;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionOperandImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionOperandImpl.java
index f9e81e8..48d797b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionOperandImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionOperandImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: InteractionOperandImpl.java,v 1.19 2006/05/24 20:54:27 khussey Exp $
+ * $Id: InteractionOperandImpl.java,v 1.20 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -143,6 +143,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -300,6 +301,7 @@
* @generated
*/
public void setEnclosingInteraction(Interaction newEnclosingInteraction) {
+
if (newEnclosingInteraction != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.INTERACTION_OPERAND__ENCLOSING_INTERACTION && newEnclosingInteraction != null)) {
if (EcoreUtil.isAncestor(this, newEnclosingInteraction))
@@ -363,6 +365,7 @@
* @generated
*/
public void setEnclosingOperand(InteractionOperand newEnclosingOperand) {
+
if (newEnclosingOperand != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.INTERACTION_OPERAND__ENCLOSING_OPERAND && newEnclosingOperand != null)) {
if (EcoreUtil.isAncestor(this, newEnclosingOperand))
@@ -391,6 +394,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -475,6 +479,7 @@
* @generated
*/
public void setGuard(InteractionConstraint newGuard) {
+
if (newGuard != guard) {
NotificationChain msgs = null;
if (guard != null)
@@ -1034,6 +1039,7 @@
* @generated
*/
public Namespace basicGetNamespace() {
+
InteractionOperand enclosingOperand = basicGetEnclosingOperand();
if (enclosingOperand != null) {
return enclosingOperand;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionUseImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionUseImpl.java
index 18a08ec..b31871a 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionUseImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionUseImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: InteractionUseImpl.java,v 1.20 2006/05/24 20:54:28 khussey Exp $
+ * $Id: InteractionUseImpl.java,v 1.21 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -122,6 +122,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -174,6 +175,7 @@
* @generated
*/
public void setRefersTo(Interaction newRefersTo) {
+
Interaction oldRefersTo = refersTo;
refersTo = newRefersTo;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterfaceImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterfaceImpl.java
index 041aefd..856f5ea 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterfaceImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterfaceImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: InterfaceImpl.java,v 1.24 2006/05/24 20:54:28 khussey Exp $
+ * $Id: InterfaceImpl.java,v 1.25 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -168,6 +168,7 @@
* @generated
*/
public EList getAttributes() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -192,6 +193,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -217,6 +219,7 @@
* @generated
*/
public EList getRedefinedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -242,6 +245,7 @@
* @generated
*/
public EList getFeatures() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -593,6 +597,7 @@
* @generated
*/
public void setProtocol(ProtocolStateMachine newProtocol) {
+
if (newProtocol != protocol) {
NotificationChain msgs = null;
if (protocol != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterfaceRealizationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterfaceRealizationImpl.java
index 0bc9cf0..77e5f14 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterfaceRealizationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterfaceRealizationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: InterfaceRealizationImpl.java,v 1.13 2006/04/10 19:16:19 khussey Exp $
+ * $Id: InterfaceRealizationImpl.java,v 1.14 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -173,6 +173,7 @@
* @generated
*/
public void setContract(Interface newContract) {
+
Interface oldContract = contract;
contract = newContract;
if (eNotificationRequired())
@@ -243,6 +244,7 @@
*/
public void setImplementingClassifier(
BehavioredClassifier newImplementingClassifier) {
+
if (newImplementingClassifier != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.INTERFACE_REALIZATION__IMPLEMENTING_CLASSIFIER && newImplementingClassifier != null)) {
if (EcoreUtil.isAncestor(this, newImplementingClassifier))
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterruptibleActivityRegionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterruptibleActivityRegionImpl.java
index a3c37af..491a923 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterruptibleActivityRegionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterruptibleActivityRegionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: InterruptibleActivityRegionImpl.java,v 1.15 2006/05/24 20:54:28 khussey Exp $
+ * $Id: InterruptibleActivityRegionImpl.java,v 1.16 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -104,6 +104,7 @@
* @generated
*/
public EList getContainedNodes() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IntervalConstraintImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IntervalConstraintImpl.java
index 8cdbe02..35caaf4 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IntervalConstraintImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IntervalConstraintImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: IntervalConstraintImpl.java,v 1.16 2006/05/08 17:46:10 khussey Exp $
+ * $Id: IntervalConstraintImpl.java,v 1.17 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -141,6 +141,7 @@
* @generated
*/
public void setSpecification(ValueSpecification newSpecification) {
+
if (newSpecification != specification) {
NotificationChain msgs = null;
if (specification != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IntervalImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IntervalImpl.java
index 614a5f0..747b4f8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IntervalImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IntervalImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: IntervalImpl.java,v 1.10 2006/04/10 19:16:19 khussey Exp $
+ * $Id: IntervalImpl.java,v 1.11 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -117,6 +117,7 @@
* @generated
*/
public void setMin(ValueSpecification newMin) {
+
ValueSpecification oldMin = min;
min = newMin;
if (eNotificationRequired())
@@ -158,6 +159,7 @@
* @generated
*/
public void setMax(ValueSpecification newMax) {
+
ValueSpecification oldMax = max;
max = newMax;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InvocationActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InvocationActionImpl.java
index 8891015..4dcb8d9 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InvocationActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InvocationActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: InvocationActionImpl.java,v 1.22 2006/05/24 20:54:27 khussey Exp $
+ * $Id: InvocationActionImpl.java,v 1.23 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -111,6 +111,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -231,6 +232,7 @@
* @generated
*/
public void setOnPort(Port newOnPort) {
+
Port oldOnPort = onPort;
onPort = newOnPort;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/JoinNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/JoinNodeImpl.java
index 660c628..54938a8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/JoinNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/JoinNodeImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: JoinNodeImpl.java,v 1.21 2006/05/24 20:54:28 khussey Exp $
+ * $Id: JoinNodeImpl.java,v 1.22 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -120,6 +120,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -153,6 +154,7 @@
* @generated
*/
public void setIsCombineDuplicate(boolean newIsCombineDuplicate) {
+
boolean oldIsCombineDuplicate = (eFlags & IS_COMBINE_DUPLICATE_EFLAG) != 0;
if (newIsCombineDuplicate)
eFlags |= IS_COMBINE_DUPLICATE_EFLAG;
@@ -230,6 +232,7 @@
* @generated
*/
public void setJoinSpec(ValueSpecification newJoinSpec) {
+
if (newJoinSpec != joinSpec) {
NotificationChain msgs = null;
if (joinSpec != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LifelineImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LifelineImpl.java
index 96e8307..fba605f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LifelineImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LifelineImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: LifelineImpl.java,v 1.18 2006/05/24 20:54:28 khussey Exp $
+ * $Id: LifelineImpl.java,v 1.19 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -151,6 +151,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -203,6 +204,7 @@
* @generated
*/
public void setRepresents(ConnectableElement newRepresents) {
+
ConnectableElement oldRepresents = represents;
represents = newRepresents;
if (eNotificationRequired())
@@ -252,6 +254,7 @@
* @generated
*/
public void setInteraction(Interaction newInteraction) {
+
if (newInteraction != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.LIFELINE__INTERACTION && newInteraction != null)) {
if (EcoreUtil.isAncestor(this, newInteraction))
@@ -338,6 +341,7 @@
* @generated
*/
public void setSelector(ValueSpecification newSelector) {
+
if (newSelector != selector) {
NotificationChain msgs = null;
if (selector != null)
@@ -407,6 +411,7 @@
* @generated
*/
public void setDecomposedAs(PartDecomposition newDecomposedAs) {
+
PartDecomposition oldDecomposedAs = decomposedAs;
decomposedAs = newDecomposedAs;
if (eNotificationRequired())
@@ -761,6 +766,7 @@
* @generated
*/
public Namespace basicGetNamespace() {
+
Interaction interaction = basicGetInteraction();
if (interaction != null) {
return interaction;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkActionImpl.java
index d947e83..050c86f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: LinkActionImpl.java,v 1.21 2006/05/24 20:54:28 khussey Exp $
+ * $Id: LinkActionImpl.java,v 1.22 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -109,6 +109,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndCreationDataImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndCreationDataImpl.java
index a0501de..691f26c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndCreationDataImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndCreationDataImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005 IBM Corporation and others.
+ * Copyright (c) 2005, 2006 IBM Corporation 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
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: LinkEndCreationDataImpl.java,v 1.8 2006/04/10 19:16:18 khussey Exp $
+ * $Id: LinkEndCreationDataImpl.java,v 1.9 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -112,6 +112,7 @@
* @generated
*/
public void setIsReplaceAll(boolean newIsReplaceAll) {
+
boolean oldIsReplaceAll = (eFlags & IS_REPLACE_ALL_EFLAG) != 0;
if (newIsReplaceAll)
eFlags |= IS_REPLACE_ALL_EFLAG;
@@ -158,6 +159,7 @@
* @generated
*/
public void setInsertAt(InputPin newInsertAt) {
+
InputPin oldInsertAt = insertAt;
insertAt = newInsertAt;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndDataImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndDataImpl.java
index d6f19b7..bb85a7e 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndDataImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndDataImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: LinkEndDataImpl.java,v 1.11 2006/04/10 19:16:21 khussey Exp $
+ * $Id: LinkEndDataImpl.java,v 1.12 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -138,6 +138,7 @@
* @generated
*/
public void setValue(InputPin newValue) {
+
InputPin oldValue = value;
value = newValue;
if (eNotificationRequired())
@@ -179,6 +180,7 @@
* @generated
*/
public void setEnd(Property newEnd) {
+
Property oldEnd = end;
end = newEnd;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndDestructionDataImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndDestructionDataImpl.java
index 26744dd..cd3e1a7 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndDestructionDataImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndDestructionDataImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005 IBM Corporation and others.
+ * Copyright (c) 2005, 2006 IBM Corporation 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
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: LinkEndDestructionDataImpl.java,v 1.8 2006/04/10 19:16:19 khussey Exp $
+ * $Id: LinkEndDestructionDataImpl.java,v 1.9 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -112,6 +112,7 @@
* @generated
*/
public void setIsDestroyDuplicates(boolean newIsDestroyDuplicates) {
+
boolean oldIsDestroyDuplicates = (eFlags & IS_DESTROY_DUPLICATES_EFLAG) != 0;
if (newIsDestroyDuplicates)
eFlags |= IS_DESTROY_DUPLICATES_EFLAG;
@@ -158,6 +159,7 @@
* @generated
*/
public void setDestroyAt(InputPin newDestroyAt) {
+
InputPin oldDestroyAt = destroyAt;
destroyAt = newDestroyAt;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralBooleanImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralBooleanImpl.java
index 12fdfef..5080cba 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralBooleanImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralBooleanImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: LiteralBooleanImpl.java,v 1.12 2006/04/10 19:16:19 khussey Exp $
+ * $Id: LiteralBooleanImpl.java,v 1.13 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -97,6 +97,7 @@
* @generated
*/
public void setValue(boolean newValue) {
+
boolean oldValue = (eFlags & VALUE_EFLAG) != 0;
if (newValue)
eFlags |= VALUE_EFLAG;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralIntegerImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralIntegerImpl.java
index d471bc7..a888541 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralIntegerImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralIntegerImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: LiteralIntegerImpl.java,v 1.12 2006/04/10 19:16:19 khussey Exp $
+ * $Id: LiteralIntegerImpl.java,v 1.13 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -97,6 +97,7 @@
* @generated
*/
public void setValue(int newValue) {
+
int oldValue = value;
value = newValue;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralStringImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralStringImpl.java
index 6d33075..4d39686 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralStringImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralStringImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: LiteralStringImpl.java,v 1.12 2006/10/10 20:41:28 khussey Exp $
+ * $Id: LiteralStringImpl.java,v 1.13 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -106,6 +106,7 @@
* @generated
*/
public void setValue(String newValue) {
+
String oldValue = value;
value = newValue;
boolean oldValueESet = (eFlags & VALUE_ESETFLAG) != 0;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralUnlimitedNaturalImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralUnlimitedNaturalImpl.java
index 80417f3..c1e60b9 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralUnlimitedNaturalImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralUnlimitedNaturalImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: LiteralUnlimitedNaturalImpl.java,v 1.12 2006/04/10 19:16:19 khussey Exp $
+ * $Id: LiteralUnlimitedNaturalImpl.java,v 1.13 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -97,6 +97,7 @@
* @generated
*/
public void setValue(int newValue) {
+
int oldValue = value;
value = newValue;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LoopNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LoopNodeImpl.java
index 533da23..83136ad 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LoopNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LoopNodeImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: LoopNodeImpl.java,v 1.23 2006/05/24 20:54:28 khussey Exp $
+ * $Id: LoopNodeImpl.java,v 1.24 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -201,6 +201,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -223,6 +224,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -254,6 +256,7 @@
* @generated
*/
public void setIsTestedFirst(boolean newIsTestedFirst) {
+
boolean oldIsTestedFirst = (eFlags & IS_TESTED_FIRST_EFLAG) != 0;
if (newIsTestedFirst)
eFlags |= IS_TESTED_FIRST_EFLAG;
@@ -384,6 +387,7 @@
* @generated
*/
public void setDecider(OutputPin newDecider) {
+
OutputPin oldDecider = decider;
decider = newDecider;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ManifestationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ManifestationImpl.java
index 84f0a2e..77dc4df 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ManifestationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ManifestationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ManifestationImpl.java,v 1.12 2006/04/10 19:16:21 khussey Exp $
+ * $Id: ManifestationImpl.java,v 1.13 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -139,6 +139,7 @@
* @generated
*/
public void setUtilizedElement(PackageableElement newUtilizedElement) {
+
PackageableElement oldUtilizedElement = utilizedElement;
utilizedElement = newUtilizedElement;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageEndImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageEndImpl.java
index 7f33cf6..38c566d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageEndImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageEndImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: MessageEndImpl.java,v 1.10 2006/04/10 19:16:18 khussey Exp $
+ * $Id: MessageEndImpl.java,v 1.11 2006/11/14 18:02:15 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -104,6 +104,7 @@
* @generated
*/
public void setMessage(Message newMessage) {
+
Message oldMessage = message;
message = newMessage;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageImpl.java
index e21ce9b..a227f6b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: MessageImpl.java,v 1.20 2006/05/24 20:54:28 khussey Exp $
+ * $Id: MessageImpl.java,v 1.21 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -186,6 +186,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -210,6 +211,7 @@
* @generated
*/
public MessageKind getMessageKind() {
+
return MessageOperations.getMessageKind(this);
}
@@ -228,6 +230,7 @@
* @generated
*/
public void setMessageSort(MessageSort newMessageSort) {
+
MessageSort oldMessageSort = messageSort;
messageSort = newMessageSort == null
? MESSAGE_SORT_EDEFAULT
@@ -272,6 +275,7 @@
* @generated
*/
public void setReceiveEvent(MessageEnd newReceiveEvent) {
+
MessageEnd oldReceiveEvent = receiveEvent;
receiveEvent = newReceiveEvent;
if (eNotificationRequired())
@@ -314,6 +318,7 @@
* @generated
*/
public void setSendEvent(MessageEnd newSendEvent) {
+
MessageEnd oldSendEvent = sendEvent;
sendEvent = newSendEvent;
if (eNotificationRequired())
@@ -355,6 +360,7 @@
* @generated
*/
public void setConnector(Connector newConnector) {
+
Connector oldConnector = connector;
connector = newConnector;
if (eNotificationRequired())
@@ -404,6 +410,7 @@
* @generated
*/
public void setInteraction(Interaction newInteraction) {
+
if (newInteraction != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.MESSAGE__INTERACTION && newInteraction != null)) {
if (EcoreUtil.isAncestor(this, newInteraction))
@@ -504,6 +511,7 @@
* @generated
*/
public NamedElement basicGetSignature() {
+
return MessageOperations.getSignature(this);
}
@@ -880,6 +888,7 @@
* @generated
*/
public Namespace basicGetNamespace() {
+
Interaction interaction = basicGetInteraction();
if (interaction != null) {
return interaction;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageOccurrenceSpecificationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageOccurrenceSpecificationImpl.java
index 86db8ec..97faf18 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageOccurrenceSpecificationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageOccurrenceSpecificationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: MessageOccurrenceSpecificationImpl.java,v 1.12 2006/04/10 19:16:18 khussey Exp $
+ * $Id: MessageOccurrenceSpecificationImpl.java,v 1.13 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -109,6 +109,7 @@
* @generated
*/
public void setMessage(Message newMessage) {
+
Message oldMessage = message;
message = newMessage;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ModelImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ModelImpl.java
index 743a3ba..5ed6f29 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ModelImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ModelImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ModelImpl.java,v 1.11 2006/04/10 19:16:20 khussey Exp $
+ * $Id: ModelImpl.java,v 1.12 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -106,6 +106,7 @@
* @generated
*/
public void setViewpoint(String newViewpoint) {
+
String oldViewpoint = viewpoint;
viewpoint = newViewpoint;
boolean oldViewpointESet = (eFlags & VIEWPOINT_ESETFLAG) != 0;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MultiplicityElementImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MultiplicityElementImpl.java
index b8263fd..3e2bdd6 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MultiplicityElementImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MultiplicityElementImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: MultiplicityElementImpl.java,v 1.22 2006/05/24 20:54:28 khussey Exp $
+ * $Id: MultiplicityElementImpl.java,v 1.23 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -170,6 +170,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -204,6 +205,7 @@
* @generated
*/
public void setIsOrdered(boolean newIsOrdered) {
+
boolean oldIsOrdered = (eFlags & IS_ORDERED_EFLAG) != 0;
if (newIsOrdered)
eFlags |= IS_ORDERED_EFLAG;
@@ -231,6 +233,7 @@
* @generated
*/
public void setIsUnique(boolean newIsUnique) {
+
boolean oldIsUnique = (eFlags & IS_UNIQUE_EFLAG) != 0;
if (newIsUnique)
eFlags |= IS_UNIQUE_EFLAG;
@@ -249,6 +252,7 @@
* @generated
*/
public int getUpper() {
+
return MultiplicityElementOperations.getUpper(this);
}
@@ -258,6 +262,7 @@
* @generated
*/
public void setUpper(int newUpper) {
+
MultiplicityElementOperations.setUpper(this, newUpper);
}
@@ -267,6 +272,7 @@
* @generated
*/
public int getLower() {
+
return MultiplicityElementOperations.getLower(this);
}
@@ -276,6 +282,7 @@
* @generated
*/
public void setLower(int newLower) {
+
MultiplicityElementOperations.setLower(this, newLower);
}
@@ -348,6 +355,7 @@
* @generated
*/
public void setUpperValue(ValueSpecification newUpperValue) {
+
if (newUpperValue != upperValue) {
NotificationChain msgs = null;
if (upperValue != null)
@@ -455,6 +463,7 @@
* @generated
*/
public void setLowerValue(ValueSpecification newLowerValue) {
+
if (newLowerValue != lowerValue) {
NotificationChain msgs = null;
if (lowerValue != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NamedElementImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NamedElementImpl.java
index ce69718..1ec3603 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NamedElementImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NamedElementImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: NamedElementImpl.java,v 1.23 2006/05/24 20:54:27 khussey Exp $
+ * $Id: NamedElementImpl.java,v 1.24 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -186,6 +186,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -219,6 +220,7 @@
* @generated
*/
public void setName(String newName) {
+
String oldName = name;
name = newName;
boolean oldNameESet = (eFlags & NAME_ESETFLAG) != 0;
@@ -269,6 +271,7 @@
* @generated
*/
public void setVisibility(VisibilityKind newVisibility) {
+
VisibilityKind oldVisibility = visibility;
visibility = newVisibility == null
? VISIBILITY_EDEFAULT
@@ -313,6 +316,7 @@
* @generated
*/
public String getQualifiedName() {
+
return NamedElementOperations.getQualifiedName(this);
}
@@ -429,6 +433,7 @@
* @generated
*/
public void setNameExpression(StringExpression newNameExpression) {
+
if (newNameExpression != nameExpression) {
NotificationChain msgs = null;
if (nameExpression != null)
@@ -785,6 +790,7 @@
* @generated
*/
public Namespace basicGetNamespaceGen() {
+
return null;
}
@@ -838,6 +844,7 @@
* @generated
*/
public Element basicGetOwner() {
+
if (isSetNamespace()) {
return basicGetNamespace();
}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NamespaceImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NamespaceImpl.java
index 84f4d2f..27567a8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NamespaceImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NamespaceImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: NamespaceImpl.java,v 1.20 2006/05/24 20:54:28 khussey Exp $
+ * $Id: NamespaceImpl.java,v 1.21 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -123,6 +123,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -147,6 +148,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -202,6 +204,7 @@
* @generated
*/
public EList getMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -437,6 +440,7 @@
* @generated
*/
public EList getImportedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
EList result = (EList) cache.get(this,
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NodeImpl.java
index cf2fb49..8e75d89 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NodeImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: NodeImpl.java,v 1.25 2006/05/24 20:54:28 khussey Exp $
+ * $Id: NodeImpl.java,v 1.26 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -119,6 +119,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -214,6 +215,7 @@
* @generated
*/
public EList getDeployedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
EList result = (EList) cache.get(this,
@@ -265,6 +267,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ObjectFlowImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ObjectFlowImpl.java
index e480b78..481b090 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ObjectFlowImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ObjectFlowImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ObjectFlowImpl.java,v 1.13 2006/04/10 19:16:20 khussey Exp $
+ * $Id: ObjectFlowImpl.java,v 1.14 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -150,6 +150,7 @@
* @generated
*/
public void setIsMulticast(boolean newIsMulticast) {
+
boolean oldIsMulticast = (eFlags & IS_MULTICAST_EFLAG) != 0;
if (newIsMulticast)
eFlags |= IS_MULTICAST_EFLAG;
@@ -177,6 +178,7 @@
* @generated
*/
public void setIsMultireceive(boolean newIsMultireceive) {
+
boolean oldIsMultireceive = (eFlags & IS_MULTIRECEIVE_EFLAG) != 0;
if (newIsMultireceive)
eFlags |= IS_MULTIRECEIVE_EFLAG;
@@ -223,6 +225,7 @@
* @generated
*/
public void setTransformation(Behavior newTransformation) {
+
Behavior oldTransformation = transformation;
transformation = newTransformation;
if (eNotificationRequired())
@@ -266,6 +269,7 @@
* @generated
*/
public void setSelection(Behavior newSelection) {
+
Behavior oldSelection = selection;
selection = newSelection;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ObjectNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ObjectNodeImpl.java
index 6b2b7e3..88fd7f0 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ObjectNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ObjectNodeImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ObjectNodeImpl.java,v 1.20 2006/05/24 20:54:27 khussey Exp $
+ * $Id: ObjectNodeImpl.java,v 1.21 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -206,6 +206,7 @@
* @generated
*/
public void setType(Type newType) {
+
Type oldType = type;
type = newType;
if (eNotificationRequired())
@@ -220,6 +221,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -253,6 +255,7 @@
* @generated
*/
public void setOrdering(ObjectNodeOrderingKind newOrdering) {
+
ObjectNodeOrderingKind oldOrdering = ordering;
ordering = newOrdering == null
? ORDERING_EDEFAULT
@@ -278,6 +281,7 @@
* @generated
*/
public void setIsControlType(boolean newIsControlType) {
+
boolean oldIsControlType = (eFlags & IS_CONTROL_TYPE_EFLAG) != 0;
if (newIsControlType)
eFlags |= IS_CONTROL_TYPE_EFLAG;
@@ -357,6 +361,7 @@
* @generated
*/
public void setUpperBound(ValueSpecification newUpperBound) {
+
if (newUpperBound != upperBound) {
NotificationChain msgs = null;
if (upperBound != null)
@@ -468,6 +473,7 @@
* @generated
*/
public void setSelection(Behavior newSelection) {
+
Behavior oldSelection = selection;
selection = newSelection;
if (eNotificationRequired())
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 ee967ae..520a92c 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
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: OccurrenceSpecificationImpl.java,v 1.16 2006/04/10 19:16:19 khussey Exp $
+ * $Id: OccurrenceSpecificationImpl.java,v 1.17 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -180,6 +180,7 @@
* @generated
*/
public void setEvent(Event newEvent) {
+
Event oldEvent = event;
event = newEvent;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OpaqueActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OpaqueActionImpl.java
index 3309c59..5887bf9 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OpaqueActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OpaqueActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: OpaqueActionImpl.java,v 1.19 2006/10/10 20:41:28 khussey Exp $
+ * $Id: OpaqueActionImpl.java,v 1.20 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -128,6 +128,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -150,6 +151,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OpaqueExpressionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OpaqueExpressionImpl.java
index f5836b8..d115872 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OpaqueExpressionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OpaqueExpressionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: OpaqueExpressionImpl.java,v 1.17 2006/10/10 20:41:28 khussey Exp $
+ * $Id: OpaqueExpressionImpl.java,v 1.18 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -193,6 +193,7 @@
* @generated
*/
public Parameter basicGetResult() {
+
return OpaqueExpressionOperations.getResult(this);
}
@@ -230,6 +231,7 @@
* @generated
*/
public void setBehavior(Behavior newBehavior) {
+
Behavior oldBehavior = behavior;
behavior = newBehavior;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OperationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OperationImpl.java
index acfd70c..fb82fd1 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OperationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OperationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: OperationImpl.java,v 1.30 2006/05/24 20:54:28 khussey Exp $
+ * $Id: OperationImpl.java,v 1.31 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -350,6 +350,7 @@
* @generated
*/
public void setTemplateParameter(TemplateParameter newTemplateParameter) {
+
if (newTemplateParameter != templateParameter) {
NotificationChain msgs = null;
if (templateParameter != null)
@@ -429,6 +430,7 @@
*/
public void setOwningTemplateParameter(
TemplateParameter newOwningTemplateParameter) {
+
if (newOwningTemplateParameter != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.OPERATION__OWNING_TEMPLATE_PARAMETER && newOwningTemplateParameter != null)) {
if (EcoreUtil.isAncestor(this, newOwningTemplateParameter))
@@ -460,6 +462,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -605,6 +608,7 @@
*/
public void setOwnedTemplateSignature(
TemplateSignature newOwnedTemplateSignature) {
+
if (newOwnedTemplateSignature != ownedTemplateSignature) {
NotificationChain msgs = null;
if (ownedTemplateSignature != null)
@@ -653,6 +657,7 @@
* @generated
*/
public EList getRedefinitionContexts() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -682,6 +687,7 @@
* @generated
*/
public EList getFeaturingClassifiers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -708,6 +714,7 @@
* @generated
*/
public EList getRedefinedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -756,6 +763,7 @@
* @generated
*/
public void setIsQuery(boolean newIsQuery) {
+
boolean oldIsQuery = (eFlags & IS_QUERY_EFLAG) != 0;
if (newIsQuery)
eFlags |= IS_QUERY_EFLAG;
@@ -773,6 +781,7 @@
* @generated
*/
public boolean isOrdered() {
+
return OperationOperations.isOrdered(this);
}
@@ -782,6 +791,7 @@
* @generated
*/
public void setIsOrdered(boolean newIsOrdered) {
+
OperationOperations.setIsOrdered(this, newIsOrdered);
}
@@ -791,6 +801,7 @@
* @generated
*/
public boolean isUnique() {
+
return OperationOperations.isUnique(this);
}
@@ -800,6 +811,7 @@
* @generated
*/
public void setIsUnique(boolean newIsUnique) {
+
OperationOperations.setIsUnique(this, newIsUnique);
}
@@ -809,6 +821,7 @@
* @generated
*/
public int getLower() {
+
return OperationOperations.getLower(this);
}
@@ -818,6 +831,7 @@
* @generated
*/
public void setLower(int newLower) {
+
OperationOperations.setLower(this, newLower);
}
@@ -827,6 +841,7 @@
* @generated
*/
public int getUpper() {
+
return OperationOperations.getUpper(this);
}
@@ -836,6 +851,7 @@
* @generated
*/
public void setUpper(int newUpper) {
+
OperationOperations.setUpper(this, newUpper);
}
@@ -880,6 +896,7 @@
* @generated
*/
public void setClass_(org.eclipse.uml2.uml.Class newClass) {
+
if (newClass != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.OPERATION__CLASS && newClass != null)) {
if (EcoreUtil.isAncestor(this, newClass))
@@ -1143,6 +1160,7 @@
* @generated
*/
public void setDatatype(DataType newDatatype) {
+
if (newDatatype != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.OPERATION__DATATYPE && newDatatype != null)) {
if (EcoreUtil.isAncestor(this, newDatatype))
@@ -1198,6 +1216,7 @@
* @generated
*/
public void setBodyCondition(Constraint newBodyCondition) {
+
Constraint oldBodyCondition = bodyCondition;
bodyCondition = newBodyCondition;
if (eNotificationRequired())
@@ -1256,6 +1275,7 @@
* @generated
*/
public Type basicGetType() {
+
return OperationOperations.getType(this);
}
@@ -1265,6 +1285,7 @@
* @generated
*/
public void setType(Type newType) {
+
OperationOperations.setType(this, newType);
}
@@ -1309,6 +1330,7 @@
* @generated
*/
public void setInterface(Interface newInterface) {
+
if (newInterface != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.OPERATION__INTERFACE && newInterface != null)) {
if (EcoreUtil.isAncestor(this, newInterface))
@@ -2285,6 +2307,7 @@
* @generated
*/
public Element basicGetOwner() {
+
TemplateParameter owningTemplateParameter = basicGetOwningTemplateParameter();
if (owningTemplateParameter != null) {
return owningTemplateParameter;
@@ -2372,6 +2395,7 @@
* @generated
*/
public Namespace basicGetNamespace() {
+
org.eclipse.uml2.uml.Class class_ = basicGetClass_();
if (class_ != null) {
return class_;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OperationTemplateParameterImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OperationTemplateParameterImpl.java
index 714568a..dd07231 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OperationTemplateParameterImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OperationTemplateParameterImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: OperationTemplateParameterImpl.java,v 1.13 2006/04/10 19:16:19 khussey Exp $
+ * $Id: OperationTemplateParameterImpl.java,v 1.14 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -145,6 +145,7 @@
* @generated
*/
public void setParameteredElement(ParameterableElement newParameteredElement) {
+
if (newParameteredElement != parameteredElement) {
NotificationChain msgs = null;
if (parameteredElement != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageImpl.java
index 13d5677..31fcfe6 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: PackageImpl.java,v 1.30 2006/05/24 20:54:28 khussey Exp $
+ * $Id: PackageImpl.java,v 1.31 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -247,6 +247,7 @@
* @generated
*/
public void setTemplateParameter(TemplateParameter newTemplateParameter) {
+
if (newTemplateParameter != templateParameter) {
NotificationChain msgs = null;
if (templateParameter != null)
@@ -317,6 +318,7 @@
*/
public void setOwningTemplateParameter(
TemplateParameter newOwningTemplateParameter) {
+
if (newOwningTemplateParameter != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.PACKAGE__OWNING_TEMPLATE_PARAMETER && newOwningTemplateParameter != null)) {
if (EcoreUtil.isAncestor(this, newOwningTemplateParameter))
@@ -357,6 +359,7 @@
* @generated
*/
public void setVisibility(VisibilityKind newVisibility) {
+
VisibilityKind oldVisibility = visibility;
visibility = newVisibility == null
? VISIBILITY_EDEFAULT
@@ -382,6 +385,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -526,6 +530,7 @@
*/
public void setOwnedTemplateSignature(
TemplateSignature newOwnedTemplateSignature) {
+
if (newOwnedTemplateSignature != ownedTemplateSignature) {
NotificationChain msgs = null;
if (ownedTemplateSignature != null)
@@ -574,6 +579,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -1714,6 +1720,7 @@
* @generated
*/
public Element basicGetOwner() {
+
TemplateParameter owningTemplateParameter = basicGetOwningTemplateParameter();
if (owningTemplateParameter != null) {
return owningTemplateParameter;
@@ -1819,6 +1826,7 @@
* @generated
*/
public Namespace basicGetNamespace() {
+
org.eclipse.uml2.uml.Package nestingPackage = basicGetNestingPackage();
if (nestingPackage != null) {
return nestingPackage;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageImportImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageImportImpl.java
index b8695d6..3d1b8ca 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageImportImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageImportImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: PackageImportImpl.java,v 1.13 2006/05/24 20:54:27 khussey Exp $
+ * $Id: PackageImportImpl.java,v 1.14 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -119,6 +119,7 @@
* @generated
*/
public EList getTargets() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -142,6 +143,7 @@
* @generated
*/
public EList getSources() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -174,6 +176,7 @@
* @generated
*/
public void setVisibility(VisibilityKind newVisibility) {
+
VisibilityKind oldVisibility = visibility;
visibility = newVisibility == null
? VISIBILITY_EDEFAULT
@@ -220,6 +223,7 @@
*/
public void setImportedPackage(
org.eclipse.uml2.uml.Package newImportedPackage) {
+
org.eclipse.uml2.uml.Package oldImportedPackage = importedPackage;
importedPackage = newImportedPackage;
if (eNotificationRequired())
@@ -270,6 +274,7 @@
* @generated
*/
public void setImportingNamespace(Namespace newImportingNamespace) {
+
if (newImportingNamespace != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.PACKAGE_IMPORT__IMPORTING_NAMESPACE && newImportingNamespace != null)) {
if (EcoreUtil.isAncestor(this, newImportingNamespace))
@@ -554,6 +559,7 @@
* @generated
*/
public Element basicGetOwner() {
+
Namespace importingNamespace = basicGetImportingNamespace();
if (importingNamespace != null) {
return importingNamespace;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageMergeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageMergeImpl.java
index 666ed2d..f57032f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageMergeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageMergeImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: PackageMergeImpl.java,v 1.12 2006/05/24 20:54:27 khussey Exp $
+ * $Id: PackageMergeImpl.java,v 1.13 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -90,6 +90,7 @@
* @generated
*/
public EList getTargets() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -113,6 +114,7 @@
* @generated
*/
public EList getSources() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -164,6 +166,7 @@
* @generated
*/
public void setMergedPackage(org.eclipse.uml2.uml.Package newMergedPackage) {
+
org.eclipse.uml2.uml.Package oldMergedPackage = mergedPackage;
mergedPackage = newMergedPackage;
if (eNotificationRequired())
@@ -216,6 +219,7 @@
*/
public void setReceivingPackage(
org.eclipse.uml2.uml.Package newReceivingPackage) {
+
if (newReceivingPackage != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.PACKAGE_MERGE__RECEIVING_PACKAGE && newReceivingPackage != null)) {
if (EcoreUtil.isAncestor(this, newReceivingPackage))
@@ -464,6 +468,7 @@
* @generated
*/
public Element basicGetOwner() {
+
org.eclipse.uml2.uml.Package receivingPackage = basicGetReceivingPackage();
if (receivingPackage != null) {
return receivingPackage;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageableElementImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageableElementImpl.java
index 2c664dc..544ce9b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageableElementImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageableElementImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: PackageableElementImpl.java,v 1.13 2006/05/24 20:54:28 khussey Exp $
+ * $Id: PackageableElementImpl.java,v 1.14 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -161,6 +161,7 @@
* @generated
*/
public void setTemplateParameter(TemplateParameter newTemplateParameter) {
+
if (newTemplateParameter != templateParameter) {
NotificationChain msgs = null;
if (templateParameter != null)
@@ -231,6 +232,7 @@
*/
public void setOwningTemplateParameter(
TemplateParameter newOwningTemplateParameter) {
+
if (newOwningTemplateParameter != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.PACKAGEABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER && newOwningTemplateParameter != null)) {
if (EcoreUtil.isAncestor(this, newOwningTemplateParameter))
@@ -271,6 +273,7 @@
* @generated
*/
public void setVisibility(VisibilityKind newVisibility) {
+
VisibilityKind oldVisibility = visibility;
visibility = newVisibility == null
? VISIBILITY_EDEFAULT
@@ -599,6 +602,7 @@
* @generated
*/
public Element basicGetOwner() {
+
TemplateParameter owningTemplateParameter = basicGetOwningTemplateParameter();
if (owningTemplateParameter != null) {
return owningTemplateParameter;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterImpl.java
index f7ffb6f..4d83dd5 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ParameterImpl.java,v 1.31 2006/05/24 20:54:27 khussey Exp $
+ * $Id: ParameterImpl.java,v 1.32 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -310,6 +310,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -343,6 +344,7 @@
* @generated
*/
public void setIsOrdered(boolean newIsOrdered) {
+
boolean oldIsOrdered = (eFlags & IS_ORDERED_EFLAG) != 0;
if (newIsOrdered)
eFlags |= IS_ORDERED_EFLAG;
@@ -369,6 +371,7 @@
* @generated
*/
public void setIsUnique(boolean newIsUnique) {
+
boolean oldIsUnique = (eFlags & IS_UNIQUE_EFLAG) != 0;
if (newIsUnique)
eFlags |= IS_UNIQUE_EFLAG;
@@ -386,6 +389,7 @@
* @generated
*/
public int getUpper() {
+
return MultiplicityElementOperations.getUpper(this);
}
@@ -395,6 +399,7 @@
* @generated
*/
public void setUpper(int newUpper) {
+
MultiplicityElementOperations.setUpper(this, newUpper);
}
@@ -404,6 +409,7 @@
* @generated
*/
public int getLower() {
+
return MultiplicityElementOperations.getLower(this);
}
@@ -413,6 +419,7 @@
* @generated
*/
public void setLower(int newLower) {
+
MultiplicityElementOperations.setLower(this, newLower);
}
@@ -483,6 +490,7 @@
* @generated
*/
public void setUpperValue(ValueSpecification newUpperValue) {
+
if (newUpperValue != upperValue) {
NotificationChain msgs = null;
if (upperValue != null)
@@ -585,6 +593,7 @@
* @generated
*/
public void setLowerValue(ValueSpecification newLowerValue) {
+
if (newLowerValue != lowerValue) {
NotificationChain msgs = null;
if (lowerValue != null)
@@ -712,6 +721,7 @@
* @generated
*/
public void setDirection(ParameterDirectionKind newDirection) {
+
ParameterDirectionKind oldDirection = direction;
direction = newDirection == null
? DIRECTION_EDEFAULT
@@ -728,6 +738,7 @@
* @generated
*/
public String getDefault() {
+
return ParameterOperations.getDefault(this);
}
@@ -737,6 +748,7 @@
* @generated
*/
public void setDefault(String newDefault) {
+
ParameterOperations.setDefault(this, newDefault);
}
@@ -746,6 +758,7 @@
* @generated
*/
public void unsetDefault() {
+
ParameterOperations.unsetDefault(this);
}
@@ -755,6 +768,7 @@
* @generated
*/
public boolean isSetDefault() {
+
return ParameterOperations.isSetDefault(this);
}
@@ -825,6 +839,7 @@
* @generated
*/
public void setDefaultValue(ValueSpecification newDefaultValue) {
+
if (newDefaultValue != defaultValue) {
NotificationChain msgs = null;
if (defaultValue != null)
@@ -876,6 +891,7 @@
* @generated
*/
public void setIsException(boolean newIsException) {
+
boolean oldIsException = (eFlags & IS_EXCEPTION_EFLAG) != 0;
if (newIsException)
eFlags |= IS_EXCEPTION_EFLAG;
@@ -903,6 +919,7 @@
* @generated
*/
public void setIsStream(boolean newIsStream) {
+
boolean oldIsStream = (eFlags & IS_STREAM_EFLAG) != 0;
if (newIsStream)
eFlags |= IS_STREAM_EFLAG;
@@ -929,6 +946,7 @@
* @generated
*/
public void setEffect(ParameterEffectKind newEffect) {
+
ParameterEffectKind oldEffect = effect;
effect = newEffect == null
? EFFECT_EDEFAULT
@@ -1696,6 +1714,7 @@
* @generated
*/
public Namespace basicGetNamespace() {
+
Operation operation = basicGetOperation();
if (operation != null) {
return operation;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterSetImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterSetImpl.java
index f84235c..fe84b62 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterSetImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterSetImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ParameterSetImpl.java,v 1.17 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ParameterSetImpl.java,v 1.18 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -108,6 +108,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterableElementImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterableElementImpl.java
index a086bb1..e7b5b11 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterableElementImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterableElementImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ParameterableElementImpl.java,v 1.11 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ParameterableElementImpl.java,v 1.12 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -157,6 +157,7 @@
* @generated
*/
public void setTemplateParameter(TemplateParameter newTemplateParameter) {
+
if (newTemplateParameter != templateParameter) {
NotificationChain msgs = null;
if (templateParameter != null)
@@ -227,6 +228,7 @@
*/
public void setOwningTemplateParameter(
TemplateParameter newOwningTemplateParameter) {
+
if (newOwningTemplateParameter != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER && newOwningTemplateParameter != null)) {
if (EcoreUtil.isAncestor(this, newOwningTemplateParameter))
@@ -442,6 +444,7 @@
* @generated
*/
public Element basicGetOwner() {
+
TemplateParameter owningTemplateParameter = basicGetOwningTemplateParameter();
if (owningTemplateParameter != null) {
return owningTemplateParameter;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PinImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PinImpl.java
index 60cacd1..5e5d87a 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PinImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PinImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: PinImpl.java,v 1.24 2006/05/24 20:54:28 khussey Exp $
+ * $Id: PinImpl.java,v 1.25 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -200,6 +200,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -233,6 +234,7 @@
* @generated
*/
public void setIsOrdered(boolean newIsOrdered) {
+
boolean oldIsOrdered = (eFlags & IS_ORDERED_EFLAG) != 0;
if (newIsOrdered)
eFlags |= IS_ORDERED_EFLAG;
@@ -259,6 +261,7 @@
* @generated
*/
public void setIsUnique(boolean newIsUnique) {
+
boolean oldIsUnique = (eFlags & IS_UNIQUE_EFLAG) != 0;
if (newIsUnique)
eFlags |= IS_UNIQUE_EFLAG;
@@ -276,6 +279,7 @@
* @generated
*/
public int getUpper() {
+
return MultiplicityElementOperations.getUpper(this);
}
@@ -285,6 +289,7 @@
* @generated
*/
public void setUpper(int newUpper) {
+
MultiplicityElementOperations.setUpper(this, newUpper);
}
@@ -294,6 +299,7 @@
* @generated
*/
public int getLower() {
+
return MultiplicityElementOperations.getLower(this);
}
@@ -303,6 +309,7 @@
* @generated
*/
public void setLower(int newLower) {
+
MultiplicityElementOperations.setLower(this, newLower);
}
@@ -372,6 +379,7 @@
* @generated
*/
public void setUpperValue(ValueSpecification newUpperValue) {
+
if (newUpperValue != upperValue) {
NotificationChain msgs = null;
if (upperValue != null)
@@ -473,6 +481,7 @@
* @generated
*/
public void setLowerValue(ValueSpecification newLowerValue) {
+
if (newLowerValue != lowerValue) {
NotificationChain msgs = null;
if (lowerValue != null)
@@ -523,6 +532,7 @@
* @generated
*/
public void setIsControl(boolean newIsControl) {
+
boolean oldIsControl = (eFlags & IS_CONTROL_EFLAG) != 0;
if (newIsControl)
eFlags |= IS_CONTROL_EFLAG;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PortImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PortImpl.java
index 8149f81..b977557 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PortImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PortImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: PortImpl.java,v 1.22 2006/05/24 20:54:27 khussey Exp $
+ * $Id: PortImpl.java,v 1.23 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -160,6 +160,7 @@
* @generated
*/
public EList getRedefinedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -194,6 +195,7 @@
* @generated
*/
public void setIsBehavior(boolean newIsBehavior) {
+
boolean oldIsBehavior = (eFlags & IS_BEHAVIOR_EFLAG) != 0;
if (newIsBehavior)
eFlags |= IS_BEHAVIOR_EFLAG;
@@ -220,6 +222,7 @@
* @generated
*/
public void setIsService(boolean newIsService) {
+
boolean oldIsService = (eFlags & IS_SERVICE_EFLAG) != 0;
if (newIsService)
eFlags |= IS_SERVICE_EFLAG;
@@ -237,6 +240,7 @@
* @generated
*/
public EList getRequireds() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
EList result = (EList) cache.get(this,
@@ -324,6 +328,7 @@
* @generated
*/
public EList getProvideds() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
EList result = (EList) cache.get(this,
@@ -396,6 +401,7 @@
* @generated
*/
public void setProtocol(ProtocolStateMachine newProtocol) {
+
ProtocolStateMachine oldProtocol = protocol;
protocol = newProtocol;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProfileApplicationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProfileApplicationImpl.java
index 4d04e6b..7dc5ff2 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProfileApplicationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProfileApplicationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ProfileApplicationImpl.java,v 1.18 2006/10/25 18:12:15 khussey Exp $
+ * $Id: ProfileApplicationImpl.java,v 1.19 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -118,6 +118,7 @@
* @generated
*/
public EList getTargets() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -143,6 +144,7 @@
* @generated
*/
public EList getSources() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -196,6 +198,7 @@
* @generated
*/
public void setAppliedProfile(Profile newAppliedProfile) {
+
Profile oldAppliedProfile = appliedProfile;
appliedProfile = newAppliedProfile;
if (eNotificationRequired())
@@ -220,6 +223,7 @@
* @generated
*/
public void setIsStrict(boolean newIsStrict) {
+
boolean oldIsStrict = (eFlags & IS_STRICT_EFLAG) != 0;
if (newIsStrict)
eFlags |= IS_STRICT_EFLAG;
@@ -275,6 +279,7 @@
*/
public void setApplyingPackage(
org.eclipse.uml2.uml.Package newApplyingPackage) {
+
if (newApplyingPackage != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.PROFILE_APPLICATION__APPLYING_PACKAGE && newApplyingPackage != null)) {
if (EcoreUtil.isAncestor(this, newApplyingPackage))
@@ -570,6 +575,7 @@
* @generated
*/
public Element basicGetOwner() {
+
org.eclipse.uml2.uml.Package applyingPackage = basicGetApplyingPackage();
if (applyingPackage != null) {
return applyingPackage;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PropertyImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PropertyImpl.java
index fe96fea..2d02b3a 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PropertyImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PropertyImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: PropertyImpl.java,v 1.35 2006/05/24 20:54:27 khussey Exp $
+ * $Id: PropertyImpl.java,v 1.36 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -409,6 +409,7 @@
* @generated
*/
public void setTemplateParameter(TemplateParameter newTemplateParameter) {
+
if (newTemplateParameter != templateParameter) {
NotificationChain msgs = null;
if (templateParameter != null)
@@ -488,6 +489,7 @@
*/
public void setOwningTemplateParameter(
TemplateParameter newOwningTemplateParameter) {
+
if (newOwningTemplateParameter != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.PROPERTY__OWNING_TEMPLATE_PARAMETER && newOwningTemplateParameter != null)) {
if (EcoreUtil.isAncestor(this, newOwningTemplateParameter))
@@ -532,6 +534,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -627,6 +630,7 @@
* @generated
*/
public EList getDeployedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
EList result = (EList) cache.get(this,
@@ -799,6 +803,7 @@
*/
public void setOwnedTemplateSignature(
TemplateSignature newOwnedTemplateSignature) {
+
if (newOwnedTemplateSignature != ownedTemplateSignature) {
NotificationChain msgs = null;
if (ownedTemplateSignature != null)
@@ -859,6 +864,7 @@
* @generated
*/
public EList getFeaturingClassifiers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -885,6 +891,7 @@
* @generated
*/
public EList getRedefinedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -968,6 +975,7 @@
* @generated
*/
public void setAssociation(Association newAssociation) {
+
if (newAssociation != association) {
NotificationChain msgs = null;
if (association != null)
@@ -1029,6 +1037,7 @@
* @generated
*/
public void setDatatype(DataType newDatatype) {
+
if (newDatatype != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.PROPERTY__DATATYPE && newDatatype != null)) {
if (EcoreUtil.isAncestor(this, newDatatype))
@@ -1065,6 +1074,7 @@
* @generated
*/
public void setIsDerived(boolean newIsDerived) {
+
boolean oldIsDerived = (eFlags & IS_DERIVED_EFLAG) != 0;
if (newIsDerived)
eFlags |= IS_DERIVED_EFLAG;
@@ -1091,6 +1101,7 @@
* @generated
*/
public void setIsDerivedUnion(boolean newIsDerivedUnion) {
+
boolean oldIsDerivedUnion = (eFlags & IS_DERIVED_UNION_EFLAG) != 0;
if (newIsDerivedUnion)
eFlags |= IS_DERIVED_UNION_EFLAG;
@@ -1109,6 +1120,7 @@
* @generated
*/
public String getDefault() {
+
return PropertyOperations.getDefault(this);
}
@@ -1118,6 +1130,7 @@
* @generated
*/
public void setDefault(String newDefault) {
+
PropertyOperations.setDefault(this, newDefault);
}
@@ -1127,6 +1140,7 @@
* @generated
*/
public void unsetDefault() {
+
PropertyOperations.unsetDefault(this);
}
@@ -1136,6 +1150,7 @@
* @generated
*/
public boolean isSetDefault() {
+
return PropertyOperations.isSetDefault(this);
}
@@ -1154,6 +1169,7 @@
* @generated
*/
public void setAggregation(AggregationKind newAggregation) {
+
AggregationKind oldAggregation = aggregation;
aggregation = newAggregation == null
? AGGREGATION_EDEFAULT
@@ -1170,6 +1186,7 @@
* @generated
*/
public boolean isComposite() {
+
return PropertyOperations.isComposite(this);
}
@@ -1179,6 +1196,7 @@
* @generated
*/
public void setIsComposite(boolean newIsComposite) {
+
PropertyOperations.setIsComposite(this, newIsComposite);
}
@@ -1300,6 +1318,7 @@
* @generated
*/
public void setOwningAssociation(Association newOwningAssociation) {
+
if (newOwningAssociation != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.PROPERTY__OWNING_ASSOCIATION && newOwningAssociation != null)) {
if (EcoreUtil.isAncestor(this, newOwningAssociation))
@@ -1389,6 +1408,7 @@
* @generated
*/
public void setDefaultValue(ValueSpecification newDefaultValue) {
+
if (newDefaultValue != defaultValue) {
NotificationChain msgs = null;
if (defaultValue != null)
@@ -1443,6 +1463,7 @@
* @generated
*/
public Property basicGetOpposite() {
+
return PropertyOperations.getOpposite(this);
}
@@ -1452,6 +1473,7 @@
* @generated
*/
public void setOpposite(Property newOpposite) {
+
PropertyOperations.setOpposite(this, newOpposite);
}
@@ -1613,6 +1635,7 @@
* @generated
*/
public void setAssociationEnd(Property newAssociationEnd) {
+
if (newAssociationEnd != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.PROPERTY__ASSOCIATION_END && newAssociationEnd != null)) {
if (EcoreUtil.isAncestor(this, newAssociationEnd))
@@ -1649,6 +1672,7 @@
* @generated
*/
public void setIsReadOnly(boolean newIsReadOnly) {
+
boolean oldIsReadOnly = (eFlags & IS_READ_ONLY_EFLAG) != 0;
if (newIsReadOnly)
eFlags |= IS_READ_ONLY_EFLAG;
@@ -2711,6 +2735,7 @@
* @generated
*/
public Element basicGetOwner() {
+
TemplateParameter owningTemplateParameter = basicGetOwningTemplateParameter();
if (owningTemplateParameter != null) {
return owningTemplateParameter;
@@ -2789,6 +2814,7 @@
* @generated
*/
public Namespace basicGetNamespace() {
+
org.eclipse.uml2.uml.Class class_ = basicGetClass_();
if (class_ != null) {
return class_;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolConformanceImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolConformanceImpl.java
index d22a1d0..e9834b5 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolConformanceImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolConformanceImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ProtocolConformanceImpl.java,v 1.12 2006/05/24 20:54:27 khussey Exp $
+ * $Id: ProtocolConformanceImpl.java,v 1.13 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -91,6 +91,7 @@
* @generated
*/
public EList getTargets() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -115,6 +116,7 @@
* @generated
*/
public EList getSources() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -167,6 +169,7 @@
* @generated
*/
public void setGeneralMachine(ProtocolStateMachine newGeneralMachine) {
+
ProtocolStateMachine oldGeneralMachine = generalMachine;
generalMachine = newGeneralMachine;
if (eNotificationRequired())
@@ -217,6 +220,7 @@
* @generated
*/
public void setSpecificMachine(ProtocolStateMachine newSpecificMachine) {
+
if (newSpecificMachine != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.PROTOCOL_CONFORMANCE__SPECIFIC_MACHINE && newSpecificMachine != null)) {
if (EcoreUtil.isAncestor(this, newSpecificMachine))
@@ -465,6 +469,7 @@
* @generated
*/
public Element basicGetOwner() {
+
ProtocolStateMachine specificMachine = basicGetSpecificMachine();
if (specificMachine != null) {
return specificMachine;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolStateMachineImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolStateMachineImpl.java
index 59e2f68..5b23f5d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolStateMachineImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolStateMachineImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ProtocolStateMachineImpl.java,v 1.23 2006/05/24 20:54:27 khussey Exp $
+ * $Id: ProtocolStateMachineImpl.java,v 1.24 2006/11/14 18:02:15 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -99,6 +99,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolTransitionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolTransitionImpl.java
index 78aefe0..95f4416 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolTransitionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolTransitionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ProtocolTransitionImpl.java,v 1.31 2006/05/08 17:46:11 khussey Exp $
+ * $Id: ProtocolTransitionImpl.java,v 1.32 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -177,6 +177,7 @@
* @generated
*/
public void setGuard(Constraint newGuard) {
+
Constraint oldGuard = guard;
guard = newGuard;
if (eNotificationRequired())
@@ -231,6 +232,7 @@
* @generated
*/
public void setPostCondition(Constraint newPostCondition) {
+
Constraint oldPostCondition = postCondition;
postCondition = newPostCondition;
if (eNotificationRequired())
@@ -416,6 +418,7 @@
* @generated
*/
public void setPreCondition(Constraint newPreCondition) {
+
Constraint oldPreCondition = preCondition;
preCondition = newPreCondition;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PseudostateImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PseudostateImpl.java
index 34ed56a..102a14a 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PseudostateImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PseudostateImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: PseudostateImpl.java,v 1.14 2006/05/24 20:54:27 khussey Exp $
+ * $Id: PseudostateImpl.java,v 1.15 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -127,6 +127,7 @@
* @generated
*/
public void setKind(PseudostateKind newKind) {
+
PseudostateKind oldKind = kind;
kind = newKind == null
? KIND_EDEFAULT
@@ -178,6 +179,7 @@
* @generated
*/
public void setStateMachine(StateMachine newStateMachine) {
+
if (newStateMachine != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.PSEUDOSTATE__STATE_MACHINE && newStateMachine != null)) {
if (EcoreUtil.isAncestor(this, newStateMachine))
@@ -241,6 +243,7 @@
* @generated
*/
public void setState(State newState) {
+
if (newState != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.PSEUDOSTATE__STATE && newState != null)) {
if (EcoreUtil.isAncestor(this, newState))
@@ -672,6 +675,7 @@
* @generated
*/
public Namespace basicGetNamespace() {
+
StateMachine stateMachine = basicGetStateMachine();
if (stateMachine != null) {
return stateMachine;
@@ -707,6 +711,7 @@
* @generated
*/
public Element basicGetOwner() {
+
State state = basicGetState();
if (state != null) {
return state;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/QualifierValueImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/QualifierValueImpl.java
index 6b23d7d..22f13bf 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/QualifierValueImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/QualifierValueImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005 IBM Corporation and others.
+ * Copyright (c) 2005, 2006 IBM Corporation 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
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: QualifierValueImpl.java,v 1.8 2006/04/10 19:16:19 khussey Exp $
+ * $Id: QualifierValueImpl.java,v 1.9 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -121,6 +121,7 @@
* @generated
*/
public void setQualifier(Property newQualifier) {
+
Property oldQualifier = qualifier;
qualifier = newQualifier;
if (eNotificationRequired())
@@ -162,6 +163,7 @@
* @generated
*/
public void setValue(InputPin newValue) {
+
InputPin oldValue = value;
value = newValue;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RaiseExceptionActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RaiseExceptionActionImpl.java
index 6eb2e57..133767b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RaiseExceptionActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RaiseExceptionActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: RaiseExceptionActionImpl.java,v 1.21 2006/05/24 20:54:28 khussey Exp $
+ * $Id: RaiseExceptionActionImpl.java,v 1.22 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -91,6 +91,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -177,6 +178,7 @@
* @generated
*/
public void setException(InputPin newException) {
+
if (newException != exception) {
NotificationChain msgs = null;
if (exception != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadExtentActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadExtentActionImpl.java
index 577b0db..34790fe 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadExtentActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadExtentActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ReadExtentActionImpl.java,v 1.20 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ReadExtentActionImpl.java,v 1.21 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -109,6 +109,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -192,6 +193,7 @@
* @generated
*/
public void setResult(OutputPin newResult) {
+
if (newResult != result) {
NotificationChain msgs = null;
if (result != null)
@@ -260,6 +262,7 @@
* @generated
*/
public void setClassifier(Classifier newClassifier) {
+
Classifier oldClassifier = classifier;
classifier = newClassifier;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadIsClassifiedObjectActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadIsClassifiedObjectActionImpl.java
index b307aa4..6821428 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadIsClassifiedObjectActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadIsClassifiedObjectActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ReadIsClassifiedObjectActionImpl.java,v 1.21 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ReadIsClassifiedObjectActionImpl.java,v 1.22 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -143,6 +143,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -168,6 +169,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -200,6 +202,7 @@
* @generated
*/
public void setIsDirect(boolean newIsDirect) {
+
boolean oldIsDirect = (eFlags & IS_DIRECT_EFLAG) != 0;
if (newIsDirect)
eFlags |= IS_DIRECT_EFLAG;
@@ -248,6 +251,7 @@
* @generated
*/
public void setClassifier(Classifier newClassifier) {
+
Classifier oldClassifier = classifier;
classifier = newClassifier;
if (eNotificationRequired())
@@ -326,6 +330,7 @@
* @generated
*/
public void setResult(OutputPin newResult) {
+
if (newResult != result) {
NotificationChain msgs = null;
if (result != null)
@@ -432,6 +437,7 @@
* @generated
*/
public void setObject(InputPin newObject) {
+
if (newObject != object) {
NotificationChain msgs = null;
if (object != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkActionImpl.java
index 3c0312c..04ed986 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ReadLinkActionImpl.java,v 1.20 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ReadLinkActionImpl.java,v 1.21 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -97,6 +97,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -179,6 +180,7 @@
* @generated
*/
public void setResult(OutputPin newResult) {
+
if (newResult != result) {
NotificationChain msgs = null;
if (result != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkObjectEndActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkObjectEndActionImpl.java
index c633aa6..49a176f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkObjectEndActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkObjectEndActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ReadLinkObjectEndActionImpl.java,v 1.21 2006/05/24 20:54:27 khussey Exp $
+ * $Id: ReadLinkObjectEndActionImpl.java,v 1.22 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -122,6 +122,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -145,6 +146,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -231,6 +233,7 @@
* @generated
*/
public void setObject(InputPin newObject) {
+
if (newObject != object) {
NotificationChain msgs = null;
if (object != null)
@@ -311,6 +314,7 @@
* @generated
*/
public void setEnd(Property newEnd) {
+
Property oldEnd = end;
end = newEnd;
if (eNotificationRequired())
@@ -388,6 +392,7 @@
* @generated
*/
public void setResult(OutputPin newResult) {
+
if (newResult != result) {
NotificationChain msgs = null;
if (result != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkObjectEndQualifierActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkObjectEndQualifierActionImpl.java
index f1c35ad..dec7137 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkObjectEndQualifierActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkObjectEndQualifierActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ReadLinkObjectEndQualifierActionImpl.java,v 1.21 2006/05/24 20:54:27 khussey Exp $
+ * $Id: ReadLinkObjectEndQualifierActionImpl.java,v 1.22 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -122,6 +122,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -152,6 +153,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -252,6 +254,7 @@
* @generated
*/
public void setObject(InputPin newObject) {
+
if (newObject != object) {
NotificationChain msgs = null;
if (object != null)
@@ -378,6 +381,7 @@
* @generated
*/
public void setResult(OutputPin newResult) {
+
if (newResult != result) {
NotificationChain msgs = null;
if (result != null)
@@ -455,6 +459,7 @@
* @generated
*/
public void setQualifier(Property newQualifier) {
+
Property oldQualifier = qualifier;
qualifier = newQualifier;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadSelfActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadSelfActionImpl.java
index 91f9a73..d337535 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadSelfActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadSelfActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ReadSelfActionImpl.java,v 1.20 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ReadSelfActionImpl.java,v 1.21 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -97,6 +97,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -179,6 +180,7 @@
* @generated
*/
public void setResult(OutputPin newResult) {
+
if (newResult != result) {
NotificationChain msgs = null;
if (result != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadStructuralFeatureActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadStructuralFeatureActionImpl.java
index d551365..2991470 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadStructuralFeatureActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadStructuralFeatureActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ReadStructuralFeatureActionImpl.java,v 1.20 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ReadStructuralFeatureActionImpl.java,v 1.21 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -99,6 +99,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -186,6 +187,7 @@
* @generated
*/
public void setResult(OutputPin newResult) {
+
if (newResult != result) {
NotificationChain msgs = null;
if (result != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadVariableActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadVariableActionImpl.java
index 8f4fa6d..69ea49e 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadVariableActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadVariableActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ReadVariableActionImpl.java,v 1.20 2006/05/24 20:54:27 khussey Exp $
+ * $Id: ReadVariableActionImpl.java,v 1.21 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -98,6 +98,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -181,6 +182,7 @@
* @generated
*/
public void setResult(OutputPin newResult) {
+
if (newResult != result) {
NotificationChain msgs = null;
if (result != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReceiveOperationEventImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReceiveOperationEventImpl.java
index 1bc091b..f46c7c0 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReceiveOperationEventImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReceiveOperationEventImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ReceiveOperationEventImpl.java,v 1.5 2006/04/10 19:16:18 khussey Exp $
+ * $Id: ReceiveOperationEventImpl.java,v 1.6 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -106,6 +106,7 @@
* @generated
*/
public void setOperation(Operation newOperation) {
+
Operation oldOperation = operation;
operation = newOperation;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReceiveSignalEventImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReceiveSignalEventImpl.java
index aee7130..5571433 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReceiveSignalEventImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReceiveSignalEventImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ReceiveSignalEventImpl.java,v 1.5 2006/04/10 19:16:20 khussey Exp $
+ * $Id: ReceiveSignalEventImpl.java,v 1.6 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -106,6 +106,7 @@
* @generated
*/
public void setSignal(Signal newSignal) {
+
Signal oldSignal = signal;
signal = newSignal;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReceptionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReceptionImpl.java
index e2c9eed..94b01ce 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReceptionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReceptionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ReceptionImpl.java,v 1.11 2006/04/10 19:16:20 khussey Exp $
+ * $Id: ReceptionImpl.java,v 1.12 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -111,6 +111,7 @@
* @generated
*/
public void setSignal(Signal newSignal) {
+
Signal oldSignal = signal;
signal = newSignal;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReclassifyObjectActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReclassifyObjectActionImpl.java
index f04b814..853d540 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReclassifyObjectActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReclassifyObjectActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ReclassifyObjectActionImpl.java,v 1.21 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ReclassifyObjectActionImpl.java,v 1.22 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -143,6 +143,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -175,6 +176,7 @@
* @generated
*/
public void setIsReplaceAll(boolean newIsReplaceAll) {
+
boolean oldIsReplaceAll = (eFlags & IS_REPLACE_ALL_EFLAG) != 0;
if (newIsReplaceAll)
eFlags |= IS_REPLACE_ALL_EFLAG;
@@ -341,6 +343,7 @@
* @generated
*/
public void setObject(InputPin newObject) {
+
if (newObject != object) {
NotificationChain msgs = null;
if (object != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RedefinableElementImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RedefinableElementImpl.java
index c8f1932..802c618 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RedefinableElementImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RedefinableElementImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: RedefinableElementImpl.java,v 1.15 2006/05/24 20:54:28 khussey Exp $
+ * $Id: RedefinableElementImpl.java,v 1.16 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -102,6 +102,7 @@
* @generated
*/
public EList getRedefinedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -160,6 +161,7 @@
* @generated
*/
public EList getRedefinitionContextsGen() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -259,6 +261,7 @@
* @generated
*/
public void setIsLeaf(boolean newIsLeaf) {
+
boolean oldIsLeaf = (eFlags & IS_LEAF_EFLAG) != 0;
if (newIsLeaf)
eFlags |= IS_LEAF_EFLAG;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RedefinableTemplateSignatureImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RedefinableTemplateSignatureImpl.java
index 555fc30..7dedf59 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RedefinableTemplateSignatureImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RedefinableTemplateSignatureImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: RedefinableTemplateSignatureImpl.java,v 1.20 2006/05/24 20:54:28 khussey Exp $
+ * $Id: RedefinableTemplateSignatureImpl.java,v 1.21 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -133,6 +133,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -213,6 +214,7 @@
* @generated
*/
public void setTemplate(TemplateableElement newTemplate) {
+
if (newTemplate != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__TEMPLATE && newTemplate != null)) {
if (EcoreUtil.isAncestor(this, newTemplate))
@@ -277,6 +279,7 @@
* @generated
*/
public EList getRedefinedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -307,6 +310,7 @@
* @generated
*/
public EList getRedefinitionContexts() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -380,6 +384,7 @@
* @generated
*/
public EList getInheritedParameters() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
EList result = (EList) cache
@@ -825,6 +830,7 @@
* @generated
*/
public Element basicGetOwner() {
+
TemplateableElement template = basicGetTemplate();
if (template != null) {
return template;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReduceActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReduceActionImpl.java
index 87412c8..9578f19 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReduceActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReduceActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ReduceActionImpl.java,v 1.16 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ReduceActionImpl.java,v 1.17 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -142,6 +142,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -166,6 +167,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -215,6 +217,7 @@
* @generated
*/
public void setReducer(Behavior newReducer) {
+
Behavior oldReducer = reducer;
reducer = newReducer;
if (eNotificationRequired())
@@ -288,6 +291,7 @@
* @generated
*/
public void setResult(OutputPin newResult) {
+
if (newResult != result) {
NotificationChain msgs = null;
if (result != null)
@@ -389,6 +393,7 @@
* @generated
*/
public void setCollection(InputPin newCollection) {
+
if (newCollection != collection) {
NotificationChain msgs = null;
if (collection != null)
@@ -448,6 +453,7 @@
* @generated
*/
public void setIsOrdered(boolean newIsOrdered) {
+
boolean oldIsOrdered = (eFlags & IS_ORDERED_EFLAG) != 0;
if (newIsOrdered)
eFlags |= IS_ORDERED_EFLAG;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RegionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RegionImpl.java
index 4a42871..b215a05 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RegionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RegionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: RegionImpl.java,v 1.23 2006/05/24 20:54:27 khussey Exp $
+ * $Id: RegionImpl.java,v 1.24 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -155,6 +155,7 @@
* @generated
*/
public EList getRedefinedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -298,6 +299,7 @@
* @generated
*/
public void setIsLeaf(boolean newIsLeaf) {
+
boolean oldIsLeaf = (eFlags & IS_LEAF_EFLAG) != 0;
if (newIsLeaf)
eFlags |= IS_LEAF_EFLAG;
@@ -315,6 +317,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -503,6 +506,7 @@
* @generated
*/
public void setState(State newState) {
+
if (newState != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.REGION__STATE && newState != null)) {
if (EcoreUtil.isAncestor(this, newState))
@@ -557,6 +561,7 @@
* @generated
*/
public void setExtendedRegion(Region newExtendedRegion) {
+
Region oldExtendedRegion = extendedRegion;
extendedRegion = newExtendedRegion;
if (eNotificationRequired())
@@ -607,6 +612,7 @@
* @generated
*/
public void setStateMachine(StateMachine newStateMachine) {
+
if (newStateMachine != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.REGION__STATE_MACHINE && newStateMachine != null)) {
if (EcoreUtil.isAncestor(this, newStateMachine))
@@ -1225,6 +1231,7 @@
* @generated
*/
public Namespace basicGetNamespace() {
+
State state = basicGetState();
if (state != null) {
return state;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RelationshipImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RelationshipImpl.java
index 456b2e5..03ab085 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RelationshipImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RelationshipImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: RelationshipImpl.java,v 1.10 2006/05/24 20:54:27 khussey Exp $
+ * $Id: RelationshipImpl.java,v 1.11 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -65,6 +65,7 @@
* @generated
*/
public EList getRelatedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RemoveStructuralFeatureValueActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RemoveStructuralFeatureValueActionImpl.java
index 8e8c259..baa0877 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RemoveStructuralFeatureValueActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RemoveStructuralFeatureValueActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: RemoveStructuralFeatureValueActionImpl.java,v 1.21 2006/05/24 20:54:28 khussey Exp $
+ * $Id: RemoveStructuralFeatureValueActionImpl.java,v 1.22 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -119,6 +119,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -158,6 +159,7 @@
* @generated
*/
public void setIsRemoveDuplicates(boolean newIsRemoveDuplicates) {
+
boolean oldIsRemoveDuplicates = (eFlags & IS_REMOVE_DUPLICATES_EFLAG) != 0;
if (newIsRemoveDuplicates)
eFlags |= IS_REMOVE_DUPLICATES_EFLAG;
@@ -248,6 +250,7 @@
* @generated
*/
public void setRemoveAt(InputPin newRemoveAt) {
+
if (newRemoveAt != removeAt) {
NotificationChain msgs = null;
if (removeAt != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RemoveVariableValueActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RemoveVariableValueActionImpl.java
index 4e1b2f6..774ca5b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RemoveVariableValueActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RemoveVariableValueActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: RemoveVariableValueActionImpl.java,v 1.21 2006/05/24 20:54:28 khussey Exp $
+ * $Id: RemoveVariableValueActionImpl.java,v 1.22 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -119,6 +119,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -151,6 +152,7 @@
* @generated
*/
public void setIsRemoveDuplicates(boolean newIsRemoveDuplicates) {
+
boolean oldIsRemoveDuplicates = (eFlags & IS_REMOVE_DUPLICATES_EFLAG) != 0;
if (newIsRemoveDuplicates)
eFlags |= IS_REMOVE_DUPLICATES_EFLAG;
@@ -232,6 +234,7 @@
* @generated
*/
public void setRemoveAt(InputPin newRemoveAt) {
+
if (newRemoveAt != removeAt) {
NotificationChain msgs = null;
if (removeAt != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReplyActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReplyActionImpl.java
index d849689..271129f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReplyActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReplyActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ReplyActionImpl.java,v 1.21 2006/05/24 20:54:28 khussey Exp $
+ * $Id: ReplyActionImpl.java,v 1.22 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -122,6 +122,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -172,6 +173,7 @@
* @generated
*/
public void setReplyToCall(Trigger newReplyToCall) {
+
Trigger oldReplyToCall = replyToCall;
replyToCall = newReplyToCall;
if (eNotificationRequired())
@@ -250,6 +252,7 @@
* @generated
*/
public void setReturnInformation(InputPin newReturnInformation) {
+
if (newReturnInformation != returnInformation) {
NotificationChain msgs = null;
if (returnInformation != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendObjectActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendObjectActionImpl.java
index 3d4eb41..8bf3c88 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendObjectActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendObjectActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: SendObjectActionImpl.java,v 1.21 2006/05/24 20:54:27 khussey Exp $
+ * $Id: SendObjectActionImpl.java,v 1.22 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -105,6 +105,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -187,6 +188,7 @@
* @generated
*/
public void setTarget(InputPin newTarget) {
+
if (newTarget != target) {
NotificationChain msgs = null;
if (target != null)
@@ -296,6 +298,7 @@
* @generated
*/
public void setRequest(InputPin newRequest) {
+
if (newRequest != request) {
NotificationChain msgs = null;
if (request != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendOperationEventImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendOperationEventImpl.java
index 6c8d2ca..f8cb9fa 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendOperationEventImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendOperationEventImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: SendOperationEventImpl.java,v 1.10 2006/04/10 19:16:20 khussey Exp $
+ * $Id: SendOperationEventImpl.java,v 1.11 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -106,6 +106,7 @@
* @generated
*/
public void setOperation(Operation newOperation) {
+
Operation oldOperation = operation;
operation = newOperation;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendSignalActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendSignalActionImpl.java
index e6fdafc..9bfc95f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendSignalActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendSignalActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: SendSignalActionImpl.java,v 1.21 2006/05/24 20:54:28 khussey Exp $
+ * $Id: SendSignalActionImpl.java,v 1.22 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -110,6 +110,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -192,6 +193,7 @@
* @generated
*/
public void setTarget(InputPin newTarget) {
+
if (newTarget != target) {
NotificationChain msgs = null;
if (target != null)
@@ -269,6 +271,7 @@
* @generated
*/
public void setSignal(Signal newSignal) {
+
Signal oldSignal = signal;
signal = newSignal;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendSignalEventImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendSignalEventImpl.java
index eed83a5..d07ee53 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendSignalEventImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendSignalEventImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: SendSignalEventImpl.java,v 1.10 2006/04/10 19:16:20 khussey Exp $
+ * $Id: SendSignalEventImpl.java,v 1.11 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -105,6 +105,7 @@
* @generated
*/
public void setSignal(Signal newSignal) {
+
Signal oldSignal = signal;
signal = newSignal;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SignalEventImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SignalEventImpl.java
index 0d77744..8e974fd 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SignalEventImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SignalEventImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: SignalEventImpl.java,v 1.10 2006/04/10 19:16:19 khussey Exp $
+ * $Id: SignalEventImpl.java,v 1.11 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -105,6 +105,7 @@
* @generated
*/
public void setSignal(Signal newSignal) {
+
Signal oldSignal = signal;
signal = newSignal;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SignalImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SignalImpl.java
index a735bc3..c9dc34c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SignalImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SignalImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: SignalImpl.java,v 1.24 2006/05/24 20:54:28 khussey Exp $
+ * $Id: SignalImpl.java,v 1.25 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -95,6 +95,7 @@
* @generated
*/
public EList getAttributes() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -120,6 +121,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SlotImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SlotImpl.java
index d5201e4..2f2a72f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SlotImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SlotImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: SlotImpl.java,v 1.17 2006/05/24 20:54:28 khussey Exp $
+ * $Id: SlotImpl.java,v 1.18 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -106,6 +106,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -165,6 +166,7 @@
* @generated
*/
public void setOwningInstance(InstanceSpecification newOwningInstance) {
+
if (newOwningInstance != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.SLOT__OWNING_INSTANCE && newOwningInstance != null)) {
if (EcoreUtil.isAncestor(this, newOwningInstance))
@@ -221,6 +223,7 @@
* @generated
*/
public void setDefiningFeature(StructuralFeature newDefiningFeature) {
+
StructuralFeature oldDefiningFeature = definingFeature;
definingFeature = newDefiningFeature;
if (eNotificationRequired())
@@ -490,6 +493,7 @@
* @generated
*/
public Element basicGetOwner() {
+
InstanceSpecification owningInstance = basicGetOwningInstance();
if (owningInstance != null) {
return owningInstance;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StartClassifierBehaviorActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StartClassifierBehaviorActionImpl.java
index 09f2ab3..d72f56b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StartClassifierBehaviorActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StartClassifierBehaviorActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: StartClassifierBehaviorActionImpl.java,v 1.21 2006/05/24 20:54:27 khussey Exp $
+ * $Id: StartClassifierBehaviorActionImpl.java,v 1.22 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -97,6 +97,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -183,6 +184,7 @@
* @generated
*/
public void setObject(InputPin newObject) {
+
if (newObject != object) {
NotificationChain msgs = null;
if (object != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateImpl.java
index d0c8f21..f641790 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: StateImpl.java,v 1.28 2006/05/24 20:54:28 khussey Exp $
+ * $Id: StateImpl.java,v 1.29 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -306,6 +306,7 @@
* @generated
*/
public EList getRedefinedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -449,6 +450,7 @@
* @generated
*/
public void setIsLeaf(boolean newIsLeaf) {
+
boolean oldIsLeaf = (eFlags & IS_LEAF_EFLAG) != 0;
if (newIsLeaf)
eFlags |= IS_LEAF_EFLAG;
@@ -595,6 +597,7 @@
* @generated
*/
public void setContainer(Region newContainer) {
+
if (newContainer != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.STATE__CONTAINER && newContainer != null)) {
if (EcoreUtil.isAncestor(this, newContainer))
@@ -621,6 +624,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -645,6 +649,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -669,6 +674,7 @@
* @generated
*/
public boolean isComposite() {
+
return StateOperations.isComposite(this);
}
@@ -678,6 +684,7 @@
* @generated
*/
public boolean isOrthogonal() {
+
return StateOperations.isOrthogonal(this);
}
@@ -687,6 +694,7 @@
* @generated
*/
public boolean isSimple() {
+
return StateOperations.isSimple(this);
}
@@ -696,6 +704,7 @@
* @generated
*/
public boolean isSubmachineState() {
+
return StateOperations.isSubmachineState(this);
}
@@ -754,6 +763,7 @@
* @generated
*/
public void setSubmachine(StateMachine newSubmachine) {
+
if (newSubmachine != submachine) {
NotificationChain msgs = null;
if (submachine != null)
@@ -923,6 +933,7 @@
* @generated
*/
public void setRedefinedState(State newRedefinedState) {
+
State oldRedefinedState = redefinedState;
redefinedState = newRedefinedState;
if (eNotificationRequired())
@@ -999,6 +1010,7 @@
* @generated
*/
public void setStateInvariant(Constraint newStateInvariant) {
+
if (newStateInvariant != stateInvariant) {
NotificationChain msgs = null;
if (stateInvariant != null)
@@ -1105,6 +1117,7 @@
* @generated
*/
public void setEntry(Behavior newEntry) {
+
if (newEntry != entry) {
NotificationChain msgs = null;
if (entry != null)
@@ -1201,6 +1214,7 @@
* @generated
*/
public void setExit(Behavior newExit) {
+
if (newExit != exit) {
NotificationChain msgs = null;
if (exit != null)
@@ -1300,6 +1314,7 @@
* @generated
*/
public void setDoActivity(Behavior newDoActivity) {
+
if (newDoActivity != doActivity) {
NotificationChain msgs = null;
if (doActivity != null)
@@ -2176,6 +2191,7 @@
* @generated
*/
public Namespace basicGetNamespace() {
+
Region container = basicGetContainer();
if (container != null) {
return container;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateInvariantImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateInvariantImpl.java
index 0971c66..c09faf5 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateInvariantImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateInvariantImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: StateInvariantImpl.java,v 1.20 2006/05/24 20:54:27 khussey Exp $
+ * $Id: StateInvariantImpl.java,v 1.21 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -95,6 +95,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -180,6 +181,7 @@
* @generated
*/
public void setInvariant(Constraint newInvariant) {
+
if (newInvariant != invariant) {
NotificationChain msgs = null;
if (invariant != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateMachineImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateMachineImpl.java
index f0532b0..80988d4 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateMachineImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateMachineImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: StateMachineImpl.java,v 1.25 2006/05/24 20:54:27 khussey Exp $
+ * $Id: StateMachineImpl.java,v 1.26 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -139,6 +139,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -164,6 +165,7 @@
* @generated
*/
public EList getRedefinedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StringExpressionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StringExpressionImpl.java
index 96079cd..7594717 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StringExpressionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StringExpressionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: StringExpressionImpl.java,v 1.19 2006/05/24 20:54:27 khussey Exp $
+ * $Id: StringExpressionImpl.java,v 1.20 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -126,6 +126,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -271,6 +272,7 @@
*/
public void setOwnedTemplateSignature(
TemplateSignature newOwnedTemplateSignature) {
+
if (newOwnedTemplateSignature != ownedTemplateSignature) {
NotificationChain msgs = null;
if (ownedTemplateSignature != null)
@@ -428,6 +430,7 @@
* @generated
*/
public void setOwningExpression(StringExpression newOwningExpression) {
+
if (newOwningExpression != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.STRING_EXPRESSION__OWNING_EXPRESSION && newOwningExpression != null)) {
if (EcoreUtil.isAncestor(this, newOwningExpression))
@@ -930,6 +933,7 @@
* @generated
*/
public Element basicGetOwner() {
+
StringExpression owningExpression = basicGetOwningExpression();
if (owningExpression != null) {
return owningExpression;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuralFeatureActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuralFeatureActionImpl.java
index 474118b..08757f8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuralFeatureActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuralFeatureActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: StructuralFeatureActionImpl.java,v 1.21 2006/05/24 20:54:28 khussey Exp $
+ * $Id: StructuralFeatureActionImpl.java,v 1.22 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -109,6 +109,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -162,6 +163,7 @@
* @generated
*/
public void setStructuralFeature(StructuralFeature newStructuralFeature) {
+
StructuralFeature oldStructuralFeature = structuralFeature;
structuralFeature = newStructuralFeature;
if (eNotificationRequired())
@@ -239,6 +241,7 @@
* @generated
*/
public void setObject(InputPin newObject) {
+
if (newObject != object) {
NotificationChain msgs = null;
if (object != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuralFeatureImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuralFeatureImpl.java
index 8dc03ba..bad4bff 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuralFeatureImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuralFeatureImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: StructuralFeatureImpl.java,v 1.22 2006/05/24 20:54:27 khussey Exp $
+ * $Id: StructuralFeatureImpl.java,v 1.23 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -233,6 +233,7 @@
* @generated
*/
public void setType(Type newType) {
+
Type oldType = type;
type = newType;
if (eNotificationRequired())
@@ -247,6 +248,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -281,6 +283,7 @@
* @generated
*/
public void setIsOrdered(boolean newIsOrdered) {
+
boolean oldIsOrdered = (eFlags & IS_ORDERED_EFLAG) != 0;
if (newIsOrdered)
eFlags |= IS_ORDERED_EFLAG;
@@ -308,6 +311,7 @@
* @generated
*/
public void setIsUnique(boolean newIsUnique) {
+
boolean oldIsUnique = (eFlags & IS_UNIQUE_EFLAG) != 0;
if (newIsUnique)
eFlags |= IS_UNIQUE_EFLAG;
@@ -326,6 +330,7 @@
* @generated
*/
public int getUpper() {
+
return MultiplicityElementOperations.getUpper(this);
}
@@ -335,6 +340,7 @@
* @generated
*/
public void setUpper(int newUpper) {
+
MultiplicityElementOperations.setUpper(this, newUpper);
}
@@ -344,6 +350,7 @@
* @generated
*/
public int getLower() {
+
return MultiplicityElementOperations.getLower(this);
}
@@ -353,6 +360,7 @@
* @generated
*/
public void setLower(int newLower) {
+
MultiplicityElementOperations.setLower(this, newLower);
}
@@ -425,6 +433,7 @@
* @generated
*/
public void setUpperValue(ValueSpecification newUpperValue) {
+
if (newUpperValue != upperValue) {
NotificationChain msgs = null;
if (upperValue != null)
@@ -532,6 +541,7 @@
* @generated
*/
public void setLowerValue(ValueSpecification newLowerValue) {
+
if (newLowerValue != lowerValue) {
NotificationChain msgs = null;
if (lowerValue != null)
@@ -585,6 +595,7 @@
* @generated
*/
public void setIsReadOnly(boolean newIsReadOnly) {
+
boolean oldIsReadOnly = (eFlags & IS_READ_ONLY_EFLAG) != 0;
if (newIsReadOnly)
eFlags |= IS_READ_ONLY_EFLAG;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuredActivityNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuredActivityNodeImpl.java
index 53f9e91..bb16f06 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuredActivityNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuredActivityNodeImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: StructuredActivityNodeImpl.java,v 1.29 2006/06/12 14:23:17 khussey Exp $
+ * $Id: StructuredActivityNodeImpl.java,v 1.30 2006/11/14 18:02:15 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -195,6 +195,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -221,6 +222,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -277,6 +279,7 @@
* @generated
*/
public EList getMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -514,6 +517,7 @@
* @generated
*/
public EList getImportedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
EList result = (EList) cache.get(this,
@@ -563,6 +567,7 @@
* @generated
*/
public EList getSubgroups() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -587,6 +592,7 @@
* @generated
*/
public EList getContainedNodes() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -643,6 +649,7 @@
* @generated
*/
public EList getContainedEdges() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -828,6 +835,7 @@
* @generated
*/
public void setMustIsolate(boolean newMustIsolate) {
+
boolean oldMustIsolate = (eFlags & MUST_ISOLATE_EFLAG) != 0;
if (newMustIsolate)
eFlags |= MUST_ISOLATE_EFLAG;
@@ -1817,6 +1825,7 @@
* @generated
*/
public ActivityGroup basicGetSuperGroup() {
+
return null;
}
@@ -1859,6 +1868,7 @@
* @generated
*/
public Element basicGetOwner() {
+
if (isSetSuperGroup()) {
return basicGetSuperGroup();
}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuredClassifierImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuredClassifierImpl.java
index d1341c7..0179904 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuredClassifierImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuredClassifierImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: StructuredClassifierImpl.java,v 1.26 2006/05/24 20:54:28 khussey Exp $
+ * $Id: StructuredClassifierImpl.java,v 1.27 2006/11/14 18:02:20 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -121,6 +121,7 @@
* @generated
*/
public EList getRoles() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -176,6 +177,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -202,6 +204,7 @@
* @generated
*/
public EList getAttributes() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -226,6 +229,7 @@
* @generated
*/
public EList getMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -250,6 +254,7 @@
* @generated
*/
public EList getFeatures() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SubstitutionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SubstitutionImpl.java
index 88a4c33..98ee45d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SubstitutionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SubstitutionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: SubstitutionImpl.java,v 1.13 2006/04/10 19:16:19 khussey Exp $
+ * $Id: SubstitutionImpl.java,v 1.14 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -171,6 +171,7 @@
* @generated
*/
public void setContract(Classifier newContract) {
+
Classifier oldContract = contract;
contract = newContract;
if (eNotificationRequired())
@@ -238,6 +239,7 @@
* @generated
*/
public void setSubstitutingClassifier(Classifier newSubstitutingClassifier) {
+
if (newSubstitutingClassifier != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.SUBSTITUTION__SUBSTITUTING_CLASSIFIER && newSubstitutingClassifier != null)) {
if (EcoreUtil.isAncestor(this, newSubstitutingClassifier))
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateBindingImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateBindingImpl.java
index 2f82f1a..ac993d0 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateBindingImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateBindingImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: TemplateBindingImpl.java,v 1.15 2006/05/24 20:54:27 khussey Exp $
+ * $Id: TemplateBindingImpl.java,v 1.16 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -112,6 +112,7 @@
* @generated
*/
public EList getTargets() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -135,6 +136,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -159,6 +161,7 @@
* @generated
*/
public EList getSources() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -210,6 +213,7 @@
* @generated
*/
public void setSignature(TemplateSignature newSignature) {
+
TemplateSignature oldSignature = signature;
signature = newSignature;
if (eNotificationRequired())
@@ -285,6 +289,7 @@
* @generated
*/
public void setBoundElement(TemplateableElement newBoundElement) {
+
if (newBoundElement != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.TEMPLATE_BINDING__BOUND_ELEMENT && newBoundElement != null)) {
if (EcoreUtil.isAncestor(this, newBoundElement))
@@ -575,6 +580,7 @@
* @generated
*/
public Element basicGetOwner() {
+
TemplateableElement boundElement = basicGetBoundElement();
if (boundElement != null) {
return boundElement;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateParameterImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateParameterImpl.java
index 6e5520d..ac53e07 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateParameterImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateParameterImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: TemplateParameterImpl.java,v 1.15 2006/05/24 20:54:28 khussey Exp $
+ * $Id: TemplateParameterImpl.java,v 1.16 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -142,6 +142,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -225,6 +226,7 @@
* @generated
*/
public void setParameteredElement(ParameterableElement newParameteredElement) {
+
if (newParameteredElement != parameteredElement) {
NotificationChain msgs = null;
if (parameteredElement != null)
@@ -279,6 +281,7 @@
* @generated
*/
public void setDefault(ParameterableElement newDefault) {
+
ParameterableElement oldDefault = default_;
default_ = newDefault;
if (eNotificationRequired())
@@ -334,6 +337,7 @@
* @generated
*/
public void setSignature(TemplateSignature newSignature) {
+
if (newSignature != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.TEMPLATE_PARAMETER__SIGNATURE && newSignature != null)) {
if (EcoreUtil.isAncestor(this, newSignature))
@@ -441,6 +445,7 @@
*/
public void setOwnedParameteredElement(
ParameterableElement newOwnedParameteredElement) {
+
if (newOwnedParameteredElement != ownedParameteredElement) {
NotificationChain msgs = null;
if (ownedParameteredElement != null)
@@ -554,6 +559,7 @@
* @generated
*/
public void setOwnedDefault(ParameterableElement newOwnedDefault) {
+
if (newOwnedDefault != ownedDefault) {
NotificationChain msgs = null;
if (ownedDefault != null)
@@ -820,6 +826,7 @@
* @generated
*/
public Element basicGetOwner() {
+
TemplateSignature signature = basicGetSignature();
if (signature != null) {
return signature;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateParameterSubstitutionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateParameterSubstitutionImpl.java
index 0c020bb..dc83111 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateParameterSubstitutionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateParameterSubstitutionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: TemplateParameterSubstitutionImpl.java,v 1.16 2006/05/24 20:54:28 khussey Exp $
+ * $Id: TemplateParameterSubstitutionImpl.java,v 1.17 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -122,6 +122,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -195,6 +196,7 @@
* @generated
*/
public void setFormal(TemplateParameter newFormal) {
+
TemplateParameter oldFormal = formal;
formal = newFormal;
if (eNotificationRequired())
@@ -271,6 +273,7 @@
* @generated
*/
public void setTemplateBinding(TemplateBinding newTemplateBinding) {
+
if (newTemplateBinding != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__TEMPLATE_BINDING && newTemplateBinding != null)) {
if (EcoreUtil.isAncestor(this, newTemplateBinding))
@@ -544,6 +547,7 @@
* @generated
*/
public Element basicGetOwner() {
+
TemplateBinding templateBinding = basicGetTemplateBinding();
if (templateBinding != null) {
return templateBinding;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateSignatureImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateSignatureImpl.java
index 5ee57f0..7f3bd92 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateSignatureImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateSignatureImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: TemplateSignatureImpl.java,v 1.16 2006/05/24 20:54:28 khussey Exp $
+ * $Id: TemplateSignatureImpl.java,v 1.17 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -110,6 +110,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -185,6 +186,7 @@
* @generated
*/
public void setTemplate(TemplateableElement newTemplate) {
+
if (newTemplate != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.TEMPLATE_SIGNATURE__TEMPLATE && newTemplate != null)) {
if (EcoreUtil.isAncestor(this, newTemplate))
@@ -474,6 +476,7 @@
* @generated
*/
public Element basicGetOwner() {
+
TemplateableElement template = basicGetTemplate();
if (template != null) {
return template;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateableElementImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateableElementImpl.java
index 6b76590..8d19543 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateableElementImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateableElementImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: TemplateableElementImpl.java,v 1.16 2006/05/24 20:54:28 khussey Exp $
+ * $Id: TemplateableElementImpl.java,v 1.17 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -104,6 +104,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -252,6 +253,7 @@
*/
public void setOwnedTemplateSignature(
TemplateSignature newOwnedTemplateSignature) {
+
if (newOwnedTemplateSignature != ownedTemplateSignature) {
NotificationChain msgs = null;
if (ownedTemplateSignature != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TestIdentityActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TestIdentityActionImpl.java
index cb55168..3d19930 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TestIdentityActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TestIdentityActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: TestIdentityActionImpl.java,v 1.21 2006/05/24 20:54:28 khussey Exp $
+ * $Id: TestIdentityActionImpl.java,v 1.22 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -121,6 +121,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -145,6 +146,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -227,6 +229,7 @@
* @generated
*/
public void setFirst(InputPin newFirst) {
+
if (newFirst != first) {
NotificationChain msgs = null;
if (first != null)
@@ -336,6 +339,7 @@
* @generated
*/
public void setSecond(InputPin newSecond) {
+
if (newSecond != second) {
NotificationChain msgs = null;
if (second != null)
@@ -445,6 +449,7 @@
* @generated
*/
public void setResult(OutputPin newResult) {
+
if (newResult != result) {
NotificationChain msgs = null;
if (result != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeConstraintImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeConstraintImpl.java
index 894aea2..c512961 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeConstraintImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeConstraintImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: TimeConstraintImpl.java,v 1.19 2006/05/08 17:46:10 khussey Exp $
+ * $Id: TimeConstraintImpl.java,v 1.20 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -105,6 +105,7 @@
* @generated
*/
public void setFirstEvent(boolean newFirstEvent) {
+
boolean oldFirstEvent = (eFlags & FIRST_EVENT_EFLAG) != 0;
if (newFirstEvent)
eFlags |= FIRST_EVENT_EFLAG;
@@ -197,6 +198,7 @@
* @generated
*/
public void setSpecification(ValueSpecification newSpecification) {
+
if (newSpecification != specification) {
NotificationChain msgs = null;
if (specification != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeEventImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeEventImpl.java
index c45c5fd..88ab16b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeEventImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeEventImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: TimeEventImpl.java,v 1.18 2006/05/24 20:54:28 khussey Exp $
+ * $Id: TimeEventImpl.java,v 1.19 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -118,6 +118,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -151,6 +152,7 @@
* @generated
*/
public void setIsRelative(boolean newIsRelative) {
+
boolean oldIsRelative = (eFlags & IS_RELATIVE_EFLAG) != 0;
if (newIsRelative)
eFlags |= IS_RELATIVE_EFLAG;
@@ -227,6 +229,7 @@
* @generated
*/
public void setWhen(ValueSpecification newWhen) {
+
if (newWhen != when) {
NotificationChain msgs = null;
if (when != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeExpressionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeExpressionImpl.java
index b795ed5..a55b486 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeExpressionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeExpressionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: TimeExpressionImpl.java,v 1.13 2006/04/10 19:16:19 khussey Exp $
+ * $Id: TimeExpressionImpl.java,v 1.14 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -126,6 +126,7 @@
* @generated
*/
public void setExpr(ValueSpecification newExpr) {
+
ValueSpecification oldExpr = expr;
expr = newExpr;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeIntervalImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeIntervalImpl.java
index 9059584..02854b5 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeIntervalImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeIntervalImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: TimeIntervalImpl.java,v 1.11 2006/04/10 19:16:20 khussey Exp $
+ * $Id: TimeIntervalImpl.java,v 1.12 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -93,6 +93,7 @@
* @generated
*/
public void setMaxGen(ValueSpecification newMax) {
+
ValueSpecification oldMax = max;
max = newMax;
if (eNotificationRequired())
@@ -152,6 +153,7 @@
* @generated
*/
public void setMinGen(ValueSpecification newMin) {
+
ValueSpecification oldMin = min;
min = newMin;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeObservationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeObservationImpl.java
index 33004a2..c67a70d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeObservationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeObservationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: TimeObservationImpl.java,v 1.5 2006/04/10 19:16:18 khussey Exp $
+ * $Id: TimeObservationImpl.java,v 1.6 2006/11/14 18:02:15 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -128,6 +128,7 @@
* @generated
*/
public void setEvent(NamedElement newEvent) {
+
NamedElement oldEvent = event;
event = newEvent;
if (eNotificationRequired())
@@ -151,6 +152,7 @@
* @generated
*/
public void setFirstEvent(boolean newFirstEvent) {
+
boolean oldFirstEvent = (eFlags & FIRST_EVENT_EFLAG) != 0;
if (newFirstEvent)
eFlags |= FIRST_EVENT_EFLAG;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TransitionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TransitionImpl.java
index 9fc9514..16983b3 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TransitionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TransitionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: TransitionImpl.java,v 1.22 2006/05/24 20:54:28 khussey Exp $
+ * $Id: TransitionImpl.java,v 1.23 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -214,6 +214,7 @@
* @generated
*/
public EList getRedefinedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -270,6 +271,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -396,6 +398,7 @@
* @generated
*/
public void setIsLeaf(boolean newIsLeaf) {
+
boolean oldIsLeaf = (eFlags & IS_LEAF_EFLAG) != 0;
if (newIsLeaf)
eFlags |= IS_LEAF_EFLAG;
@@ -434,6 +437,7 @@
* @generated
*/
public void setKind(TransitionKind newKind) {
+
TransitionKind oldKind = kind;
kind = newKind == null
? KIND_EDEFAULT
@@ -485,6 +489,7 @@
* @generated
*/
public void setContainer(Region newContainer) {
+
if (newContainer != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.TRANSITION__CONTAINER && newContainer != null)) {
if (EcoreUtil.isAncestor(this, newContainer))
@@ -560,6 +565,7 @@
* @generated
*/
public void setTarget(Vertex newTarget) {
+
if (newTarget != target) {
NotificationChain msgs = null;
if (target != null)
@@ -611,6 +617,7 @@
* @generated
*/
public void setRedefinedTransition(Transition newRedefinedTransition) {
+
Transition oldRedefinedTransition = redefinedTransition;
redefinedTransition = newRedefinedTransition;
if (eNotificationRequired())
@@ -653,6 +660,7 @@
* @generated
*/
public void setGuard(Constraint newGuard) {
+
Constraint oldGuard = guard;
guard = newGuard;
if (eNotificationRequired())
@@ -757,6 +765,7 @@
* @generated
*/
public void setEffect(Behavior newEffect) {
+
if (newEffect != effect) {
NotificationChain msgs = null;
if (effect != null)
@@ -899,6 +908,7 @@
* @generated
*/
public void setSource(Vertex newSource) {
+
if (newSource != source) {
NotificationChain msgs = null;
if (source != null)
@@ -1517,6 +1527,7 @@
* @generated
*/
public Namespace basicGetNamespace() {
+
Region container = basicGetContainer();
if (container != null) {
return container;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TriggerImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TriggerImpl.java
index adce25b..e84085a 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TriggerImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TriggerImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: TriggerImpl.java,v 1.11 2006/04/10 19:16:19 khussey Exp $
+ * $Id: TriggerImpl.java,v 1.12 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -122,6 +122,7 @@
* @generated
*/
public void setEvent(Event newEvent) {
+
Event oldEvent = event;
event = newEvent;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TypeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TypeImpl.java
index 3bcd7d6..a441063 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TypeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TypeImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: TypeImpl.java,v 1.17 2006/05/24 20:54:27 khussey Exp $
+ * $Id: TypeImpl.java,v 1.18 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -350,6 +350,7 @@
* @generated
*/
public Namespace basicGetNamespace() {
+
org.eclipse.uml2.uml.Package package_ = basicGetPackage();
if (package_ != null) {
return package_;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TypedElementImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TypedElementImpl.java
index 9e0897e..57a4611 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TypedElementImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TypedElementImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: TypedElementImpl.java,v 1.10 2006/04/10 19:16:18 khussey Exp $
+ * $Id: TypedElementImpl.java,v 1.11 2006/11/14 18:02:15 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -104,6 +104,7 @@
* @generated
*/
public void setType(Type newType) {
+
Type oldType = type;
type = newType;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UnmarshallActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UnmarshallActionImpl.java
index 1a8e622..de4a448 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UnmarshallActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UnmarshallActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: UnmarshallActionImpl.java,v 1.22 2006/05/24 20:54:28 khussey Exp $
+ * $Id: UnmarshallActionImpl.java,v 1.23 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -124,6 +124,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -147,6 +148,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -265,6 +267,7 @@
* @generated
*/
public void setUnmarshallType(Classifier newUnmarshallType) {
+
Classifier oldUnmarshallType = unmarshallType;
unmarshallType = newUnmarshallType;
if (eNotificationRequired())
@@ -339,6 +342,7 @@
* @generated
*/
public void setObject(InputPin newObject) {
+
if (newObject != object) {
NotificationChain msgs = null;
if (object != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UseCaseImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UseCaseImpl.java
index 862419e..01dcd5e 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UseCaseImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UseCaseImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: UseCaseImpl.java,v 1.22 2006/05/24 20:54:28 khussey Exp $
+ * $Id: UseCaseImpl.java,v 1.23 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -135,6 +135,7 @@
* @generated
*/
public EList getOwnedMembers() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValuePinImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValuePinImpl.java
index cbb404b..633d37a 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValuePinImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValuePinImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ValuePinImpl.java,v 1.22 2006/05/16 15:07:26 khussey Exp $
+ * $Id: ValuePinImpl.java,v 1.23 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -150,6 +150,7 @@
* @generated
*/
public void setValue(ValueSpecification newValue) {
+
if (newValue != value) {
NotificationChain msgs = null;
if (value != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValueSpecificationActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValueSpecificationActionImpl.java
index e892f89..a418bc8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValueSpecificationActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValueSpecificationActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ValueSpecificationActionImpl.java,v 1.21 2006/05/24 20:54:27 khussey Exp $
+ * $Id: ValueSpecificationActionImpl.java,v 1.22 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -109,6 +109,7 @@
* @generated
*/
public EList getOutputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -194,6 +195,7 @@
* @generated
*/
public void setValue(ValueSpecification newValue) {
+
if (newValue != value) {
NotificationChain msgs = null;
if (value != null)
@@ -300,6 +302,7 @@
* @generated
*/
public void setResult(OutputPin newResult) {
+
if (newResult != result) {
NotificationChain msgs = null;
if (result != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValueSpecificationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValueSpecificationImpl.java
index 15fd094..4ffb349 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValueSpecificationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValueSpecificationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ValueSpecificationImpl.java,v 1.10 2006/04/10 19:16:18 khussey Exp $
+ * $Id: ValueSpecificationImpl.java,v 1.11 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -109,6 +109,7 @@
* @generated
*/
public void setType(Type newType) {
+
Type oldType = type;
type = newType;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VariableActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VariableActionImpl.java
index 3629f5c..d8f3eb6 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VariableActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VariableActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: VariableActionImpl.java,v 1.13 2006/04/10 19:16:20 khussey Exp $
+ * $Id: VariableActionImpl.java,v 1.14 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -113,6 +113,7 @@
* @generated
*/
public void setVariable(Variable newVariable) {
+
Variable oldVariable = variable;
variable = newVariable;
if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VariableImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VariableImpl.java
index bb57b7c..869b9d7 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VariableImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VariableImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: VariableImpl.java,v 1.27 2006/05/24 20:54:28 khussey Exp $
+ * $Id: VariableImpl.java,v 1.28 2006/11/14 18:02:17 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -183,6 +183,7 @@
* @generated
*/
public EList getOwnedElements() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -216,6 +217,7 @@
* @generated
*/
public void setIsOrdered(boolean newIsOrdered) {
+
boolean oldIsOrdered = (eFlags & IS_ORDERED_EFLAG) != 0;
if (newIsOrdered)
eFlags |= IS_ORDERED_EFLAG;
@@ -242,6 +244,7 @@
* @generated
*/
public void setIsUnique(boolean newIsUnique) {
+
boolean oldIsUnique = (eFlags & IS_UNIQUE_EFLAG) != 0;
if (newIsUnique)
eFlags |= IS_UNIQUE_EFLAG;
@@ -259,6 +262,7 @@
* @generated
*/
public int getUpper() {
+
return MultiplicityElementOperations.getUpper(this);
}
@@ -268,6 +272,7 @@
* @generated
*/
public void setUpper(int newUpper) {
+
MultiplicityElementOperations.setUpper(this, newUpper);
}
@@ -277,6 +282,7 @@
* @generated
*/
public int getLower() {
+
return MultiplicityElementOperations.getLower(this);
}
@@ -286,6 +292,7 @@
* @generated
*/
public void setLower(int newLower) {
+
MultiplicityElementOperations.setLower(this, newLower);
}
@@ -356,6 +363,7 @@
* @generated
*/
public void setUpperValue(ValueSpecification newUpperValue) {
+
if (newUpperValue != upperValue) {
NotificationChain msgs = null;
if (upperValue != null)
@@ -458,6 +466,7 @@
* @generated
*/
public void setLowerValue(ValueSpecification newLowerValue) {
+
if (newLowerValue != lowerValue) {
NotificationChain msgs = null;
if (lowerValue != null)
@@ -546,6 +555,7 @@
* @generated
*/
public void setActivityScope(Activity newActivityScope) {
+
if (newActivityScope != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.VARIABLE__ACTIVITY_SCOPE && newActivityScope != null)) {
if (EcoreUtil.isAncestor(this, newActivityScope))
@@ -608,6 +618,7 @@
* @generated
*/
public void setScope(StructuredActivityNode newScope) {
+
if (newScope != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.VARIABLE__SCOPE && newScope != null)) {
if (EcoreUtil.isAncestor(this, newScope))
@@ -1236,6 +1247,7 @@
* @generated
*/
public Namespace basicGetNamespace() {
+
StructuredActivityNode scope = basicGetScope();
if (scope != null) {
return scope;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VertexImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VertexImpl.java
index fe11deb..80ebd46 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VertexImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VertexImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: VertexImpl.java,v 1.16 2006/05/24 20:54:28 khussey Exp $
+ * $Id: VertexImpl.java,v 1.17 2006/11/14 18:02:19 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -234,6 +234,7 @@
* @generated
*/
public void setContainer(Region newContainer) {
+
if (newContainer != eInternalContainer()
|| (eContainerFeatureID != UMLPackage.VERTEX__CONTAINER && newContainer != null)) {
if (EcoreUtil.isAncestor(this, newContainer))
@@ -509,6 +510,7 @@
* @generated
*/
public Namespace basicGetNamespace() {
+
Region container = basicGetContainer();
if (container != null) {
return container;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteStructuralFeatureActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteStructuralFeatureActionImpl.java
index c252b8a..45fa4c0 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteStructuralFeatureActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteStructuralFeatureActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: WriteStructuralFeatureActionImpl.java,v 1.21 2006/05/24 20:54:28 khussey Exp $
+ * $Id: WriteStructuralFeatureActionImpl.java,v 1.22 2006/11/14 18:02:16 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -98,6 +98,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -184,6 +185,7 @@
* @generated
*/
public void setValue(InputPin newValue) {
+
if (newValue != value) {
NotificationChain msgs = null;
if (value != null)
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteVariableActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteVariableActionImpl.java
index 0ea987c..9988c7b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteVariableActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteVariableActionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: WriteVariableActionImpl.java,v 1.21 2006/05/24 20:54:27 khussey Exp $
+ * $Id: WriteVariableActionImpl.java,v 1.22 2006/11/14 18:02:18 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.impl;
@@ -98,6 +98,7 @@
* @generated
*/
public EList getInputs() {
+
CacheAdapter cache = getCacheAdapter();
if (cache != null) {
Resource eResource = eResource();
@@ -182,6 +183,7 @@
* @generated
*/
public void setValue(InputPin newValue) {
+
if (newValue != value) {
NotificationChain msgs = null;
if (value != null)
