Author: bobtarling Date: 2010-05-16 04:03:17-0700 New Revision: 18392 Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallEventOperationComboBoxModel.java
Log: Issue 6086: If the event namespace is a classifier then keep getting the parent namespace till a non-classifier is found. That namespace will be the search location for an operations. Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallEventOperationComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallEventOperationComboBoxModel.java?view=diff&pathrev=18392&r1=18391&r2=18392 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallEventOperationComboBoxModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallEventOperationComboBoxModel.java 2010-05-16 04:03:17-0700 @@ -70,23 +70,24 @@ Collection ops = new ArrayList(); if (Model.getFacade().isACallEvent(target)) { Object ns = Model.getFacade().getNamespace(target); - if (Model.getFacade().isANamespace(ns)) { - Collection classifiers = - Model.getModelManagementHelper().getAllModelElementsOfKind( - ns, - Model.getMetaTypes().getClassifier()); - for (Object classifier : classifiers) { - ops.addAll(Model.getFacade().getOperations(classifier)); - } - - // TODO: getAllModelElementsOfKind should probably do this - // processing of imported elements automatically - for (Object importedElem : Model.getModelManagementHelper() - .getAllImportedElements(ns)) { - if (Model.getFacade().isAClassifier(importedElem)) { - ops.addAll(Model.getFacade() - .getOperations(importedElem)); - } + if (Model.getFacade().isAClassifier(ns)) { + ns = Model.getFacade().getNamespace(ns); + } + Collection classifiers = + Model.getModelManagementHelper().getAllModelElementsOfKind( + ns, + Model.getMetaTypes().getClassifier()); + for (Object classifier : classifiers) { + ops.addAll(Model.getFacade().getOperations(classifier)); + } + + // TODO: getAllModelElementsOfKind should probably do this + // processing of imported elements automatically + for (Object importedElem : Model.getModelManagementHelper() + .getAllImportedElements(ns)) { + if (Model.getFacade().isAClassifier(importedElem)) { + ops.addAll(Model.getFacade() + .getOperations(importedElem)); } } } ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2609578 To unsubscribe from this discussion, e-mail: [[email protected]].
