diff options
| author | jbruck | 2008-04-28 17:44:48 +0000 |
|---|---|---|
| committer | jbruck | 2008-04-28 17:44:48 +0000 |
| commit | 4a86f3160316f67d790dc8f3733427a4cf941efb (patch) | |
| tree | a9df235ebd0f799a3456c262129f93ff33289f40 /plugins/org.eclipse.uml2.uml/src | |
| parent | f0379a9705b2bcd7c3298c9d79c6154b900ffcad (diff) | |
| download | org.eclipse.uml2.test-4a86f3160316f67d790dc8f3733427a4cf941efb.tar.gz org.eclipse.uml2.test-4a86f3160316f67d790dc8f3733427a4cf941efb.tar.xz org.eclipse.uml2.test-4a86f3160316f67d790dc8f3733427a4cf941efb.zip | |
[228754] UML models do not open properly if there is a circular inheritance
Diffstat (limited to 'plugins/org.eclipse.uml2.uml/src')
| -rw-r--r-- | plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClassifierOperations.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClassifierOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClassifierOperations.java index 69aa67cc..a25c6c9f 100644 --- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClassifierOperations.java +++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClassifierOperations.java @@ -8,7 +8,7 @@ * Contributors: * IBM - initial API and implementation * - * $Id: ClassifierOperations.java,v 1.21 2008/03/25 13:41:38 jbruck Exp $ + * $Id: ClassifierOperations.java,v 1.22 2008/04/28 17:44:48 jbruck Exp $ */ package org.eclipse.uml2.uml.internal.operations; @@ -601,7 +601,9 @@ public class ClassifierOperations for (Classifier parent : classifier.allParents()) { - if (parent != classifier && parent.getMembers().contains(n)) { + if (parent != classifier + && !parent.allParents().contains(classifier) + && parent.getMembers().contains(n)) { return n.getVisibility() != VisibilityKind.PRIVATE_LITERAL; } } |