Author: linus Date: 2010-04-14 13:59:54-0700 New Revision: 18263 Modified: branches/BRANCH_0_30_x/ (props changed) branches/BRANCH_0_30_x/src/argouml-app/ (props changed) branches/BRANCH_0_30_x/src/argouml-app/tests/org/argouml/profile/ (props changed) branches/BRANCH_0_30_x/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java
Log: Merging rev 18212 from trunk for Issue: 6052. Modified: branches/BRANCH_0_30_x/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_30_x/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java?view=diff&pathrev=18263&r1=18262&r2=18263 ============================================================================== --- branches/BRANCH_0_30_x/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java (original) +++ branches/BRANCH_0_30_x/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java 2010-04-14 13:59:54-0700 @@ -330,27 +330,34 @@ public Signal buildSignal(Object element) { + Signal signal; + if ((element instanceof BehavioralFeature)) { - Signal signal = buildSignalInt(element); + signal = buildSignalInt(element); BehavioralFeature bf = (BehavioralFeature) element; ((UmlPackage) bf.refOutermostPackage()).getCommonBehavior() .getAContextRaisedSignal().add((BehavioralFeature) element, signal); - return signal; } else if (element instanceof Reception) { - Signal signal = buildSignalInt(element); + signal = buildSignalInt(element); ((Reception) element).setSignal(signal); - return signal; } else if (element instanceof SendAction) { - Signal signal = buildSignalInt(element); + signal = buildSignalInt(element); ((SendAction) element).setSignal(signal); - return signal; } else if (element instanceof SignalEvent) { - Signal signal = buildSignalInt(element); + signal = buildSignalInt(element); ((SignalEvent) element).setSignal(signal); - return signal; + } else { + throw new IllegalArgumentException("Can't build a signal for a " + element); + } + + Object namespace = element; + while (!Model.getFacade().isAPackage(namespace)) { + namespace = Model.getFacade().getModelElementContainer(namespace); } - throw new IllegalArgumentException("Can't build a signal for a " + element); + + Model.getCoreHelper().setNamespace(signal, namespace); + return signal; } /** ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2582815 To unsubscribe from this discussion, e-mail: [[email protected]].
