Author: tfmorris
Date: 2008-07-27 23:04:33-0700
New Revision: 15387
Modified:
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CollaborationsFactoryMDRImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java
Log:
Issue 4994: Find outermost package dynamically instead of caching it. Additional API and app work required for create/build methods which don't contain the necessary info to figure out which extent to create/build the new element in.
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CollaborationsFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CollaborationsFactoryMDRImpl.java?view=diff&rev=15387&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CollaborationsFactoryMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CollaborationsFactoryMDRImpl.java&r1=15386&r2=15387
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CollaborationsFactoryMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CollaborationsFactoryMDRImpl.java 2008-07-27 23:04:33-0700
@@ -67,11 +67,6 @@
private MDRModelImplementation modelImpl;
/**
- * The Collaborations package.
- */
- private CollaborationsPackage collabPkg;
-
- /**
* Don't allow instantiation.
*
* @param implementation
@@ -79,21 +74,23 @@
*/
CollaborationsFactoryMDRImpl(MDRModelImplementation implementation) {
modelImpl = implementation;
- collabPkg = modelImpl.getUmlPackage().getCollaborations();
}
-
public AssociationEndRole createAssociationEndRole() {
AssociationEndRole myAssociationEndRole =
- collabPkg.getAssociationEndRole().createAssociationEndRole();
+ getCollabPkg().getAssociationEndRole().createAssociationEndRole();
super.initialize(myAssociationEndRole);
return myAssociationEndRole;
}
+
+ private CollaborationsPackage getCollabPkg() {
+ return modelImpl.getUmlPackage().getCollaborations();
+ }
public AssociationRole createAssociationRole() {
AssociationRole myAssociationRole =
- collabPkg.getAssociationRole().createAssociationRole();
+ getCollabPkg().getAssociationRole().createAssociationRole();
super.initialize(myAssociationRole);
return myAssociationRole;
}
@@ -101,7 +98,7 @@
public ClassifierRole createClassifierRole() {
ClassifierRole myClassifierRole =
- collabPkg.getClassifierRole().createClassifierRole();
+ getCollabPkg().getClassifierRole().createClassifierRole();
super.initialize(myClassifierRole);
return myClassifierRole;
}
@@ -109,7 +106,7 @@
public Collaboration createCollaboration() {
Collaboration myCollaboration =
- collabPkg.getCollaboration().createCollaboration();
+ getCollabPkg().getCollaboration().createCollaboration();
super.initialize(myCollaboration);
return myCollaboration;
}
@@ -117,7 +114,7 @@
public CollaborationInstanceSet createCollaborationInstanceSet() {
CollaborationInstanceSet obj =
- collabPkg.getCollaborationInstanceSet()
+ getCollabPkg().getCollaborationInstanceSet()
.createCollaborationInstanceSet();
super.initialize(obj);
return obj;
@@ -126,7 +123,7 @@
public Interaction createInteraction() {
Interaction myInteraction =
- collabPkg.getInteraction().createInteraction();
+ getCollabPkg().getInteraction().createInteraction();
super.initialize(myInteraction);
return myInteraction;
}
@@ -134,7 +131,7 @@
public InteractionInstanceSet createInteractionInstanceSet() {
InteractionInstanceSet obj =
- collabPkg.getInteractionInstanceSet()
+ getCollabPkg().getInteractionInstanceSet()
.createInteractionInstanceSet();
super.initialize(obj);
return obj;
@@ -143,7 +140,7 @@
public Message createMessage() {
Message myMessage =
- collabPkg.getMessage().createMessage();
+ getCollabPkg().getMessage().createMessage();
super.initialize(myMessage);
return myMessage;
}
@@ -476,10 +473,12 @@
void deleteClassifierRole(Object elem) {
ClassifierRole cr = (ClassifierRole) elem;
// delete Messages which have this as sender or receiver
+ CollaborationsPackage cPkg = ((org.omg.uml.UmlPackage) cr
+ .refOutermostPackage()).getCollaborations();
modelImpl.getUmlHelper().deleteCollection(
- collabPkg.getAMessageSender().getMessage(cr));
+ cPkg.getAMessageSender().getMessage(cr));
modelImpl.getUmlHelper().deleteCollection(
- collabPkg.getAReceiverMessage().getMessage(cr));
+ cPkg.getAReceiverMessage().getMessage(cr));
// TODO: delete Collaborations where this is the last ClassifierRole?
// Object owner = cr.refImmediateComposite();
// if (owner instanceof Collaboration) {
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java?view=diff&rev=15387&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java&r1=15386&r2=15387
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java 2008-07-27 23:04:33-0700
@@ -81,12 +81,6 @@
* The model implementation.
*/
private MDRModelImplementation modelImpl;
-
- /*
- * JMI package for Common Behavior package from UML metamodel
- * It contains the element factories that we'll need.
- */
- private CommonBehaviorPackage cbPackage;
/**
* Don't allow instantiation.
@@ -96,12 +90,11 @@
*/
CommonBehaviorFactoryMDRImpl(MDRModelImplementation implementation) {
modelImpl = implementation;
- cbPackage = modelImpl.getUmlPackage().getCommonBehavior();
}
public ActionSequence createActionSequence() {
- ActionSequence myActionSequence = cbPackage.getActionSequence()
+ ActionSequence myActionSequence = getCbPackage().getActionSequence()
.createActionSequence();
super.initialize(myActionSequence);
return myActionSequence;
@@ -109,7 +102,7 @@
public Argument createArgument() {
- Argument myArgument = cbPackage
+ Argument myArgument = getCbPackage()
.getArgument().createArgument();
super.initialize(myArgument);
return myArgument;
@@ -117,22 +110,25 @@
public AttributeLink createAttributeLink() {
- AttributeLink myAttributeLink = cbPackage.getAttributeLink()
+ AttributeLink myAttributeLink = getCbPackage().getAttributeLink()
.createAttributeLink();
super.initialize(myAttributeLink);
return myAttributeLink;
}
+ private CommonBehaviorPackage getCbPackage() {
+ return modelImpl.getUmlPackage().getCommonBehavior();
+ }
public CallAction createCallAction() {
- CallAction myCallAction = cbPackage.getCallAction().createCallAction();
+ CallAction myCallAction = getCbPackage().getCallAction().createCallAction();
super.initialize(myCallAction);
return myCallAction;
}
public ComponentInstance createComponentInstance() {
- ComponentInstance myComponentInstance = cbPackage
+ ComponentInstance myComponentInstance = getCbPackage()
.getComponentInstance().createComponentInstance();
super.initialize(myComponentInstance);
return myComponentInstance;
@@ -140,7 +136,7 @@
public CreateAction createCreateAction() {
- CreateAction myCreateAction = cbPackage.getCreateAction()
+ CreateAction myCreateAction = getCbPackage().getCreateAction()
.createCreateAction();
super.initialize(myCreateAction);
return myCreateAction;
@@ -148,14 +144,14 @@
public DataValue createDataValue() {
- DataValue myDataValue = cbPackage.getDataValue().createDataValue();
+ DataValue myDataValue = getCbPackage().getDataValue().createDataValue();
super.initialize(myDataValue);
return myDataValue;
}
public DestroyAction createDestroyAction() {
- DestroyAction myDestroyAction = cbPackage.getDestroyAction()
+ DestroyAction myDestroyAction = getCbPackage().getDestroyAction()
.createDestroyAction();
super.initialize(myDestroyAction);
return myDestroyAction;
@@ -163,7 +159,7 @@
public UmlException createException() {
- UmlException myUmlException = cbPackage.getUmlException()
+ UmlException myUmlException = getCbPackage().getUmlException()
.createUmlException();
super.initialize(myUmlException);
return myUmlException;
@@ -171,28 +167,28 @@
public Link createLink() {
- Link myLink = cbPackage.getLink().createLink();
+ Link myLink = getCbPackage().getLink().createLink();
super.initialize(myLink);
return myLink;
}
public LinkEnd createLinkEnd() {
- LinkEnd myLinkEnd = cbPackage.getLinkEnd().createLinkEnd();
+ LinkEnd myLinkEnd = getCbPackage().getLinkEnd().createLinkEnd();
super.initialize(myLinkEnd);
return myLinkEnd;
}
public LinkObject createLinkObject() {
- LinkObject myLinkObject = cbPackage.getLinkObject().createLinkObject();
+ LinkObject myLinkObject = getCbPackage().getLinkObject().createLinkObject();
super.initialize(myLinkObject);
return myLinkObject;
}
public NodeInstance createNodeInstance() {
- NodeInstance myNodeInstance = cbPackage.getNodeInstance()
+ NodeInstance myNodeInstance = getCbPackage().getNodeInstance()
.createNodeInstance();
super.initialize(myNodeInstance);
return myNodeInstance;
@@ -201,21 +197,21 @@
public org.omg.uml.behavioralelements.commonbehavior.Object createObject() {
org.omg.uml.behavioralelements.commonbehavior.Object myObject =
- cbPackage.getObject().createObject();
+ getCbPackage().getObject().createObject();
super.initialize(myObject);
return myObject;
}
public Reception createReception() {
- Reception myReception = cbPackage.getReception().createReception();
+ Reception myReception = getCbPackage().getReception().createReception();
super.initialize(myReception);
return myReception;
}
public ReturnAction createReturnAction() {
- ReturnAction myReturnAction = cbPackage.getReturnAction()
+ ReturnAction myReturnAction = getCbPackage().getReturnAction()
.createReturnAction();
super.initialize(myReturnAction);
return myReturnAction;
@@ -223,28 +219,28 @@
public SendAction createSendAction() {
- SendAction mySendAction = cbPackage.getSendAction().createSendAction();
+ SendAction mySendAction = getCbPackage().getSendAction().createSendAction();
super.initialize(mySendAction);
return mySendAction;
}
public Signal createSignal() {
- Signal mySignal = cbPackage.getSignal().createSignal();
+ Signal mySignal = getCbPackage().getSignal().createSignal();
super.initialize(mySignal);
return mySignal;
}
public Stimulus createStimulus() {
- Stimulus myStimulus = cbPackage.getStimulus().createStimulus();
+ Stimulus myStimulus = getCbPackage().getStimulus().createStimulus();
super.initialize(myStimulus);
return myStimulus;
}
public SubsystemInstance createSubsystemInstance() {
- SubsystemInstance obj = cbPackage.getSubsystemInstance()
+ SubsystemInstance obj = getCbPackage().getSubsystemInstance()
.createSubsystemInstance();
super.initialize(obj);
return obj;
@@ -252,7 +248,7 @@
public TerminateAction createTerminateAction() {
- TerminateAction myTerminateAction = cbPackage.getTerminateAction()
+ TerminateAction myTerminateAction = getCbPackage().getTerminateAction()
.createTerminateAction();
super.initialize(myTerminateAction);
return myTerminateAction;
@@ -260,7 +256,7 @@
public UninterpretedAction createUninterpretedAction() {
- UninterpretedAction myUninterpretedAction = cbPackage
+ UninterpretedAction myUninterpretedAction = getCbPackage()
.getUninterpretedAction().createUninterpretedAction();
super.initialize(myUninterpretedAction);
return myUninterpretedAction;
@@ -321,7 +317,7 @@
public Signal buildSignal(Object element) {
if ((element instanceof BehavioralFeature)) {
Signal signal = buildSignalInt(element);
- cbPackage.getAContextRaisedSignal().add(
+ getCbPackage().getAContextRaisedSignal().add(
(BehavioralFeature) element, signal);
return signal;
} else if (element instanceof Reception) {
@@ -390,13 +386,16 @@
throw new IllegalArgumentException("elem: " + elem);
}
// Delete Stimulii which have this as their dispatchAction
+ Action action = (Action) elem;
modelImpl.getUmlHelper().deleteCollection(
- cbPackage.getADispatchActionStimulus().getStimulus(
- (Action) elem));
+ ((org.omg.uml.UmlPackage) action.refOutermostPackage())
+ .getCommonBehavior().getADispatchActionStimulus()
+ .getStimulus((Action) elem));
// Delete Messages which have this as their action
modelImpl.getUmlHelper().deleteCollection(
- modelImpl.getUmlPackage().getCollaborations()
- .getAActionMessage().getMessage((Action) elem));
+ ((org.omg.uml.UmlPackage) action.refOutermostPackage())
+ .getCollaborations().getAActionMessage().getMessage(
+ (Action) elem));
}
/**
@@ -502,22 +501,24 @@
if (!(elem instanceof Instance)) {
throw new IllegalArgumentException("elem: " + elem);
}
+ Instance instance = (Instance) elem;
// Delete LinkEnds
- modelImpl.getUmlHelper().deleteCollection(
- ((Instance) elem).getLinkEnd());
+ modelImpl.getUmlHelper().deleteCollection(instance.getLinkEnd());
// Delete AttributeLinks where this is the value
modelImpl.getUmlHelper().deleteCollection(
- cbPackage
+ ((org.omg.uml.UmlPackage) instance
+ .refOutermostPackage()).getCommonBehavior()
.getAAttributeLinkValue().getAttributeLink(
- (Instance) elem));
+ instance));
// Delete CollaborationInstanceSets where
// this is the last participatingInstance
- for (Iterator it = modelImpl.getUmlPackage().getCollaborations()
+ for (Iterator it = ((org.omg.uml.UmlPackage) instance
+ .refOutermostPackage()).getCollaborations()
.getACollaborationInstanceSetParticipatingInstance()
- .getCollaborationInstanceSet((Instance) elem).iterator(); it
+ .getCollaborationInstanceSet(instance).iterator(); it
.hasNext();) {
CollaborationInstanceSet cis = (CollaborationInstanceSet) it.next();
Collection instances = cis.getParticipatingInstance();
@@ -528,9 +529,9 @@
// Delete Stimuli which have this as a Sender or Receiver
modelImpl.getUmlHelper().deleteCollection(
- cbPackage.getAStimulusSender().getStimulus((Instance) elem));
+ getCbPackage().getAStimulusSender().getStimulus((Instance) elem));
modelImpl.getUmlHelper().deleteCollection(
- cbPackage.getAReceiverStimulus().getStimulus((Instance) elem));
+ getCbPackage().getAReceiverStimulus().getStimulus((Instance) elem));
}
@@ -631,13 +632,17 @@
if (!(elem instanceof Signal)) {
throw new IllegalArgumentException("elem: " + elem);
}
+ Signal signal = (Signal) elem;
// Delete all SendActions which have this as signal
modelImpl.getUmlHelper().deleteCollection(
- cbPackage.getASignalSendAction().getSendAction((Signal) elem));
+ ((org.omg.uml.UmlPackage) signal.refOutermostPackage())
+ .getCommonBehavior().getASignalSendAction()
+ .getSendAction(signal));
// Delete all SignalEvents which have this as the signal
modelImpl.getUmlHelper().deleteCollection(
- modelImpl.getUmlPackage().getStateMachines()
- .getASignalOccurrence().getOccurrence((Signal) elem));
+ ((org.omg.uml.UmlPackage) signal.refOutermostPackage())
+ .getStateMachines().getASignalOccurrence()
+ .getOccurrence((Signal) elem));
}
/**
@@ -648,13 +653,14 @@
if (!(elem instanceof Stimulus)) {
throw new IllegalArgumentException("elem: " + elem);
}
+ Stimulus stimulus = (Stimulus) elem;
// Delete InteractionInstanceSets where
// this is the last participatingStimulus
- for (Iterator it = modelImpl.getUmlPackage().getCollaborations()
+ for (Iterator it = ((org.omg.uml.UmlPackage) stimulus
+ .refOutermostPackage()).getCollaborations()
.getAInteractionInstanceSetParticipatingStimulus()
- .getInteractionInstanceSet((Stimulus) elem).iterator(); it
- .hasNext();) {
+ .getInteractionInstanceSet(stimulus).iterator(); it.hasNext();) {
InteractionInstanceSet iis = (InteractionInstanceSet) it.next();
Collection instances = iis.getParticipatingStimulus();
if (instances.size() == 1 && instances.contains(elem)) {
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java?view=diff&rev=15387&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java&r1=15386&r2=15387
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java 2008-07-27 23:04:33-0700
@@ -125,11 +125,6 @@
private MDRModelImplementation modelImpl;
/**
- * The MDR core package for model element construction
- */
- private CorePackage corePackage;
-
- /**
* Constructor.
*
* @param implementation
@@ -137,12 +132,14 @@
*/
CoreFactoryMDRImpl(MDRModelImplementation implementation) {
modelImpl = implementation;
- corePackage = modelImpl.getUmlPackage().getCore();
}
-
+ private CorePackage getCorePackage() {
+ return modelImpl.getUmlPackage().getCore();
+ }
+
public Abstraction createAbstraction() {
- Abstraction myAbstraction = corePackage.getAbstraction()
+ Abstraction myAbstraction = getCorePackage().getAbstraction()
.createAbstraction();
super.initialize(myAbstraction);
return myAbstraction;
@@ -170,14 +167,14 @@
public Artifact createArtifact() {
- Artifact artifact = corePackage.getArtifact().createArtifact();
+ Artifact artifact = getCorePackage().getArtifact().createArtifact();
super.initialize(artifact);
return artifact;
}
public UmlAssociation createAssociation() {
- UmlAssociation assoc = corePackage.getUmlAssociation()
+ UmlAssociation assoc = getCorePackage().getUmlAssociation()
.createUmlAssociation();
super.initialize(assoc);
return assoc;
@@ -185,7 +182,7 @@
public AssociationClass createAssociationClass() {
- AssociationClass assoc = corePackage.getAssociationClass()
+ AssociationClass assoc = getCorePackage().getAssociationClass()
.createAssociationClass();
super.initialize(assoc);
return assoc;
@@ -193,7 +190,7 @@
public AssociationEnd createAssociationEnd() {
- AssociationEnd assocEnd = corePackage.getAssociationEnd()
+ AssociationEnd assocEnd = getCorePackage().getAssociationEnd()
.createAssociationEnd();
super.initialize(assocEnd);
return assocEnd;
@@ -201,42 +198,42 @@
public Attribute createAttribute() {
- Attribute myAttribute = corePackage.getAttribute().createAttribute();
+ Attribute myAttribute = getCorePackage().getAttribute().createAttribute();
super.initialize(myAttribute);
return myAttribute;
}
public Binding createBinding() {
- Binding myBinding = corePackage.getBinding().createBinding();
+ Binding myBinding = getCorePackage().getBinding().createBinding();
super.initialize(myBinding);
return myBinding;
}
public UmlClass createClass() {
- UmlClass myClass = corePackage.getUmlClass().createUmlClass();
+ UmlClass myClass = getCorePackage().getUmlClass().createUmlClass();
super.initialize(myClass);
return myClass;
}
public Comment createComment() {
- Comment myComment = corePackage.getComment().createComment();
+ Comment myComment = getCorePackage().getComment().createComment();
super.initialize(myComment);
return myComment;
}
public Component createComponent() {
- Component myComponent = corePackage.getComponent().createComponent();
+ Component myComponent = getCorePackage().getComponent().createComponent();
super.initialize(myComponent);
return myComponent;
}
public Constraint createConstraint() {
- Constraint myConstraint = corePackage.getConstraint()
+ Constraint myConstraint = getCorePackage().getConstraint()
.createConstraint();
super.initialize(myConstraint);
return myConstraint;
@@ -244,14 +241,14 @@
public DataType createDataType() {
- DataType dataType = corePackage.getDataType().createDataType();
+ DataType dataType = getCorePackage().getDataType().createDataType();
super.initialize(dataType);
return dataType;
}
public Dependency createDependency() {
- Dependency myDependency = corePackage.getDependency()
+ Dependency myDependency = getCorePackage().getDependency()
.createDependency();
super.initialize(myDependency);
return myDependency;
@@ -259,7 +256,7 @@
public ElementResidence createElementResidence() {
- ElementResidence myElementResidence = corePackage.
+ ElementResidence myElementResidence = getCorePackage().
getElementResidence().createElementResidence();
super.initialize(myElementResidence);
return myElementResidence;
@@ -267,7 +264,7 @@
public ElementResidence buildElementResidence(Object me, Object component) {
- ElementResidence myElementResidence = corePackage.
+ ElementResidence myElementResidence = getCorePackage().
getElementResidence().createElementResidence();
super.initialize(myElementResidence);
myElementResidence.setContainer((Component) component);
@@ -277,7 +274,7 @@
public Enumeration createEnumeration() {
- Enumeration myEnumeration = corePackage.getEnumeration()
+ Enumeration myEnumeration = getCorePackage().getEnumeration()
.createEnumeration();
super.initialize(myEnumeration);
return myEnumeration;
@@ -285,7 +282,7 @@
public EnumerationLiteral createEnumerationLiteral() {
- EnumerationLiteral myEnumerationLiteral = corePackage
+ EnumerationLiteral myEnumerationLiteral = getCorePackage()
.getEnumerationLiteral().createEnumerationLiteral();
super.initialize(myEnumerationLiteral);
return myEnumerationLiteral;
@@ -302,14 +299,14 @@
public Flow createFlow() {
- Flow myFlow = corePackage.getFlow().createFlow();
+ Flow myFlow = getCorePackage().getFlow().createFlow();
super.initialize(myFlow);
return myFlow;
}
public Generalization createGeneralization() {
- Generalization myGeneralization = corePackage.getGeneralization()
+ Generalization myGeneralization = getCorePackage().getGeneralization()
.createGeneralization();
super.initialize(myGeneralization);
return myGeneralization;
@@ -317,7 +314,7 @@
public Interface createInterface() {
- Interface myInterface = corePackage
+ Interface myInterface = getCorePackage()
.getInterface().createInterface();
super.initialize(myInterface);
return myInterface;
@@ -325,7 +322,7 @@
public Method createMethod() {
- Method myMethod = corePackage.getMethod()
+ Method myMethod = getCorePackage().getMethod()
.createMethod();
super.initialize(myMethod);
return myMethod;
@@ -333,14 +330,14 @@
public Node createNode() {
- Node myNode = corePackage.getNode().createNode();
+ Node myNode = getCorePackage().getNode().createNode();
super.initialize(myNode);
return myNode;
}
public Operation createOperation() {
- Operation myOperation = corePackage
+ Operation myOperation = getCorePackage()
.getOperation().createOperation();
super.initialize(myOperation);
return myOperation;
@@ -348,7 +345,7 @@
public Parameter createParameter() {
- Parameter myParameter = corePackage
+ Parameter myParameter = getCorePackage()
.getParameter().createParameter();
super.initialize(myParameter);
return myParameter;
@@ -356,7 +353,7 @@
public Permission createPermission() {
- Permission myPermission = corePackage
+ Permission myPermission = getCorePackage()
.getPermission().createPermission();
super.initialize(myPermission);
return myPermission;
@@ -370,7 +367,7 @@
public Primitive createPrimitiveType() {
- Primitive obj = corePackage.getPrimitive().createPrimitive();
+ Primitive obj = getCorePackage().getPrimitive().createPrimitive();
super.initialize(obj);
return obj;
}
@@ -378,7 +375,7 @@
@SuppressWarnings("deprecation")
public ProgrammingLanguageDataType createProgrammingLanguageDataType() {
- ProgrammingLanguageDataType obj = corePackage
+ ProgrammingLanguageDataType obj = getCorePackage()
.getProgrammingLanguageDataType()
.createProgrammingLanguageDataType();
super.initialize(obj);
@@ -387,7 +384,7 @@
public TemplateArgument createTemplateArgument() {
- TemplateArgument obj = corePackage.getTemplateArgument()
+ TemplateArgument obj = getCorePackage().getTemplateArgument()
.createTemplateArgument();
super.initialize(obj);
return obj;
@@ -395,7 +392,7 @@
public TemplateParameter createTemplateParameter() {
- TemplateParameter myTemplateParameter = corePackage
+ TemplateParameter myTemplateParameter = getCorePackage()
.getTemplateParameter().createTemplateParameter();
super.initialize(myTemplateParameter);
return myTemplateParameter;
@@ -403,7 +400,7 @@
public Usage createUsage() {
- Usage myUsage = corePackage.getUsage().createUsage();
+ Usage myUsage = getCorePackage().getUsage().createUsage();
super.initialize(myUsage);
return myUsage;
}
@@ -1094,8 +1091,10 @@
*
* @return The newly created parameter.
*/
- private Parameter buildParameter(Classifier type) {
- Parameter param = corePackage.getParameter().createParameter();
+ private Parameter buildParameter(Classifier type,
+ javax.jmi.reflect.RefObject ref) {
+ Parameter param = ((org.omg.uml.UmlPackage) ref.refOutermostPackage())
+ .getCore().getParameter().createParameter();
param.setType(type);
return param;
}
@@ -1110,13 +1109,13 @@
public Parameter buildParameter(Object o, Object type) {
if (o instanceof Event) {
Event event = (Event) o;
- Parameter res = buildParameter((Classifier) type);
+ Parameter res = buildParameter((Classifier) type, event);
res.setKind(ParameterDirectionKindEnum.PDK_IN);
event.getParameter().add(res);
return res;
} else if (o instanceof BehavioralFeature) {
BehavioralFeature oper = (BehavioralFeature) o;
- Parameter res = buildParameter((Classifier) type);
+ Parameter res = buildParameter((Classifier) type, oper);
oper.getParameter().add(res);
res.setName("arg" + oper.getParameter().size());
return res;
@@ -1347,8 +1346,9 @@
}
// delete LinkEnds which have this as their associationEnd
modelImpl.getUmlHelper().deleteCollection(
- modelImpl.getUmlPackage().getCommonBehavior()
- .getAAssociationEndLinkEnd().getLinkEnd(ae));
+ ((org.omg.uml.UmlPackage) ae.refOutermostPackage())
+ .getCommonBehavior().getAAssociationEndLinkEnd()
+ .getLinkEnd(ae));
}
/**
@@ -1360,15 +1360,15 @@
throw new IllegalArgumentException("elem: " + elem);
}
// delete AttributeLinks where this is the Attribute
+ Attribute attr = (Attribute) elem;
modelImpl.getUmlHelper().deleteCollection(
- modelImpl.getUmlPackage().getCommonBehavior()
- .getAAttributeLinkAttribute().getAttributeLink(
- (Attribute) elem));
+ ((org.omg.uml.UmlPackage) attr.refOutermostPackage())
+ .getCommonBehavior().getAAttributeLinkAttribute()
+ .getAttributeLink(attr));
}
/**
- * @param elem
- * the element to be deleted
+ * @param elem the element to be deleted
*/
void deleteBehavioralFeature(Object elem) {
if (!(elem instanceof BehavioralFeature)) {
@@ -1385,9 +1385,10 @@
if (!(elem instanceof Binding)) {
throw new IllegalArgumentException("elem: " + elem);
}
+ Binding binding = (Binding) elem;
modelImpl.getUmlHelper().deleteCollection(
- corePackage.getABindingArgument()
- .getArgument((Binding) elem));
+ ((org.omg.uml.UmlPackage) binding.refOutermostPackage())
+ .getCore().getABindingArgument().getArgument(binding));
}
/**
@@ -1424,8 +1425,9 @@
Classifier cls = (Classifier) elem;
// delete CreateActions which have this as their instantiation
modelImpl.getUmlHelper().deleteCollection(
- modelImpl.getUmlPackage().getCommonBehavior()
- .getACreateActionInstantiation().getCreateAction(cls));
+ ((org.omg.uml.UmlPackage) cls.refOutermostPackage())
+ .getCommonBehavior().getACreateActionInstantiation()
+ .getCreateAction(cls));
// TODO: ?delete Instances which have this as their classifier?
// or should we leave them since they contain so much state that the
// user would have to recreate??
@@ -1438,8 +1440,9 @@
// .getATypeObjectFlowState().getObjectFlowState(cls));
// TODO: ?delete ClassifierInStates which have this as their type?
modelImpl.getUmlHelper().deleteCollection(
- modelImpl.getUmlPackage().getActivityGraphs()
- .getATypeClassifierInState().getClassifierInState(cls));
+ ((org.omg.uml.UmlPackage) cls.refOutermostPackage())
+ .getActivityGraphs().getATypeClassifierInState()
+ .getClassifierInState(cls));
}
/**
@@ -1544,18 +1547,16 @@
throw new IllegalArgumentException("elem: " + elem);
}
- GeneralizableElement generalizableElement = (GeneralizableElement) elem;
- modelImpl.getUmlHelper().deleteCollection(
- generalizableElement.getGeneralization());
+ GeneralizableElement ge = (GeneralizableElement) elem;
+ modelImpl.getUmlHelper().deleteCollection(ge.getGeneralization());
modelImpl.getUmlHelper().deleteCollection(
- corePackage.getAParentSpecialization().getSpecialization(
- generalizableElement));
+ ((org.omg.uml.UmlPackage) ge.refOutermostPackage()).getCore()
+ .getAParentSpecialization().getSpecialization(ge));
}
/**
- * @param elem
- * the element to be deleted
+ * @param elem the element to be deleted
*/
void deleteGeneralization(Object elem) {
if (!(elem instanceof Generalization)) {
@@ -1630,14 +1631,16 @@
* The behavior-context relation in the UML model
* is an aggregate, not composition. See issue 4281. */
+ ModelElement me = (ModelElement) elem;
modelImpl.getUmlHelper().deleteCollection(
- corePackage
+ ((org.omg.uml.UmlPackage) me.refOutermostPackage()).getCore()
.getAModelElementTemplateArgument()
- .getTemplateArgument((ModelElement) elem));
+ .getTemplateArgument(me));
modelImpl.getUmlHelper().deleteCollection(
- modelImpl.getUmlPackage().getModelManagement()
+ ((org.omg.uml.UmlPackage) me.refOutermostPackage())
+ .getModelManagement()
.getAImportedElementElementImport()
- .getElementImport((ModelElement) elem));
+ .getElementImport(me));
}
@@ -1687,12 +1690,14 @@
Operation oper = (Operation) elem;
// delete CallActions which have this as their operation
modelImpl.getUmlHelper().deleteCollection(
- modelImpl.getUmlPackage().getCommonBehavior()
- .getACallActionOperation().getCallAction(oper));
+ ((org.omg.uml.UmlPackage) oper.refOutermostPackage())
+ .getCommonBehavior().getACallActionOperation()
+ .getCallAction(oper));
// delete CallEvents which have this as their operation
modelImpl.getUmlHelper().deleteCollection(
- modelImpl.getUmlPackage().getStateMachines()
- .getAOccurrenceOperation().getOccurrence(oper));
+ ((org.omg.uml.UmlPackage) oper.refOutermostPackage())
+ .getStateMachines().getAOccurrenceOperation()
+ .getOccurrence(oper));
}
/**
@@ -2240,12 +2245,13 @@
BehavioralFeature target) {
target.setQuery(source.isQuery());
// copy raised signals:
- Collection<Signal> raisedSignals = modelImpl.getUmlPackage()
- .getCommonBehavior().getAContextRaisedSignal().getRaisedSignal(
- source);
+ Collection<Signal> raisedSignals = ((org.omg.uml.UmlPackage) source
+ .refOutermostPackage()).getCommonBehavior()
+ .getAContextRaisedSignal().getRaisedSignal(source);
for (Signal signal : raisedSignals) {
- modelImpl.getUmlPackage().getCommonBehavior()
- .getAContextRaisedSignal().add(target, signal);
+ ((org.omg.uml.UmlPackage) source.refOutermostPackage())
+ .getCommonBehavior().getAContextRaisedSignal().add(target,
+ signal);
}
doCopyFeature(source, target);
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java?view=diff&rev=15387&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java&r1=15386&r2=15387
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java 2008-07-27 23:04:33-0700
@@ -298,9 +298,10 @@
throw new IllegalArgumentException();
}
// Delete all TaggedValues with this type
+ TagDefinition td = (TagDefinition) elem;
modelImpl.getUmlHelper().deleteCollection(
- modelImpl.getUmlPackage().getCore().getATypeTypedValue()
- .getTypedValue((TagDefinition) elem));
+ ((org.omg.uml.UmlPackage) td.refOutermostPackage()).getCore()
+ .getATypeTypedValue().getTypedValue(td));
}
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java?view=diff&rev=15387&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java&r1=15386&r2=15387
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java 2008-07-27 23:04:33-0700
@@ -1379,9 +1379,10 @@
public Collection getBehaviors(Object handle) {
try {
if (handle instanceof ModelElement) {
- return modelImpl.getUmlPackage().getStateMachines()
- .getABehaviorContext().getBehavior(
- (ModelElement) handle);
+ ModelElement me = (ModelElement) handle;
+ return ((org.omg.uml.UmlPackage) me.refOutermostPackage())
+ .getStateMachines().getABehaviorContext().getBehavior(
+ me);
}
} catch (InvalidObjectException e) {
throw new InvalidElementException(e);
@@ -3305,7 +3306,8 @@
return illegalArgumentCollection(handle);
}
try {
- return modelImpl.getUmlPackage().getCore()
+ GeneralizableElement ge = (GeneralizableElement) handle;
+ return ((org.omg.uml.UmlPackage) ge.refOutermostPackage()).getCore()
.getAParentSpecialization().getSpecialization(
(GeneralizableElement) handle);
} catch (InvalidObjectException e) {
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java?view=diff&rev=15387&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java&r1=15386&r2=15387
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java 2008-07-27 23:04:33-0700
@@ -78,12 +78,7 @@
* The model implementation.
*/
private MDRModelImplementation modelImpl;
-
- /**
- * The State Machine Package proxy
- */
- private StateMachinesPackage smPackage;
-
+
/**
* Package-private constructor.
*
@@ -92,19 +87,22 @@
*/
StateMachinesFactoryMDRImpl(MDRModelImplementation implementation) {
modelImpl = implementation;
- smPackage = modelImpl.getUmlPackage().getStateMachines();
+ }
+
+ private StateMachinesPackage getSmPackage() {
+ return modelImpl.getUmlPackage().getStateMachines();
}
public CallEvent createCallEvent() {
- CallEvent myCallEvent = smPackage.getCallEvent().createCallEvent();
+ CallEvent myCallEvent = getSmPackage().getCallEvent().createCallEvent();
super.initialize(myCallEvent);
return myCallEvent;
}
public ChangeEvent createChangeEvent() {
- ChangeEvent myChangeEvent = smPackage.getChangeEvent()
+ ChangeEvent myChangeEvent = getSmPackage().getChangeEvent()
.createChangeEvent();
super.initialize(myChangeEvent);
return myChangeEvent;
@@ -112,7 +110,7 @@
public CompositeState createCompositeState() {
- CompositeState myCompositeState = smPackage.getCompositeState()
+ CompositeState myCompositeState = getSmPackage().getCompositeState()
.createCompositeState();
super.initialize(myCompositeState);
return myCompositeState;
@@ -120,21 +118,21 @@
public FinalState createFinalState() {
- FinalState myFinalState = smPackage.getFinalState().createFinalState();
+ FinalState myFinalState = getSmPackage().getFinalState().createFinalState();
super.initialize(myFinalState);
return myFinalState;
}
public Guard createGuard() {
- Guard myGuard = smPackage.getGuard().createGuard();
+ Guard myGuard = getSmPackage().getGuard().createGuard();
super.initialize(myGuard);
return myGuard;
}
public Pseudostate createPseudostate() {
- Pseudostate myPseudostate = smPackage.getPseudostate()
+ Pseudostate myPseudostate = getSmPackage().getPseudostate()
.createPseudostate();
super.initialize(myPseudostate);
return myPseudostate;
@@ -142,7 +140,7 @@
public SignalEvent createSignalEvent() {
- SignalEvent mySignalEvent = smPackage.getSignalEvent()
+ SignalEvent mySignalEvent = getSmPackage().getSignalEvent()
.createSignalEvent();
super.initialize(mySignalEvent);
return mySignalEvent;
@@ -150,7 +148,7 @@
public SimpleState createSimpleState() {
- SimpleState mySimpleState = smPackage.getSimpleState()
+ SimpleState mySimpleState = getSmPackage().getSimpleState()
.createSimpleState();
super.initialize(mySimpleState);
return mySimpleState;
@@ -158,7 +156,7 @@
public StateMachine createStateMachine() {
- StateMachine myStateMachine = smPackage.getStateMachine()
+ StateMachine myStateMachine = getSmPackage().getStateMachine()
.createStateMachine();
super.initialize(myStateMachine);
return myStateMachine;
@@ -166,14 +164,14 @@
public StubState createStubState() {
- StubState myStubState = smPackage.getStubState().createStubState();
+ StubState myStubState = getSmPackage().getStubState().createStubState();
super.initialize(myStubState);
return myStubState;
}
public SubmachineState createSubmachineState() {
- SubmachineState mySubmachineState = smPackage.getSubmachineState()
+ SubmachineState mySubmachineState = getSmPackage().getSubmachineState()
.createSubmachineState();
super.initialize(mySubmachineState);
return mySubmachineState;
@@ -181,21 +179,21 @@
public SynchState createSynchState() {
- SynchState mySynchState = smPackage.getSynchState().createSynchState();
+ SynchState mySynchState = getSmPackage().getSynchState().createSynchState();
super.initialize(mySynchState);
return mySynchState;
}
public TimeEvent createTimeEvent() {
- TimeEvent myTimeEvent = smPackage.getTimeEvent().createTimeEvent();
+ TimeEvent myTimeEvent = getSmPackage().getTimeEvent().createTimeEvent();
super.initialize(myTimeEvent);
return myTimeEvent;
}
public Transition createTransition() {
- Transition myTransition = smPackage.getTransition().createTransition();
+ Transition myTransition = getSmPackage().getTransition().createTransition();
super.initialize(myTransition);
return myTransition;
}
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java?view=diff&rev=15387&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java&r1=15386&r2=15387
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java 2008-07-27 23:04:33-0700
@@ -245,8 +245,9 @@
throw new IllegalArgumentException();
}
// Delete Extends which have this as their only ExtensionPoint
- Collection xtends = modelImpl.getUmlPackage().getUseCases()
- .getAExtensionPointExtend().getExtend((ExtensionPoint) elem);
+ ExtensionPoint ep = (ExtensionPoint) elem;
+ Collection xtends = ((org.omg.uml.UmlPackage) ep.refOutermostPackage())
+ .getUseCases().getAExtensionPointExtend().getExtend(ep);
for (Iterator it = xtends.iterator(); it.hasNext(); ) {
Extend extend = (Extend) it.next();
Collection eps = extend.getExtensionPoint();
@@ -281,12 +282,13 @@
modelImpl.getUmlHelper().deleteCollection(useCase.getInclude());
// delete Extends where this is the base
modelImpl.getUmlHelper().deleteCollection(
- modelImpl.getUmlPackage().getUseCases().getABaseExtender()
- .getExtender(useCase));
+ ((org.omg.uml.UmlPackage) useCase.refOutermostPackage())
+ .getUseCases().getABaseExtender().getExtender(useCase));
// delete Includes where this is the addition
modelImpl.getUmlHelper().deleteCollection(
- modelImpl.getUmlPackage().getUseCases().getAIncluderAddition()
- .getIncluder(useCase));
+ ((org.omg.uml.UmlPackage) useCase.refOutermostPackage())
+ .getUseCases().getAIncluderAddition().getIncluder(
+ useCase));
}
/**
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java?view=diff&rev=15387&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java&r1=15386&r2=15387
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java 2008-07-27 23:04:33-0700
@@ -154,7 +154,8 @@
config);
try {
ArrayList elements = new ArrayList();
- UmlPackage pkg = modelImpl.getUmlPackage();
+ UmlPackage pkg = (org.omg.uml.UmlPackage) ((RefObject) model)
+ .refOutermostPackage();
// Make sure user model is first
elements.add(model);
for (Iterator it = pkg.getCore().getElement().refAllOfType()
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.