*** empty log message ***
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ClassifierImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ClassifierImpl.java
index 0bcd603..8c5f85e 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ClassifierImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ClassifierImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: ClassifierImpl.java,v 1.19.2.3 2004/08/25 00:28:35 khussey Exp $
+ * $Id: ClassifierImpl.java,v 1.19.2.4 2004/09/07 20:00:13 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -380,7 +380,7 @@
} else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UML2Package.CLASSIFIER__OWNING_PARAMETER, newOwningParameter, newOwningParameter));
}
- if (null != newOwningParameter || oldOwningParameter == basicGetTemplateParameter()) {
+ if (null != newOwningParameter || oldOwningParameter == templateParameter) {
setTemplateParameter(newOwningParameter);
}
}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ConnectableElementImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ConnectableElementImpl.java
index 3c86142..acb484b 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ConnectableElementImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ConnectableElementImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: ConnectableElementImpl.java,v 1.5 2004/06/18 04:34:31 khussey Exp $
+ * $Id: ConnectableElementImpl.java,v 1.5.2.1 2004/09/07 20:00:13 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -202,7 +202,7 @@
} else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UML2Package.CONNECTABLE_ELEMENT__OWNING_PARAMETER, newOwningParameter, newOwningParameter));
}
- if (null != newOwningParameter || oldOwningParameter == basicGetTemplateParameter()) {
+ if (null != newOwningParameter || oldOwningParameter == templateParameter) {
setTemplateParameter(newOwningParameter);
}
}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/OperationImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/OperationImpl.java
index 5cd8528..138deea 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/OperationImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/OperationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: OperationImpl.java,v 1.14.2.2 2004/08/25 00:28:36 khussey Exp $
+ * $Id: OperationImpl.java,v 1.14.2.3 2004/09/07 20:00:13 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -473,7 +473,7 @@
} else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UML2Package.OPERATION__OWNING_PARAMETER, newOwningParameter, newOwningParameter));
}
- if (null != newOwningParameter || oldOwningParameter == basicGetTemplateParameter()) {
+ if (null != newOwningParameter || oldOwningParameter == templateParameter) {
setTemplateParameter(newOwningParameter);
}
}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/PackageImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/PackageImpl.java
index af78903..dbbaf29 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/PackageImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/PackageImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: PackageImpl.java,v 1.19 2004/06/18 17:44:12 khussey Exp $
+ * $Id: PackageImpl.java,v 1.19.2.1 2004/09/07 20:00:13 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -277,7 +277,7 @@
} else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UML2Package.PACKAGE__OWNING_PARAMETER, newOwningParameter, newOwningParameter));
}
- if (null != newOwningParameter || oldOwningParameter == basicGetTemplateParameter()) {
+ if (null != newOwningParameter || oldOwningParameter == templateParameter) {
setTemplateParameter(newOwningParameter);
}
}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/PackageableElementImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/PackageableElementImpl.java
index a067572..84abf63 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/PackageableElementImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/PackageableElementImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: PackageableElementImpl.java,v 1.7 2004/06/18 17:44:12 khussey Exp $
+ * $Id: PackageableElementImpl.java,v 1.7.2.1 2004/09/07 20:00:13 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -209,7 +209,7 @@
} else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UML2Package.PACKAGEABLE_ELEMENT__OWNING_PARAMETER, newOwningParameter, newOwningParameter));
}
- if (null != newOwningParameter || oldOwningParameter == basicGetTemplateParameter()) {
+ if (null != newOwningParameter || oldOwningParameter == templateParameter) {
setTemplateParameter(newOwningParameter);
}
}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ParameterableElementImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ParameterableElementImpl.java
index 35080ab..bb60d12 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ParameterableElementImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ParameterableElementImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: ParameterableElementImpl.java,v 1.5 2004/06/18 04:34:31 khussey Exp $
+ * $Id: ParameterableElementImpl.java,v 1.5.2.1 2004/09/07 20:00:13 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -184,7 +184,7 @@
} else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UML2Package.PARAMETERABLE_ELEMENT__OWNING_PARAMETER, newOwningParameter, newOwningParameter));
}
- if (null != newOwningParameter || oldOwningParameter == basicGetTemplateParameter()) {
+ if (null != newOwningParameter || oldOwningParameter == templateParameter) {
setTemplateParameter(newOwningParameter);
}
}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ProfileApplicationImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ProfileApplicationImpl.java
index e559fbb..a30282f 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ProfileApplicationImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ProfileApplicationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: ProfileApplicationImpl.java,v 1.5 2004/06/18 04:34:31 khussey Exp $
+ * $Id: ProfileApplicationImpl.java,v 1.5.2.1 2004/09/07 20:00:13 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -114,7 +114,7 @@
eNotify(new ENotificationImpl(this, Notification.SET, UML2Package.PROFILE_APPLICATION__IMPORTED_PROFILE, oldImportedProfile, importedProfile));
}
- if (null != newImportedProfile || oldImportedProfile == basicGetImportedPackage()) {
+ if (null != newImportedProfile || oldImportedProfile == importedPackage) {
setImportedPackage(newImportedProfile);
}
}
@@ -130,7 +130,7 @@
if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UML2Package.PROFILE_APPLICATION__IMPORTED_PACKAGE, oldImportedPackage, importedPackage));
}
- if (null != basicGetImportedProfile() && newImportedPackage != basicGetImportedProfile()) {
+ if (null != importedProfile && newImportedPackage != importedProfile) {
setImportedProfile(null);
}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/PropertyImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/PropertyImpl.java
index 5d035d7..6d13ff7 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/PropertyImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/PropertyImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: PropertyImpl.java,v 1.14.2.2 2004/08/25 00:28:36 khussey Exp $
+ * $Id: PropertyImpl.java,v 1.14.2.3 2004/09/07 20:00:13 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -389,7 +389,7 @@
} else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UML2Package.PROPERTY__OWNING_PARAMETER, newOwningParameter, newOwningParameter));
}
- if (null != newOwningParameter || oldOwningParameter == basicGetTemplateParameter()) {
+ if (null != newOwningParameter || oldOwningParameter == templateParameter) {
setTemplateParameter(newOwningParameter);
}
}
@@ -680,7 +680,7 @@
} else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UML2Package.PROPERTY__OWNING_ASSOCIATION, newOwningAssociation, newOwningAssociation));
}
- if (null != newOwningAssociation || oldOwningAssociation == basicGetAssociation()) {
+ if (null != newOwningAssociation || oldOwningAssociation == association) {
setAssociation(newOwningAssociation);
}
}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ProtocolTransitionImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ProtocolTransitionImpl.java
index 6991bdd..3fe124f 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ProtocolTransitionImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ProtocolTransitionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: ProtocolTransitionImpl.java,v 1.7.2.1 2004/08/24 01:03:45 khussey Exp $
+ * $Id: ProtocolTransitionImpl.java,v 1.7.2.2 2004/09/07 20:00:13 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -231,7 +231,7 @@
eNotify(new ENotificationImpl(this, Notification.SET, UML2Package.PROTOCOL_TRANSITION__PRE_CONDITION, oldPreCondition, preCondition));
}
- if (null != newPreCondition || oldPreCondition == getGuard()) {
+ if (null != newPreCondition || oldPreCondition == guard) {
setGuard(newPreCondition);
}
}
@@ -270,7 +270,7 @@
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UML2Package.PROTOCOL_TRANSITION__GUARD, oldGuard, newGuard);
if (msgs == null) msgs = notification; else msgs.add(notification);
}
- if (null != getPreCondition() && newGuard != getPreCondition()) {
+ if (null != preCondition && newGuard != preCondition) {
setPreCondition(null);
}
return msgs;
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/TemplateParameterImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/TemplateParameterImpl.java
index 467c6ae..8b700be 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/TemplateParameterImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/TemplateParameterImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: TemplateParameterImpl.java,v 1.8 2004/06/18 04:34:32 khussey Exp $
+ * $Id: TemplateParameterImpl.java,v 1.8.2.1 2004/09/07 20:00:13 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -191,7 +191,7 @@
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UML2Package.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT, oldParameteredElement, newParameteredElement);
if (msgs == null) msgs = notification; else msgs.add(notification);
}
- if (null != getOwnedParameteredElement() && newParameteredElement != getOwnedParameteredElement()) {
+ if (null != ownedParameteredElement && newParameteredElement != ownedParameteredElement) {
setOwnedParameteredElement(null);
}
return msgs;
@@ -243,7 +243,7 @@
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UML2Package.TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT, oldOwnedParameteredElement, newOwnedParameteredElement);
if (msgs == null) msgs = notification; else msgs.add(notification);
}
- if (null != newOwnedParameteredElement || oldOwnedParameteredElement == basicGetParameteredElement()) {
+ if (null != newOwnedParameteredElement || oldOwnedParameteredElement == parameteredElement) {
setParameteredElement(newOwnedParameteredElement);
}
return msgs;
@@ -325,7 +325,7 @@
if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UML2Package.TEMPLATE_PARAMETER__DEFAULT, oldDefault, default_));
}
- if (null != getOwnedDefault() && newDefault != getOwnedDefault()) {
+ if (null != ownedDefault && newDefault != ownedDefault) {
setOwnedDefault(null);
}
@@ -352,7 +352,7 @@
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UML2Package.TEMPLATE_PARAMETER__OWNED_DEFAULT, oldOwnedDefault, newOwnedDefault);
if (msgs == null) msgs = notification; else msgs.add(notification);
}
- if (null != newOwnedDefault || oldOwnedDefault == basicGetDefault()) {
+ if (null != newOwnedDefault || oldOwnedDefault == default_) {
setDefault(newOwnedDefault);
}
return msgs;
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ValueSpecificationImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ValueSpecificationImpl.java
index d19007c..c49d681 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ValueSpecificationImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ValueSpecificationImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: ValueSpecificationImpl.java,v 1.5 2004/06/18 04:34:32 khussey Exp $
+ * $Id: ValueSpecificationImpl.java,v 1.5.2.1 2004/09/07 20:00:13 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -189,7 +189,7 @@
} else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UML2Package.VALUE_SPECIFICATION__OWNING_PARAMETER, newOwningParameter, newOwningParameter));
}
- if (null != newOwningParameter || oldOwningParameter == basicGetTemplateParameter()) {
+ if (null != newOwningParameter || oldOwningParameter == templateParameter) {
setTemplateParameter(newOwningParameter);
}
}
