Author: bobtarling Date: 2014-12-22 15:01:47-0800 New Revision: 19959 Modified: trunk/src/argouml-app/src/org/argouml/ui/cmd/RelationshipActionFactory.java
Log: Allow dependencies to be added to diagram on any element Modified: trunk/src/argouml-app/src/org/argouml/ui/cmd/RelationshipActionFactory.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/cmd/RelationshipActionFactory.java?view=diff&pathrev=19959&r1=19958&r2=19959 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/ui/cmd/RelationshipActionFactory.java (original) +++ trunk/src/argouml-app/src/org/argouml/ui/cmd/RelationshipActionFactory.java 2014-12-22 15:01:47-0800 @@ -170,19 +170,17 @@ private ActionList getDependancyToActions(final Object element, ArgoDiagram diagram) { ActionList al= new ActionList("Add Dependencies to "); - if (Model.getFacade().isAClass(element)) { - Collection dependenciesTo = Model.getFacade().getClientDependencies(element); - for (Object dependency : dependenciesTo) { - - // Only show actions for associations not already on diagram - if (diagram.presentationFor(dependency) == null) { - Collection suppliers = Model.getFacade().getSuppliers(dependency); - for (Object supplier : suppliers) { - al.add(new AddUsageAction( - "Add dependency to "+ Model.getFacade().getName(supplier), - diagram, element, dependency, supplier)); - } + Collection dependenciesTo = Model.getFacade().getClientDependencies(element); + for (Object dependency : dependenciesTo) { + + // Only show actions for associations not already on diagram + if (diagram.presentationFor(dependency) == null) { + Collection suppliers = Model.getFacade().getSuppliers(dependency); + for (Object supplier : suppliers) { + al.add(new AddUsageAction( + "Add dependency to "+ Model.getFacade().getName(supplier), + diagram, element, dependency, supplier)); } } } @@ -191,19 +189,17 @@ private ActionList getDependancyFromActions(final Object element, ArgoDiagram diagram) { ActionList al= new ActionList("Add Dependencies from "); - if (Model.getFacade().isAClass(element)) { - Collection dependenciesFrom = Model.getFacade().getSupplierDependencies(element); - for (Object dependency : dependenciesFrom) { - - // Only show actions for associations not already on diagram - if (diagram.presentationFor(dependency) == null) { - Collection clients = Model.getFacade().getClients(dependency); - for (Object client : clients) { - al.add(new AddUsageAction( - "Add dependency from "+ Model.getFacade().getName(client), - diagram, element, dependency, client)); - } + Collection dependenciesFrom = Model.getFacade().getSupplierDependencies(element); + for (Object dependency : dependenciesFrom) { + + // Only show actions for associations not already on diagram + if (diagram.presentationFor(dependency) == null) { + Collection clients = Model.getFacade().getClients(dependency); + for (Object client : clients) { + al.add(new AddUsageAction( + "Add dependency from "+ Model.getFacade().getName(client), + diagram, element, dependency, client)); } } } ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=3093260 To unsubscribe from this discussion, e-mail: [[email protected]].
