[185062] Fixing problems with container features, null types encountered during package merge.

6 files changed, 18 insertions, 12 deletions

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 5f121f35..b2d17e3c 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.42 2007/04/25 17:47:03 khussey Exp $
+ * $Id: ClassifierImpl.java,v 1.43 2007/05/02 15:03:11 khussey Exp $
  */
 package org.eclipse.uml2.uml.internal.impl;
 
@@ -762,7 +762,8 @@ public abstract class ClassifierImpl
 				msgs = ((InternalEList<Type>) newPackage.getOwnedTypes())
 					.basicAdd(this, msgs);
 			msgs = eBasicSetContainer((InternalEObject) newPackage,
-				UMLPackage.CLASSIFIER__PACKAGE, msgs);
+				InternalEObject.EOPPOSITE_FEATURE_BASE
+					- UMLPackage.PACKAGE__PACKAGED_ELEMENT, msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
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 81670f2f..655425cf 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.36 2007/04/25 17:47:03 khussey Exp $
+ * $Id: PackageImpl.java,v 1.37 2007/05/02 15:03:11 khussey Exp $
  */
 package org.eclipse.uml2.uml.internal.impl;
 
@@ -899,7 +899,8 @@ public class PackageImpl
 				msgs = ((InternalEList<org.eclipse.uml2.uml.Package>) newNestingPackage
 					.getNestedPackages()).basicAdd(this, msgs);
 			msgs = eBasicSetContainer((InternalEObject) newNestingPackage,
-				UMLPackage.PACKAGE__NESTING_PACKAGE, msgs);
+				InternalEObject.EOPPOSITE_FEATURE_BASE
+					- UMLPackage.PACKAGE__PACKAGED_ELEMENT, msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
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 e850d0b8..4570e3cb 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.37 2007/04/25 17:47:02 khussey Exp $
+ * $Id: ParameterImpl.java,v 1.38 2007/05/02 15:03:11 khussey Exp $
  */
 package org.eclipse.uml2.uml.internal.impl;
 
@@ -715,7 +715,8 @@ public class ParameterImpl
 				msgs = ((InternalEList<Parameter>) newOperation
 					.getOwnedParameters()).basicAdd(this, msgs);
 			msgs = eBasicSetContainer((InternalEObject) newOperation,
-				UMLPackage.PARAMETER__OPERATION, msgs);
+				InternalEObject.EOPPOSITE_FEATURE_BASE
+					- UMLPackage.OPERATION__OWNED_PARAMETER, msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
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 20873624..b17d5910 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.41 2007/04/25 17:47:01 khussey Exp $
+ * $Id: PropertyImpl.java,v 1.42 2007/05/02 15:03:11 khussey Exp $
  */
 package org.eclipse.uml2.uml.internal.impl;
 
@@ -1228,7 +1228,8 @@ public class PropertyImpl
 				msgs = ((InternalEList<Property>) newClass.getOwnedAttributes())
 					.basicAdd(this, msgs);
 			msgs = eBasicSetContainer((InternalEObject) newClass,
-				UMLPackage.PROPERTY__CLASS, msgs);
+				InternalEObject.EOPPOSITE_FEATURE_BASE
+					- UMLPackage.CLASS__OWNED_ATTRIBUTE, msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else 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 d2bb81e9..e07e8358 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.22 2007/04/25 17:47:03 khussey Exp $
+ * $Id: TypeImpl.java,v 1.23 2007/05/02 15:03:11 khussey Exp $
  */
 package org.eclipse.uml2.uml.internal.impl;
 
@@ -129,7 +129,8 @@ public abstract class TypeImpl
 				msgs = ((InternalEList<Type>) newPackage.getOwnedTypes())
 					.basicAdd(this, msgs);
 			msgs = eBasicSetContainer((InternalEObject) newPackage,
-				UMLPackage.TYPE__PACKAGE, msgs);
+				InternalEObject.EOPPOSITE_FEATURE_BASE
+					- UMLPackage.PACKAGE__PACKAGED_ELEMENT, msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java
index 23e9f069..1f9796d8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *
- * $Id: UMLUtil.java,v 1.60 2007/04/30 19:39:43 khussey Exp $
+ * $Id: UMLUtil.java,v 1.61 2007/05/02 15:03:11 khussey Exp $
  */
 package org.eclipse.uml2.uml.util;
 
@@ -247,7 +247,8 @@ public class UMLUtil
 					Type type = ((TypedElement) eObject).getType();
 					Type otherType = ((TypedElement) otherEObject).getType();
 
-					return new ResultingQNameMatcher(type).matches(otherType)
+					return (type == null && otherType == null)
+						|| new ResultingQNameMatcher(type).matches(otherType)
 						|| (type instanceof Classifier
 							&& otherType instanceof Classifier && (findEObject(
 							((Classifier) type).allParents(),