diff options
| author | khussey | 2007-05-02 15:03:11 +0000 |
|---|---|---|
| committer | khussey | 2007-05-02 15:03:11 +0000 |
| commit | 008c20663e45e1712999e7997302883e1a080bb3 (patch) | |
| tree | f847b68b58e5d77895f0730e33b20c43940d6de3 /plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java | |
| parent | e0303cc167fc89461657c9740eab0a109830b76c (diff) | |
| download | org.eclipse.uml2.test-008c20663e45e1712999e7997302883e1a080bb3.tar.gz org.eclipse.uml2.test-008c20663e45e1712999e7997302883e1a080bb3.tar.xz org.eclipse.uml2.test-008c20663e45e1712999e7997302883e1a080bb3.zip | |
[185062] Fixing problems with container features, null types encountered during package merge.
Diffstat (limited to 'plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java')
| -rw-r--r-- | plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java | 5 |
1 files changed, 3 insertions, 2 deletions
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(), |