Author: tfmorris
Date: 2007-05-30 23:47:02-0700
New Revision: 12736
Modified:
trunk/src/model-mdr/src/org/argouml/model/mdr/ActivityGraphsFactoryMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsFactoryMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/CopyHelper.java
trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/KindsMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/ModelEventPumpMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/UmlHelperMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesHelperMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java
Log:
Use consistent variable naming to ease code movement
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/ActivityGraphsFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/ActivityGraphsFactoryMDRImpl.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/ActivityGraphsFactoryMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/ActivityGraphsFactoryMDRImpl.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/ActivityGraphsFactoryMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/ActivityGraphsFactoryMDRImpl.java 2007-05-30 23:47:02-0700
@@ -56,7 +56,7 @@
/**
* The model implementation.
*/
- private MDRModelImplementation nsmodel;
+ private MDRModelImplementation modelImpl;
/**
* Don't allow instantiation.
@@ -65,14 +65,14 @@
* To get other helpers and factories.
*/
ActivityGraphsFactoryMDRImpl(MDRModelImplementation implementation) {
- nsmodel = implementation;
+ modelImpl = implementation;
}
/*
* @see org.argouml.model.ActivityGraphsFactory#createActionState()
*/
public Object createActionState() {
- ActionState myActionState = nsmodel.getUmlPackage().getActivityGraphs().
+ ActionState myActionState = modelImpl.getUmlPackage().getActivityGraphs().
getActionState().createActionState();
super.initialize(myActionState);
return myActionState;
@@ -82,7 +82,7 @@
* @see org.argouml.model.ActivityGraphsFactory#createActivityGraph()
*/
public Object createActivityGraph() {
- ActivityGraph myActivityGraph = nsmodel.getUmlPackage().
+ ActivityGraph myActivityGraph = modelImpl.getUmlPackage().
getActivityGraphs().getActivityGraph().createActivityGraph();
super.initialize(myActivityGraph);
return myActivityGraph;
@@ -92,7 +92,7 @@
* @see org.argouml.model.ActivityGraphsFactory#createCallState()
*/
public Object createCallState() {
- CallState myCallState = nsmodel.getUmlPackage().getActivityGraphs().
+ CallState myCallState = modelImpl.getUmlPackage().getActivityGraphs().
getCallState().createCallState();
super.initialize(myCallState);
return myCallState;
@@ -102,7 +102,7 @@
* @see org.argouml.model.ActivityGraphsFactory#createClassifierInState()
*/
public Object createClassifierInState() {
- ClassifierInState myClassifierInState = nsmodel.getUmlPackage().
+ ClassifierInState myClassifierInState = modelImpl.getUmlPackage().
getActivityGraphs().getClassifierInState().
createClassifierInState();
super.initialize(myClassifierInState);
@@ -113,7 +113,7 @@
* @see org.argouml.model.ActivityGraphsFactory#createObjectFlowState()
*/
public Object createObjectFlowState() {
- ObjectFlowState myObjectFlowState = nsmodel.getUmlPackage().
+ ObjectFlowState myObjectFlowState = modelImpl.getUmlPackage().
getActivityGraphs().getObjectFlowState().
createObjectFlowState();
super.initialize(myObjectFlowState);
@@ -124,7 +124,7 @@
* @see org.argouml.model.ActivityGraphsFactory#createPartition()
*/
public Object createPartition() {
- Partition myPartition = nsmodel.getUmlPackage().getActivityGraphs().
+ Partition myPartition = modelImpl.getUmlPackage().getActivityGraphs().
getPartition().createPartition();
super.initialize(myPartition);
return myPartition;
@@ -134,7 +134,7 @@
* @see org.argouml.model.ActivityGraphsFactory#createSubactivityState()
*/
public Object createSubactivityState() {
- SubactivityState mySubactivityState = nsmodel.getUmlPackage().
+ SubactivityState mySubactivityState = modelImpl.getUmlPackage().
getActivityGraphs().getSubactivityState().
createSubactivityState();
super.initialize(mySubactivityState);
@@ -155,7 +155,7 @@
myActivityGraph.setNamespace(((BehavioralFeature) theContext).
getOwner());
}
- Object top = nsmodel.getStateMachinesFactory().
+ Object top = modelImpl.getStateMachinesFactory().
buildCompositeStateOnStateMachine(myActivityGraph);
myActivityGraph.setTop((State) top);
return myActivityGraph;
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsFactoryMDRImpl.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsFactoryMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsFactoryMDRImpl.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsFactoryMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsFactoryMDRImpl.java 2007-05-30 23:47:02-0700
@@ -65,7 +65,7 @@
/**
* The model implementation.
*/
- private MDRModelImplementation nsmodel;
+ private MDRModelImplementation modelImpl;
/**
* The Collaborations package.
@@ -79,8 +79,8 @@
* To get other helpers and factories.
*/
CollaborationsFactoryMDRImpl(MDRModelImplementation implementation) {
- nsmodel = implementation;
- collabPkg = nsmodel.getUmlPackage().getCollaborations();
+ modelImpl = implementation;
+ collabPkg = modelImpl.getUmlPackage().getCollaborations();
}
/*
@@ -320,15 +320,15 @@
throw new IllegalArgumentException("Argument is not a link");
}
- Object from = nsmodel.getCoreHelper().getSource(link);
- Object to = nsmodel.getCoreHelper().getDestination(link);
+ Object from = modelImpl.getCoreHelper().getSource(link);
+ Object to = modelImpl.getCoreHelper().getDestination(link);
Object classifierRoleFrom =
- nsmodel.getFacade().getClassifiers(from).iterator().next();
+ modelImpl.getFacade().getClassifiers(from).iterator().next();
Object classifierRoleTo =
- nsmodel.getFacade().getClassifiers(to).iterator().next();
+ modelImpl.getFacade().getClassifiers(to).iterator().next();
Object collaboration =
- nsmodel.getFacade().getNamespace(classifierRoleFrom);
- if (collaboration != nsmodel.getFacade().getNamespace(
+ modelImpl.getFacade().getNamespace(classifierRoleFrom);
+ if (collaboration != modelImpl.getFacade().getNamespace(
classifierRoleTo)) {
throw new IllegalStateException("ClassifierRoles do not belong "
+ "to the same collaboration");
@@ -338,8 +338,8 @@
+ "null");
}
Object associationRole = createAssociationRole();
- nsmodel.getCoreHelper().setNamespace(associationRole, collaboration);
- nsmodel.getCoreHelper().addLink(associationRole, link);
+ modelImpl.getCoreHelper().setNamespace(associationRole, collaboration);
+ modelImpl.getCoreHelper().addLink(associationRole, link);
return associationRole;
}
@@ -511,7 +511,7 @@
AssociationRole role = (AssociationRole) elem;
Iterator it = role.getMessage().iterator();
while (it.hasNext()) {
- nsmodel.getUmlFactory().delete(it.next());
+ modelImpl.getUmlFactory().delete(it.next());
}
}
@@ -522,9 +522,9 @@
void deleteClassifierRole(Object elem) {
ClassifierRole cr = (ClassifierRole) elem;
// delete Messages which have this as sender or receiver
- nsmodel.getUmlHelper().deleteCollection(
+ modelImpl.getUmlHelper().deleteCollection(
collabPkg.getAMessageSender().getMessage(cr));
- nsmodel.getUmlHelper().deleteCollection(
+ modelImpl.getUmlHelper().deleteCollection(
collabPkg.getAReceiverMessage().getMessage(cr));
// TODO: delete Collaborations where this is the last ClassifierRole?
// Object owner = cr.refImmediateComposite();
@@ -588,7 +588,7 @@
// we delete the Interaction
Interaction i = message.getInteraction();
if (i != null && i.getMessage().size() == 1) {
- nsmodel.getUmlFactory().delete(i);
+ modelImpl.getUmlFactory().delete(i);
}
}
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java 2007-05-30 23:47:02-0700
@@ -70,7 +70,7 @@
/**
* The model implementation.
*/
- private MDRModelImplementation nsmodel;
+ private MDRModelImplementation modelImpl;
/**
* Don't allow instantiation.
@@ -79,7 +79,7 @@
* To get other helpers and factories.
*/
CollaborationsHelperMDRImpl(MDRModelImplementation implementation) {
- nsmodel = implementation;
+ modelImpl = implementation;
}
/*
@@ -126,7 +126,7 @@
Set associations = new HashSet();
while (it.hasNext()) {
Classifier base = (Classifier) it.next();
- associations.addAll(nsmodel.getCoreHelper().getAssociations(
+ associations.addAll(modelImpl.getCoreHelper().getAssociations(
base));
}
return associations;
@@ -370,11 +370,11 @@
}
// wellformednessrule: if the role does not have a name, the role shall
// be the only one with the particular base
- if (nsmodel.getFacade().getName(role) == null
- || nsmodel.getFacade().getName(role).equals("")) {
+ if (modelImpl.getFacade().getName(role) == null
+ || modelImpl.getFacade().getName(role).equals("")) {
Collaboration collab = (Collaboration) role.getNamespace();
- ModelManagementHelper mmHelper = nsmodel.getModelManagementHelper();
+ ModelManagementHelper mmHelper = modelImpl.getModelManagementHelper();
Collection roles = mmHelper.getAllModelElementsOfKind(collab,
ClassifierRole.class);
Iterator it = roles.iterator();
@@ -387,7 +387,7 @@
}
}
role.getBase().add(base);
- if (nsmodel.getFacade().getBases(role).size() == 1) {
+ if (modelImpl.getFacade().getBases(role).size() == 1) {
role.getAvailableContents().clear();
role.getAvailableContents().addAll(base.getOwnedElement());
role.getAvailableFeature().clear();
@@ -531,7 +531,7 @@
}
}
if (bases.isEmpty()) {
- ModelManagementHelper mmh = nsmodel.getModelManagementHelper();
+ ModelManagementHelper mmh = modelImpl.getModelManagementHelper();
Namespace ns = ((Collaboration) role.getNamespace()).getNamespace();
ret.addAll(mmh.getAllModelElementsOfKind(ns, UmlAssociation.class));
ret.removeAll(mmh.getAllModelElementsOfKind(ns,
@@ -542,7 +542,7 @@
Classifier base1 = (Classifier) it.next();
if (it.hasNext()) {
Classifier base2 = (Classifier) it.next();
- CoreHelper ch = nsmodel.getCoreHelper();
+ CoreHelper ch = modelImpl.getCoreHelper();
Collection assocs = ch.getAssociations(base1, base2);
ret.addAll(assocs);
}
@@ -582,25 +582,25 @@
* @return Collection all possible bases
*/
private Collection getAllPossibleBases(ClassifierRole role) {
- if (role == null || nsmodel.getFacade().getNamespace(role) == null) {
+ if (role == null || modelImpl.getFacade().getNamespace(role) == null) {
return new ArrayList();
}
Collaboration coll = (Collaboration) role.getNamespace();
Namespace ns = coll.getNamespace();
- ModelManagementHelper mmh = nsmodel.getModelManagementHelper();
+ ModelManagementHelper mmh = modelImpl.getModelManagementHelper();
Collection returnList = mmh.getAllModelElementsOfKind(ns,
Classifier.class);
returnList.removeAll(mmh.getAllModelElementsOfKind(ns,
ClassifierRole.class));
- if (nsmodel.getFacade().getName(role) == null
- || nsmodel.getFacade().getName(role).equals("")) {
+ if (modelImpl.getFacade().getName(role) == null
+ || modelImpl.getFacade().getName(role).equals("")) {
List listToRemove = new ArrayList();
Iterator it = returnList.iterator();
while (it.hasNext()) {
Classifier clazz = (Classifier) it.next();
- Collection classifierRoles = nsmodel.getUmlPackage().
+ Collection classifierRoles = modelImpl.getUmlPackage().
getCollaborations().getAClassifierRoleBase().
getClassifierRole(clazz);
if (!classifierRoles.isEmpty()) {
@@ -630,7 +630,7 @@
* @return a collection of classifiers
*/
private Collection getAllImportedClassifiers(Object obj) {
- Collection c = nsmodel.getModelManagementHelper()
+ Collection c = modelImpl.getModelManagementHelper()
.getAllImportedElements(obj);
return filterClassifiers(c);
}
@@ -640,7 +640,7 @@
Iterator i = in.iterator();
while (i.hasNext()) {
Object o = i.next();
- if (nsmodel.getFacade().isAClassifier(o))
+ if (modelImpl.getFacade().isAClassifier(o))
out.add(o);
}
return out;
@@ -664,16 +664,16 @@
+ "this role");
}
role.setBase(base);
- ClassifierRole sender = (ClassifierRole) nsmodel.getCoreHelper().
+ ClassifierRole sender = (ClassifierRole) modelImpl.getCoreHelper().
getSource(role);
- ClassifierRole receiver = (ClassifierRole) nsmodel.getCoreHelper().
+ ClassifierRole receiver = (ClassifierRole) modelImpl.getCoreHelper().
getDestination(role);
Collection senderBases = sender.getBase();
Collection receiverBases = receiver.getBase();
- AssociationEndRole senderRole = (AssociationEndRole) nsmodel.
+ AssociationEndRole senderRole = (AssociationEndRole) modelImpl.
getCoreHelper().getAssociationEnd(sender, role);
- AssociationEndRole receiverRole = (AssociationEndRole) nsmodel.
+ AssociationEndRole receiverRole = (AssociationEndRole) modelImpl.
getCoreHelper().getAssociationEnd(receiver, role);
if (base != null) {
@@ -778,7 +778,7 @@
public void removeSuccessor(Object handle, Object mess) {
try {
if (handle instanceof Message && mess instanceof Message) {
- nsmodel.getUmlPackage().getCollaborations()
+ modelImpl.getUmlPackage().getCollaborations()
.getAPredecessorSuccessor().remove((Message) handle,
(Message) mess);
return;
@@ -863,7 +863,7 @@
*/
public void addSuccessor(Object handle, Object mess) {
if (handle instanceof Message && mess instanceof Message) {
- nsmodel.getUmlPackage().getCollaborations().
+ modelImpl.getUmlPackage().getCollaborations().
getAPredecessorSuccessor().add((Message) handle,
(Message) mess);
return;
@@ -1017,7 +1017,7 @@
try {
if (collab instanceof Collaboration
&& interaction instanceof Interaction) {
- nsmodel.getUmlPackage().getCollaborations()
+ modelImpl.getUmlPackage().getCollaborations()
.getAContextInteraction().remove(
(Collaboration) collab,
(Interaction) interaction);
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java 2007-05-30 23:47:02-0700
@@ -79,7 +79,7 @@
/**
* The model implementation.
*/
- private MDRModelImplementation nsmodel;
+ private MDRModelImplementation modelImpl;
/*
* JMI package for Common Behavior package from UML metamodel
@@ -94,8 +94,8 @@
* To get other helpers and factories.
*/
CommonBehaviorFactoryMDRImpl(MDRModelImplementation implementation) {
- nsmodel = implementation;
- cbPackage = nsmodel.getUmlPackage().getCommonBehavior();
+ modelImpl = implementation;
+ cbPackage = modelImpl.getUmlPackage().getCommonBehavior();
}
/*
@@ -320,8 +320,8 @@
+ " with a callaction.");
}
Object action = createCallAction();
- nsmodel.getCoreHelper().setName(action, name);
- nsmodel.getCommonBehaviorHelper().setOperation(action, oper);
+ modelImpl.getCoreHelper().setName(action, name);
+ modelImpl.getCommonBehaviorHelper().setOperation(action, oper);
return action;
}
@@ -331,7 +331,7 @@
public Object buildUninterpretedAction(Object actionState) {
Object action = createUninterpretedAction();
if (actionState instanceof ActionState) {
- nsmodel.getStateMachinesHelper().setEntry(actionState, action);
+ modelImpl.getStateMachinesHelper().setEntry(actionState, action);
}
return action;
}
@@ -341,15 +341,15 @@
* java.lang.Object)
*/
public Object buildLink(Object fromInstance, Object toInstance) {
- Object link = nsmodel.getCommonBehaviorFactory().createLink();
- Object /* MLinkEnd */le0 = nsmodel.getCommonBehaviorFactory().
+ Object link = modelImpl.getCommonBehaviorFactory().createLink();
+ Object /* MLinkEnd */le0 = modelImpl.getCommonBehaviorFactory().
createLinkEnd();
- nsmodel.getCommonBehaviorHelper().setInstance(le0, fromInstance);
- Object /* MLinkEnd */le1 = nsmodel.getCommonBehaviorFactory().
+ modelImpl.getCommonBehaviorHelper().setInstance(le0, fromInstance);
+ Object /* MLinkEnd */le1 = modelImpl.getCommonBehaviorFactory().
createLinkEnd();
- nsmodel.getCommonBehaviorHelper().setInstance(le1, toInstance);
- nsmodel.getCoreHelper().addConnection(link, le0);
- nsmodel.getCoreHelper().addConnection(link, le1);
+ modelImpl.getCommonBehaviorHelper().setInstance(le1, toInstance);
+ modelImpl.getCoreHelper().addConnection(link, le0);
+ modelImpl.getCoreHelper().addConnection(link, le1);
return link;
}
@@ -358,13 +358,13 @@
*/
public Object buildAction(Object message) {
Object action = createCallAction();
- nsmodel.getCoreHelper().setName(action, "action");
- nsmodel.getCollaborationsHelper().setAction(message, action);
- Object interaction = nsmodel.getFacade().getInteraction(message);
+ modelImpl.getCoreHelper().setName(action, "action");
+ modelImpl.getCollaborationsHelper().setAction(message, action);
+ Object interaction = modelImpl.getFacade().getInteraction(message);
if (interaction != null
- && nsmodel.getFacade().getContext(interaction) != null) {
- nsmodel.getCoreHelper().setNamespace(action,
- nsmodel.getFacade().getContext(interaction));
+ && modelImpl.getFacade().getContext(interaction) != null) {
+ modelImpl.getCoreHelper().setNamespace(action,
+ modelImpl.getFacade().getContext(interaction));
} else {
throw new IllegalStateException("In buildaction: message does not "
+ "have an interaction or the "
@@ -415,15 +415,15 @@
*/
public Object buildStimulus(Object link) {
if (link instanceof Link
- && nsmodel.getCoreHelper().getSource(link) != null
- && nsmodel.getCoreHelper().getDestination(link) != null) {
+ && modelImpl.getCoreHelper().getSource(link) != null
+ && modelImpl.getCoreHelper().getDestination(link) != null) {
Object stimulus = createStimulus();
- Object sender = nsmodel.getCoreHelper().getSource(link);
- Object receiver = nsmodel.getCoreHelper().getDestination(link);
- nsmodel.getCommonBehaviorHelper().setReceiver(stimulus, receiver);
- nsmodel.getCollaborationsHelper().setSender(stimulus, sender);
- nsmodel.getCommonBehaviorHelper().setCommunicationLink(stimulus,
+ Object sender = modelImpl.getCoreHelper().getSource(link);
+ Object receiver = modelImpl.getCoreHelper().getDestination(link);
+ modelImpl.getCommonBehaviorHelper().setReceiver(stimulus, receiver);
+ modelImpl.getCollaborationsHelper().setSender(stimulus, sender);
+ modelImpl.getCommonBehaviorHelper().setCommunicationLink(stimulus,
link);
return stimulus;
}
@@ -438,7 +438,7 @@
public Object buildReception(Object aClassifier) {
Object reception = createReception();
if (aClassifier instanceof Classifier) {
- nsmodel.getCoreHelper().setOwner(reception, aClassifier);
+ modelImpl.getCoreHelper().setOwner(reception, aClassifier);
}
return reception;
}
@@ -452,12 +452,12 @@
throw new IllegalArgumentException("elem: " + elem);
}
// Delete Stimulii which have this as their dispatchAction
- nsmodel.getUmlHelper().deleteCollection(
+ modelImpl.getUmlHelper().deleteCollection(
cbPackage.getADispatchActionStimulus().getStimulus(
(Action) elem));
// Delete Messages which have this as their action
- nsmodel.getUmlHelper().deleteCollection(
- nsmodel.getUmlPackage().getCollaborations().getAActionMessage()
+ modelImpl.getUmlHelper().deleteCollection(
+ modelImpl.getUmlPackage().getCollaborations().getAActionMessage()
.getMessage((Action) elem));
}
@@ -566,31 +566,31 @@
}
// Delete LinkEnds
- nsmodel.getUmlHelper().deleteCollection(((Instance) elem).getLinkEnd());
+ modelImpl.getUmlHelper().deleteCollection(((Instance) elem).getLinkEnd());
// Delete AttributeLinks where this is the value
- nsmodel.getUmlHelper().deleteCollection(
+ modelImpl.getUmlHelper().deleteCollection(
cbPackage
.getAAttributeLinkValue().getAttributeLink(
(Instance) elem));
// Delete CollaborationInstanceSets where
// this is the last participatingInstance
- for (Iterator it = nsmodel.getUmlPackage().getCollaborations()
+ for (Iterator it = modelImpl.getUmlPackage().getCollaborations()
.getACollaborationInstanceSetParticipatingInstance()
.getCollaborationInstanceSet((Instance) elem).iterator(); it
.hasNext();) {
CollaborationInstanceSet cis = (CollaborationInstanceSet) it.next();
Collection instances = cis.getParticipatingInstance();
if (instances.size() == 1 && instances.contains(elem)) {
- nsmodel.getUmlFactory().delete(it.next());
+ modelImpl.getUmlFactory().delete(it.next());
}
}
// Delete Stimuli which have this as a Sender or Receiver
- nsmodel.getUmlHelper().deleteCollection(
+ modelImpl.getUmlHelper().deleteCollection(
cbPackage.getAStimulusSender().getStimulus((Instance) elem));
- nsmodel.getUmlHelper().deleteCollection(
+ modelImpl.getUmlHelper().deleteCollection(
cbPackage.getAReceiverStimulus().getStimulus((Instance) elem));
}
@@ -619,7 +619,7 @@
Link link = ((LinkEnd) elem).getLink();
if (link != null && link.getConnection() != null
&& link.getConnection().size() == 2) { // binary link
- nsmodel.getUmlFactory().delete(link);
+ modelImpl.getUmlFactory().delete(link);
}
}
@@ -693,11 +693,11 @@
throw new IllegalArgumentException("elem: " + elem);
}
// Delete all SendActions which have this as signal
- nsmodel.getUmlHelper().deleteCollection(
+ modelImpl.getUmlHelper().deleteCollection(
cbPackage.getASignalSendAction().getSendAction((Signal) elem));
// Delete all SignalEvents which have this as the signal
- nsmodel.getUmlHelper().deleteCollection(
- nsmodel.getUmlPackage().getStateMachines()
+ modelImpl.getUmlHelper().deleteCollection(
+ modelImpl.getUmlPackage().getStateMachines()
.getASignalOccurrence().getOccurrence((Signal) elem));
}
@@ -712,14 +712,14 @@
// Delete InteractionInstanceSets where
// this is the last participatingStimulus
- for (Iterator it = nsmodel.getUmlPackage().getCollaborations()
+ for (Iterator it = modelImpl.getUmlPackage().getCollaborations()
.getAInteractionInstanceSetParticipatingStimulus()
.getInteractionInstanceSet((Stimulus) elem).iterator(); it
.hasNext();) {
InteractionInstanceSet iis = (InteractionInstanceSet) it.next();
Collection instances = iis.getParticipatingStimulus();
if (instances.size() == 1 && instances.contains(elem)) {
- nsmodel.getUmlFactory().delete(it.next());
+ modelImpl.getUmlFactory().delete(it.next());
}
}
}
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/CopyHelper.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/CopyHelper.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/CopyHelper.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/CopyHelper.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/CopyHelper.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/CopyHelper.java 2007-05-30 23:47:02-0700
@@ -48,7 +48,7 @@
/**
* The model implementation.
*/
- private MDRModelImplementation nsmodel;
+ private MDRModelImplementation modelImpl;
/**
* Constructor to forbid creation of this object.
@@ -57,7 +57,7 @@
* To get other helpers and factories.
*/
CopyHelper(MDRModelImplementation implementation) {
- nsmodel = implementation;
+ modelImpl = implementation;
}
/**
@@ -89,26 +89,26 @@
Namespace ns = (Namespace) ans;
if (element instanceof UmlPackage) {
- return nsmodel.getModelManagementFactory().copyPackage(element, ns);
+ return modelImpl.getModelManagementFactory().copyPackage(element, ns);
}
if (element instanceof UmlClass) {
- return nsmodel.getCoreFactory().copyClass(element, ns);
+ return modelImpl.getCoreFactory().copyClass(element, ns);
}
if (element instanceof DataType) {
- return nsmodel.getCoreFactory().copyDataType(element, ns);
+ return modelImpl.getCoreFactory().copyDataType(element, ns);
}
if (element instanceof Interface) {
- return nsmodel.getCoreFactory().copyInterface(element, ns);
+ return modelImpl.getCoreFactory().copyInterface(element, ns);
}
if (element instanceof Feature) {
- return nsmodel.getCoreFactory().copyFeature(element, ns);
+ return modelImpl.getCoreFactory().copyFeature(element, ns);
}
if (element instanceof Stereotype) {
- return nsmodel.getExtensionMechanismsFactory().copyStereotype(
+ return modelImpl.getExtensionMechanismsFactory().copyStereotype(
element, ns);
}
if (element instanceof TagDefinition) {
- return nsmodel.getExtensionMechanismsFactory().copyTagDefinition(
+ return modelImpl.getExtensionMechanismsFactory().copyTagDefinition(
element, ns);
}
throw new IllegalArgumentException("anelement:" + anelement + ", ans: "
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java 2007-05-30 23:47:02-0700
@@ -114,7 +114,7 @@
/**
* The model implementation.
*/
- private MDRModelImplementation nsmodel;
+ private MDRModelImplementation modelImpl;
/**
* The MDR core package for model element construction
@@ -128,8 +128,8 @@
* To get other helpers and factories.
*/
CoreFactoryMDRImpl(MDRModelImplementation implementation) {
- nsmodel = implementation;
- corePackage = nsmodel.getUmlPackage().getCore();
+ modelImpl = implementation;
+ corePackage = modelImpl.getUmlPackage().getCore();
}
/*
@@ -490,7 +490,7 @@
}
UmlAssociation assoc = (UmlAssociation) createAssociation();
assoc.setName("");
- assoc.setNamespace((Namespace) nsmodel.getCoreHelper().
+ assoc.setNamespace((Namespace) modelImpl.getCoreHelper().
getFirstSharedNamespace(ns1, ns2));
buildAssociationEnd(assoc, null, c1, null, null,
nav1, null, agg1, null, null, null);
@@ -524,7 +524,7 @@
}
UmlAssociation assoc = (UmlAssociation) createAssociation();
assoc.setName("");
- assoc.setNamespace((Namespace) nsmodel.getCoreHelper().
+ assoc.setNamespace((Namespace) modelImpl.getCoreHelper().
getFirstSharedNamespace(ns1, ns2));
boolean nav1 = true;
@@ -721,7 +721,7 @@
* Get a 1..1 multiplicity
*/
private Multiplicity getMultiplicity11() {
- return (Multiplicity) nsmodel.getDataTypesFactory().createMultiplicity(
+ return (Multiplicity) modelImpl.getDataTypesFactory().createMultiplicity(
1, 1);
}
@@ -823,7 +823,7 @@
// Force type element into given namespace if not already there
// side effect!
if (model != clsType.getNamespace()
- && !(nsmodel.getModelManagementHelper().getAllNamespaces(model).
+ && !(modelImpl.getModelManagementHelper().getAllNamespaces(model).
contains(clsType.getNamespace()))) {
clsType.setNamespace((Model) model);
}
@@ -907,7 +907,7 @@
public Object buildClass(Object owner) {
Object clazz = buildClass();
if (owner instanceof Namespace) {
- nsmodel.getCoreHelper().setNamespace(clazz, owner);
+ modelImpl.getCoreHelper().setNamespace(clazz, owner);
}
return clazz;
}
@@ -917,7 +917,7 @@
*/
public Object buildClass(String name) {
Object clazz = buildClass();
- nsmodel.getCoreHelper().setName(clazz, name);
+ modelImpl.getCoreHelper().setName(clazz, name);
return clazz;
}
@@ -927,9 +927,9 @@
*/
public Object buildClass(String name, Object owner) {
Object clazz = buildClass();
- nsmodel.getCoreHelper().setName(clazz, name);
+ modelImpl.getCoreHelper().setName(clazz, name);
if (owner instanceof Namespace) {
- nsmodel.getCoreHelper().setNamespace(clazz, /* MNamespace */owner);
+ modelImpl.getCoreHelper().setNamespace(clazz, /* MNamespace */owner);
}
return clazz;
}
@@ -1053,7 +1053,7 @@
}
// TODO: In addition to "import," a Permission can also take "friend"
// and "access" stereotypes, each with its own semantics
- nsmodel.getExtensionMechanismsFactory().buildStereotype(per,
+ modelImpl.getExtensionMechanismsFactory().buildStereotype(per,
ModelManagementHelper.IMPORT_STEREOTYPE,
per.getNamespace());
return per;
@@ -1252,10 +1252,10 @@
} else {
ns = (Namespace) model;
}
- nsmodel.getExtensionMechanismsFactory().buildStereotype(realization,
+ modelImpl.getExtensionMechanismsFactory().buildStereotype(realization,
CoreFactory.REALIZE_STEREOTYPE, ns);
- nsmodel.getCoreHelper().addClientDependency(client, realization);
- nsmodel.getCoreHelper().addSupplierDependency(supplier, realization);
+ modelImpl.getCoreHelper().addClientDependency(client, realization);
+ modelImpl.getCoreHelper().addSupplierDependency(supplier, realization);
return realization;
}
@@ -1459,11 +1459,11 @@
UmlAssociation assoc = ae.getAssociation();
if (assoc != null && assoc.getConnection() != null
&& assoc.getConnection().size() == 2) { // binary association
- nsmodel.getUmlFactory().delete(assoc);
+ modelImpl.getUmlFactory().delete(assoc);
}
// delete LinkEnds which have this as their associationEnd
- nsmodel.getUmlHelper().deleteCollection(
- nsmodel.getUmlPackage().getCommonBehavior()
+ modelImpl.getUmlHelper().deleteCollection(
+ modelImpl.getUmlPackage().getCommonBehavior()
.getAAssociationEndLinkEnd().getLinkEnd(ae));
}
@@ -1476,8 +1476,8 @@
throw new IllegalArgumentException("elem: " + elem);
}
// delete AttributeLinks where this is the Attribute
- nsmodel.getUmlHelper().deleteCollection(
- nsmodel.getUmlPackage().getCommonBehavior()
+ modelImpl.getUmlHelper().deleteCollection(
+ modelImpl.getUmlPackage().getCommonBehavior()
.getAAttributeLinkAttribute().getAttributeLink(
(Attribute) elem));
}
@@ -1501,7 +1501,7 @@
if (!(elem instanceof Binding)) {
throw new IllegalArgumentException("elem: " + elem);
}
- nsmodel.getUmlHelper().deleteCollection(
+ modelImpl.getUmlHelper().deleteCollection(
corePackage.getABindingArgument()
.getArgument((Binding) elem));
}
@@ -1535,12 +1535,12 @@
if (!(elem instanceof Classifier)) {
throw new IllegalArgumentException("elem: " + elem);
}
- nsmodel.getUmlHelper().deleteCollection(
- nsmodel.getFacade().getAssociationEnds(elem));
+ modelImpl.getUmlHelper().deleteCollection(
+ modelImpl.getFacade().getAssociationEnds(elem));
Classifier cls = (Classifier) elem;
// delete CreateActions which have this as their instantiation
- nsmodel.getUmlHelper().deleteCollection(
- nsmodel.getUmlPackage().getCommonBehavior()
+ modelImpl.getUmlHelper().deleteCollection(
+ modelImpl.getUmlPackage().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
@@ -1553,8 +1553,8 @@
// nsmodel.getUmlPackage().getActivityGraphs()
// .getATypeObjectFlowState().getObjectFlowState(cls));
// TODO: ?delete ClassifierInStates which have this as their type?
- nsmodel.getUmlHelper().deleteCollection(
- nsmodel.getUmlPackage().getActivityGraphs()
+ modelImpl.getUmlHelper().deleteCollection(
+ modelImpl.getUmlPackage().getActivityGraphs()
.getATypeClassifierInState().getClassifierInState(cls));
}
@@ -1661,9 +1661,9 @@
}
GeneralizableElement generalizableElement = (GeneralizableElement) elem;
- nsmodel.getUmlHelper().deleteCollection(
+ modelImpl.getUmlHelper().deleteCollection(
generalizableElement.getGeneralization());
- nsmodel.getUmlHelper().deleteCollection(
+ modelImpl.getUmlHelper().deleteCollection(
corePackage.getAParentSpecialization().getSpecialization(
generalizableElement));
@@ -1730,7 +1730,7 @@
Dependency dep = (Dependency) it.next();
if (dep.getClient().size() < 2
&& dep.getClient().contains(elem)) {
- nsmodel.getUmlFactory().delete(dep);
+ modelImpl.getUmlFactory().delete(dep);
}
}
@@ -1742,7 +1742,7 @@
Dependency dep = (Dependency) it.next();
if (dep.getSupplier().size() < 2
&& dep.getSupplier().contains(elem)) {
- nsmodel.getUmlFactory().delete(dep);
+ modelImpl.getUmlFactory().delete(dep);
}
}
@@ -1750,12 +1750,12 @@
* The behavior-context relation in the UML model
* is an aggregate, not composition. See issue 4281. */
- nsmodel.getUmlHelper().deleteCollection(
+ modelImpl.getUmlHelper().deleteCollection(
corePackage
.getAModelElementTemplateArgument()
.getTemplateArgument((ModelElement) elem));
- nsmodel.getUmlHelper().deleteCollection(
- nsmodel.getUmlPackage().getModelManagement()
+ modelImpl.getUmlHelper().deleteCollection(
+ modelImpl.getUmlPackage().getModelManagement()
.getAImportedElementElementImport()
.getElementImport((ModelElement) elem));
@@ -1780,7 +1780,7 @@
ownedElements.addAll(((Namespace) elem).getOwnedElement());
Iterator it = ownedElements.iterator();
while (it.hasNext()) {
- nsmodel.getUmlFactory().delete(it.next());
+ modelImpl.getUmlFactory().delete(it.next());
}
}
@@ -1805,12 +1805,12 @@
}
Operation oper = (Operation) elem;
// delete CallActions which have this as their operation
- nsmodel.getUmlHelper().deleteCollection(
- nsmodel.getUmlPackage().getCommonBehavior()
+ modelImpl.getUmlHelper().deleteCollection(
+ modelImpl.getUmlPackage().getCommonBehavior()
.getACallActionOperation().getCallAction(oper));
// delete CallEvents which have this as their operation
- nsmodel.getUmlHelper().deleteCollection(
- nsmodel.getUmlPackage().getStateMachines()
+ modelImpl.getUmlHelper().deleteCollection(
+ modelImpl.getUmlPackage().getStateMachines()
.getAOccurrenceOperation().getOccurrence(oper));
}
@@ -1998,7 +1998,7 @@
f = method;
} else if (source instanceof Reception) {
Reception reception = (Reception)
- nsmodel.getCommonBehaviorFactory().createReception();
+ modelImpl.getCommonBehaviorFactory().createReception();
doCopyReception((Reception) source, reception);
f = reception;
} else {
@@ -2248,7 +2248,7 @@
targetME.setSpecification(sourceME.isSpecification());
targetME.setVisibility(sourceME.getVisibility());
- nsmodel.getExtensionMechanismsFactory()
+ modelImpl.getExtensionMechanismsFactory()
.copyTaggedValues(source, target);
if (!sourceME.getStereotype().isEmpty()) {
@@ -2259,7 +2259,7 @@
.getModel(targetME);
Iterator it = sourceME.getStereotype().iterator();
while (it.hasNext()) {
- Stereotype st = (Stereotype) nsmodel.getModelManagementHelper()
+ Stereotype st = (Stereotype) modelImpl.getModelManagementHelper()
.getCorrespondingElement(it.next(), targetModel, true);
targetME.getStereotype().add(st);
}
@@ -2328,7 +2328,7 @@
ProcedureExpression pe = source.getBody();
if (pe != null) {
target.setBody((ProcedureExpression)
- nsmodel.getDataTypesFactory().createProcedureExpression(
+ modelImpl.getDataTypesFactory().createProcedureExpression(
pe.getLanguage(), pe.getBody()));
}
@@ -2365,11 +2365,11 @@
BehavioralFeature target) {
target.setQuery(source.isQuery());
// copy raised signals:
- Collection c = nsmodel.getUmlPackage().getCommonBehavior()
+ Collection c = modelImpl.getUmlPackage().getCommonBehavior()
.getAContextRaisedSignal().getRaisedSignal(source);
Iterator i = c.iterator();
while (i.hasNext()) {
- nsmodel.getUmlPackage().getCommonBehavior()
+ modelImpl.getUmlPackage().getCommonBehavior()
.getAContextRaisedSignal().add(target, (Signal) i.next());
}
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java 2007-05-30 23:47:02-0700
@@ -54,7 +54,7 @@
/**
* The model implementation.
*/
- private MDRModelImplementation nsmodel;
+ private MDRModelImplementation modelImpl;
/**
* The extension mechanism helper.
@@ -68,7 +68,7 @@
* To get other helpers and factories.
*/
ExtensionMechanismsFactoryMDRImpl(MDRModelImplementation implementation) {
- nsmodel = implementation;
+ modelImpl = implementation;
extensionHelper = implementation.getExtensionMechanismsHelper();
}
@@ -76,7 +76,7 @@
* @see org.argouml.model.ExtensionMechanismsFactory#createTaggedValue()
*/
public Object createTaggedValue() {
- TaggedValue tv = nsmodel.getUmlPackage().getCore().getTaggedValue().
+ TaggedValue tv = modelImpl.getUmlPackage().getCore().getTaggedValue().
createTaggedValue();
super.initialize(tv);
return tv;
@@ -94,7 +94,7 @@
}
// Look for a TagDefinition matching the given name
- for (Iterator i = nsmodel.getUmlPackage().getCore().getTagDefinition()
+ for (Iterator i = modelImpl.getUmlPackage().getCore().getTagDefinition()
.refAllOfClass().iterator(); i.hasNext();) {
TagDefinition td = (TagDefinition) i.next();
if (tagName.equals(td.getName())) {
@@ -103,7 +103,7 @@
}
// Create a new TagDefinition if none found
- Object rootModel = nsmodel.getModelManagementFactory().getRootModel();
+ Object rootModel = modelImpl.getModelManagementFactory().getRootModel();
TagDefinition td = (TagDefinition) buildTagDefinition(tagName, null,
rootModel);
@@ -145,7 +145,7 @@
stereo);
if (stereo2 != null) {
me.getStereotype().add(stereo2);
- nsmodel.getUmlFactory().delete(stereo);
+ modelImpl.getUmlFactory().delete(stereo);
return stereo2;
}
stereo.setNamespace(ns);
@@ -166,12 +166,12 @@
Stereotype stereo = buildStereotype(theName);
stereo.getBaseClass().add(
- nsmodel.getExtensionMechanismsHelper().getMetaModelName(me));
+ modelImpl.getExtensionMechanismsHelper().getMetaModelName(me));
Stereotype stereo2 = (Stereotype) extensionHelper.getStereotype(models,
stereo);
if (stereo2 != null) {
me.getStereotype().add(stereo2);
- nsmodel.getUmlFactory().delete(stereo);
+ modelImpl.getUmlFactory().delete(stereo);
return stereo2;
}
stereo.setNamespace((org.omg.uml.modelmanagement.Model) model);
@@ -191,7 +191,7 @@
* @return an initialized stereotype.
*/
private Stereotype buildStereotype(String text) {
- Stereotype stereotype = nsmodel.getUmlPackage().getCore().
+ Stereotype stereotype = modelImpl.getUmlPackage().getCore().
getStereotype().createStereotype();
super.initialize(stereotype);
stereotype.setName(text);
@@ -220,8 +220,8 @@
TagDefinition td = (TagDefinition) getTagDefinition(tag);
td =
(TagDefinition)
- nsmodel.getModelManagementHelper().getCorrespondingElement(
- td, nsmodel.getModelManagementFactory().getRootModel(), true);
+ modelImpl.getModelManagementHelper().getCorrespondingElement(
+ td, modelImpl.getModelManagementFactory().getRootModel(), true);
tv.setType(td);
// TODO: Some CASE tools appear to manage only one
// dataValue. This is an array of String according to the
@@ -271,9 +271,9 @@
if (!(elem instanceof Stereotype)) {
throw new IllegalArgumentException();
}
- nsmodel.getUmlHelper().deleteCollection(
+ modelImpl.getUmlHelper().deleteCollection(
((Stereotype) elem).getDefinedTag());
- nsmodel.getUmlHelper().deleteCollection(
+ modelImpl.getUmlHelper().deleteCollection(
((Stereotype) elem).getStereotypeConstraint());
}
@@ -297,8 +297,8 @@
throw new IllegalArgumentException();
}
// Delete all TaggedValues with this type
- nsmodel.getUmlHelper().deleteCollection(
- nsmodel.getUmlPackage().getCore().getATypeTypedValue()
+ modelImpl.getUmlHelper().deleteCollection(
+ modelImpl.getUmlPackage().getCore().getATypeTypedValue()
.getTypedValue((TagDefinition) elem));
}
@@ -328,7 +328,7 @@
* The object becoming a copy.
*/
private void doCopyStereotype(Stereotype source, Stereotype target) {
- ((CoreFactoryMDRImpl) nsmodel.getCoreFactory())
+ ((CoreFactoryMDRImpl) modelImpl.getCoreFactory())
.doCopyGeneralizableElement(source, target);
target.getBaseClass().clear();
target.getBaseClass().addAll(source.getBaseClass());
@@ -371,7 +371,7 @@
* @see org.argouml.model.ExtensionMechanismsFactory#createTagDefinition()
*/
public Object createTagDefinition() {
- TagDefinition td = nsmodel.getUmlPackage().getCore().getTagDefinition()
+ TagDefinition td = modelImpl.getUmlPackage().getCore().getTagDefinition()
.createTagDefinition();
super.initialize(td);
return td;
@@ -381,7 +381,7 @@
* @see org.argouml.model.ExtensionMechanismsFactory#createStereotype()
*/
public Object createStereotype() {
- Stereotype st = nsmodel.getUmlPackage().getCore().getStereotype()
+ Stereotype st = modelImpl.getUmlPackage().getCore().getStereotype()
.createStereotype();
super.initialize(st);
return st;
@@ -418,7 +418,7 @@
*/
private void doCopyTagDefinition(TagDefinition source,
TagDefinition target) {
- ((CoreFactoryMDRImpl) nsmodel.getCoreFactory())
+ ((CoreFactoryMDRImpl) modelImpl.getCoreFactory())
.doCopyModelElement(source, target);
target.setTagType(source.getTagType());
String srcMult = org.argouml.model.Model.getFacade().toString(
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java 2007-05-30 23:47:02-0700
@@ -70,7 +70,7 @@
/**
* The model implementation.
*/
- private MDRModelImplementation nsmodel;
+ private MDRModelImplementation modelImpl;
private static Map packageMap = new HashMap(16);
@@ -81,7 +81,7 @@
* To get other helpers and factories.
*/
ExtensionMechanismsHelperMDRImpl(MDRModelImplementation implementation) {
- nsmodel = implementation;
+ modelImpl = implementation;
packageMap.put("core", "Core");
packageMap.put("datatypes", "Data_Types");
packageMap.put("commonbehavior", "Common_Behavior");
@@ -215,7 +215,7 @@
* @return the meta name of the UML class
*/
protected String getMetaModelName(Class clazz) {
- return nsmodel.getMetaTypes().getName(clazz);
+ return modelImpl.getMetaTypes().getName(clazz);
}
/*
@@ -291,7 +291,7 @@
throw new IllegalArgumentException("Invalid class" + clazz);
}
}
- RefPackage pkg = nsmodel.getUmlPackage().refPackage(packageName);
+ RefPackage pkg = modelImpl.getUmlPackage().refPackage(packageName);
RefClass myClass = pkg.refClass(className);
RefBaseObject metaObject = myClass.refMetaObject();
@@ -357,11 +357,11 @@
public void addCopyStereotype(Object modelElement, Object stereotype) {
if (stereotype != null) {
stereotype =
- nsmodel.getModelManagementHelper().
+ modelImpl.getModelManagementHelper().
getCorrespondingElement(stereotype,
- nsmodel.getFacade().getModel(modelElement), true);
+ modelImpl.getFacade().getModel(modelElement), true);
}
- nsmodel.getCoreHelper().addStereotype(modelElement, stereotype);
+ modelImpl.getCoreHelper().addStereotype(modelElement, stereotype);
}
@@ -401,7 +401,7 @@
return true;
}
Iterator it =
- nsmodel.getCoreHelper().getSupertypes(object).iterator();
+ modelImpl.getCoreHelper().getSupertypes(object).iterator();
while (it.hasNext()) {
if (isStereotypeInh(it.next(), name, base)) {
return true;
@@ -438,7 +438,7 @@
}
if (baseClass instanceof ModelElement) {
((Stereotype) handle).getBaseClass().add(
- nsmodel.getMetaTypes().getName(baseClass));
+ modelImpl.getMetaTypes().getName(baseClass));
return;
}
}
@@ -458,7 +458,7 @@
}
if (baseClass instanceof ModelElement) {
((Stereotype) handle).getBaseClass().remove(
- nsmodel.getMetaTypes().getName(baseClass));
+ modelImpl.getMetaTypes().getName(baseClass));
return;
}
}
@@ -489,9 +489,9 @@
TaggedValue tv = (TaggedValue) handle;
if (tag instanceof TagDefinition) {
tag =
- nsmodel.getModelManagementHelper()
+ modelImpl.getModelManagementHelper()
.getCorrespondingElement(tag,
- nsmodel.getFacade().getModel(handle), true);
+ modelImpl.getFacade().getModel(handle), true);
tv.setType((TagDefinition) tag);
} else {
// TODO: Remove old UML 1.3 code
@@ -503,17 +503,17 @@
if (td == null) {
td =
(TagDefinition)
- ((ExtensionMechanismsFactoryMDRImpl) nsmodel
+ ((ExtensionMechanismsFactoryMDRImpl) modelImpl
.getExtensionMechanismsFactory())
.getTagDefinition(tag.toString());
- Object model = nsmodel.getFacade().getModel(handle);
- if (!nsmodel.getFacade().isAModel(model)) {
+ Object model = modelImpl.getFacade().getModel(handle);
+ if (!modelImpl.getFacade().isAModel(model)) {
model =
- nsmodel.getModelManagementFactory().getRootModel();
+ modelImpl.getModelManagementFactory().getRootModel();
}
td =
(TagDefinition)
- nsmodel.getModelManagementHelper()
+ modelImpl.getModelManagementHelper()
.getCorrespondingElement(
td, model,
true);
@@ -579,7 +579,7 @@
public void setTaggedValue(Object handle, Collection taggedValues) {
if (handle instanceof ModelElement) {
Collection tv =
- nsmodel.getFacade().getTaggedValuesCollection(handle);
+ modelImpl.getFacade().getTaggedValuesCollection(handle);
if (!tv.isEmpty()) {
Vector tvs = new Vector(tv);
Iterator toRemove = tvs.iterator();
@@ -612,13 +612,13 @@
public void setType(Object handle, Object type) {
if (type == null || type instanceof TagDefinition) {
if (handle instanceof TaggedValue) {
- Object model = nsmodel.getFacade().getModel(handle);
- if (!nsmodel.getFacade().isAModel(model)) {
+ Object model = modelImpl.getFacade().getModel(handle);
+ if (!modelImpl.getFacade().isAModel(model)) {
model =
- nsmodel.getModelManagementFactory().getRootModel();
+ modelImpl.getModelManagementFactory().getRootModel();
}
type =
- nsmodel.getModelManagementHelper().getCorrespondingElement(
+ modelImpl.getModelManagementHelper().getCorrespondingElement(
type, model, true);
((TaggedValue) handle).setType((TagDefinition) type);
return;
@@ -633,11 +633,11 @@
*/
public boolean hasStereoType(Object handle, String name) {
try {
- Collection sts = nsmodel.getFacade().getStereotypes(handle);
+ Collection sts = modelImpl.getFacade().getStereotypes(handle);
Iterator i = sts.iterator();
while (i.hasNext()) {
Object st = i.next();
- if (name.equals(nsmodel.getFacade().getName(st))) {
+ if (name.equals(modelImpl.getFacade().getName(st))) {
return true;
}
}
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java 2007-05-30 23:47:02-0700
@@ -196,7 +196,7 @@
*/
private static final Logger LOG = Logger.getLogger(FacadeMDRImpl.class);
- private MDRModelImplementation implementation;
+ private MDRModelImplementation modelImpl;
// Shorthand notation for convenience
static final javax.jmi.model.AggregationKindEnum MOF_COMPOSITE =
@@ -209,7 +209,7 @@
* The model implementation
*/
public FacadeMDRImpl(MDRModelImplementation impl) {
- implementation = impl;
+ modelImpl = impl;
}
public boolean isAAbstraction(Object handle) {
@@ -906,7 +906,7 @@
Iterator iter = getStereotypes(operation).iterator();
while (iter.hasNext()) {
stereo = iter.next();
- if (implementation.getExtensionMechanismsHelper()
+ if (modelImpl.getExtensionMechanismsHelper()
.isStereotypeInh(stereo, "create",
"BehavioralFeature")) {
return true;
@@ -1276,7 +1276,7 @@
public Collection getAssociationEnds(Object handle) {
try {
if (handle instanceof Classifier) {
- return implementation.getUmlPackage().getCore()
+ return modelImpl.getUmlPackage().getCore()
.getAParticipantAssociation().getAssociation(
(Classifier) handle);
}
@@ -1290,7 +1290,7 @@
public Collection getAssociationRoles(Object handle) {
try {
if (handle instanceof UmlAssociation) {
- return implementation.getUmlPackage().getCollaborations()
+ return modelImpl.getUmlPackage().getCollaborations()
.getABaseAssociationRole().getAssociationRole(
(UmlAssociation) handle);
}
@@ -1361,7 +1361,7 @@
public Collection getBehaviors(Object handle) {
try {
if (handle instanceof ModelElement) {
- return implementation.getUmlPackage().getStateMachines()
+ return modelImpl.getUmlPackage().getStateMachines()
.getABehaviorContext().getBehavior(
(ModelElement) handle);
}
@@ -1466,7 +1466,7 @@
public Collection getChildren(Object handle) {
try {
- return implementation.getCoreHelper().getChildren(handle);
+ return modelImpl.getCoreHelper().getChildren(handle);
} catch (InvalidObjectException e) {
throw new InvalidElementException(e);
}
@@ -1476,12 +1476,12 @@
public Collection getClassifierRoles(Object handle) {
try {
if (handle instanceof Feature) {
- return implementation.getUmlPackage().getCollaborations()
+ return modelImpl.getUmlPackage().getCollaborations()
.getAClassifierRoleAvailableFeature()
.getClassifierRole((Feature) handle);
}
if (handle instanceof Classifier) {
- return implementation.getUmlPackage().getCollaborations()
+ return modelImpl.getUmlPackage().getCollaborations()
.getAClassifierRoleBase().getClassifierRole(
(Classifier) handle);
}
@@ -1519,12 +1519,12 @@
public Collection getClassifiersInState(Object handle) {
try {
if (handle instanceof Classifier) {
- return implementation.getUmlPackage().getActivityGraphs()
+ return modelImpl.getUmlPackage().getActivityGraphs()
.getATypeClassifierInState().getClassifierInState(
(Classifier) handle);
}
if (handle instanceof State) {
- return implementation.getUmlPackage().getActivityGraphs()
+ return modelImpl.getUmlPackage().getActivityGraphs()
.getAClassifierInStateInState().getClassifierInState(
(State) handle);
}
@@ -1550,7 +1550,7 @@
public Collection getClientDependencies(Object handle) {
try {
if (handle instanceof ModelElement) {
- return implementation.getUmlPackage().getCore()
+ return modelImpl.getUmlPackage().getCore()
.getAClientClientDependency().getClientDependency(
(ModelElement) handle);
}
@@ -1617,7 +1617,7 @@
public Collection getElementResidences(Object handle) {
try {
if (handle instanceof ModelElement) {
- return implementation.getUmlPackage().getCore()
+ return modelImpl.getUmlPackage().getCore()
.getAResidentElementResidence().getElementResidence(
(ModelElement) handle);
}
@@ -1631,7 +1631,7 @@
public Collection getElementImports2(Object handle) {
try {
if (handle instanceof ModelElement) {
- return implementation.getUmlPackage().getModelManagement()
+ return modelImpl.getUmlPackage().getModelManagement()
.getAImportedElementElementImport().getElementImport(
(ModelElement) handle);
}
@@ -1718,7 +1718,7 @@
if (!(handle instanceof Stereotype)) {
return illegalArgumentCollection(handle);
}
- return implementation.getUmlPackage().getCore()
+ return modelImpl.getUmlPackage().getCore()
.getAStereotypeExtendedElement()
.getExtendedElement((Stereotype) handle);
} catch (InvalidObjectException e) {
@@ -1733,7 +1733,7 @@
return ((UseCase) handle).getExtend();
}
if (handle instanceof ExtensionPoint) {
- return implementation.getUmlPackage().getUseCases()
+ return modelImpl.getUmlPackage().getUseCases()
.getAExtensionPointExtend().getExtend(
(ExtensionPoint) handle);
}
@@ -1747,7 +1747,7 @@
public Collection getExtenders(Object handle) {
try {
if (handle instanceof UseCase) {
- return implementation.getUmlPackage().getUseCases()
+ return modelImpl.getUmlPackage().getUseCases()
.getABaseExtender().getExtender((UseCase) handle);
}
return illegalArgumentCollection(handle);
@@ -1915,7 +1915,7 @@
public Collection getIncluders(Object handle) {
try {
if (handle instanceof UseCase) {
- return implementation.getUmlPackage().getUseCases()
+ return modelImpl.getUmlPackage().getUseCases()
.getAIncluderAddition().getIncluder((UseCase) handle);
}
} catch (InvalidObjectException e) {
@@ -1982,7 +1982,7 @@
public Collection getInstances(Object handle) {
try {
if (handle instanceof Classifier) {
- return implementation.getUmlPackage().getCommonBehavior()
+ return modelImpl.getUmlPackage().getCommonBehavior()
.getAInstanceClassifier().getInstance(
(Classifier) handle);
}
@@ -2050,7 +2050,7 @@
return ((AssociationRole) handle).getMessage();
}
if (handle instanceof Action) {
- return implementation.getUmlPackage().getCollaborations()
+ return modelImpl.getUmlPackage().getCollaborations()
.getAActionMessage().getMessage(((Action) handle));
}
} catch (InvalidObjectException e) {
@@ -2062,7 +2062,7 @@
public Collection getSuccessors(Object handle) {
try {
if (handle instanceof Message) {
- return implementation.getUmlPackage().getCollaborations()
+ return modelImpl.getUmlPackage().getCollaborations()
.getAPredecessorSuccessor().getSuccessor(
(Message) handle);
}
@@ -2075,7 +2075,7 @@
public Collection getActivatedMessages(Object handle) {
try {
if (handle instanceof Message) {
- return implementation.getUmlPackage().getCollaborations()
+ return modelImpl.getUmlPackage().getCollaborations()
.getAMessageActivator().getMessage((Message) handle);
}
} catch (InvalidObjectException e) {
@@ -2087,7 +2087,7 @@
public Collection getReceivedMessages(Object handle) {
try {
if (handle instanceof ClassifierRole) {
- return implementation.getUmlPackage().getCollaborations()
+ return modelImpl.getUmlPackage().getCollaborations()
.getAReceiverMessage().getMessage(
(ClassifierRole) handle);
}
@@ -2100,7 +2100,7 @@
public Collection getSentMessages(Object handle) {
try {
if (handle instanceof ClassifierRole) {
- return implementation.getUmlPackage().getCollaborations()
+ return modelImpl.getUmlPackage().getCollaborations()
.getAMessageSender()
.getMessage((ClassifierRole) handle);
}
@@ -2240,12 +2240,12 @@
public Collection getCollaborations(Object handle) {
try {
if (handle instanceof Operation) {
- return implementation.getUmlPackage().getCollaborations()
+ return modelImpl.getUmlPackage().getCollaborations()
.getARepresentedOperationCollaboration()
.getCollaboration((Operation) handle);
}
if (handle instanceof Classifier) {
- return implementation.getUmlPackage().getCollaborations()
+ return modelImpl.getUmlPackage().getCollaborations()
.getARepresentedClassifierCollaboration()
.getCollaboration((Classifier) handle);
}
@@ -2488,7 +2488,7 @@
public Collection getContexts(Object handle) {
try {
if (handle instanceof Signal) {
- return implementation.getUmlPackage().getCommonBehavior()
+ return modelImpl.getUmlPackage().getCommonBehavior()
.getAContextRaisedSignal().getContext((Signal) handle);
}
} catch (InvalidObjectException e) {
@@ -2501,7 +2501,7 @@
public Collection getCreateActions(Object handle) {
try {
if (handle instanceof Classifier) {
- return implementation.getUmlPackage().getCommonBehavior()
+ return modelImpl.getUmlPackage().getCommonBehavior()
.getACreateActionInstantiation().getCreateAction(
(Classifier) handle);
}
@@ -2599,7 +2599,7 @@
public Collection getLinks(Object handle) {
try {
if (handle instanceof UmlAssociation) {
- return implementation.getUmlPackage().getCommonBehavior()
+ return modelImpl.getUmlPackage().getCommonBehavior()
.getAAssociationLink().getLink((UmlAssociation) handle);
}
} catch (InvalidObjectException e) {
@@ -2612,7 +2612,7 @@
public Collection getLinkEnds(Object handle) {
try {
if (handle instanceof AssociationEnd) {
- return implementation.getUmlPackage().getCommonBehavior()
+ return modelImpl.getUmlPackage().getCommonBehavior()
.getAAssociationEndLinkEnd().getLinkEnd(
(AssociationEnd) handle);
}
@@ -2641,7 +2641,7 @@
public Collection getMethods(Object handle) {
try {
if (handle instanceof Operation) {
- return implementation.getUmlPackage().getCore()
+ return modelImpl.getUmlPackage().getCore()
.getASpecificationMethod()
.getMethod((Operation) handle);
}
@@ -2679,7 +2679,7 @@
public Collection getObjectFlowStates(Object handle) {
try {
if (handle instanceof Classifier) {
- return implementation.getUmlPackage().getActivityGraphs()
+ return modelImpl.getUmlPackage().getActivityGraphs()
.getATypeObjectFlowState().getObjectFlowState(
(Classifier) handle);
}
@@ -2708,7 +2708,7 @@
public Collection getOccurrences(Object handle) {
try {
if (handle instanceof Operation) {
- return implementation.getUmlPackage().getStateMachines()
+ return modelImpl.getUmlPackage().getStateMachines()
.getAOccurrenceOperation().getOccurrence(
(Operation) handle);
}
@@ -3008,7 +3008,7 @@
return ((ObjectFlowState) handle).getParameter();
}
if (handle instanceof Classifier) {
- return implementation.getUmlPackage().getCore()
+ return modelImpl.getUmlPackage().getCore()
.getATypedParameterType().getTypedParameter(
(Classifier) handle);
}
@@ -3049,7 +3049,7 @@
public Collection getRaisedSignals(Object handle) {
try {
if (handle instanceof BehavioralFeature) {
- return implementation.getUmlPackage().getCommonBehavior()
+ return modelImpl.getUmlPackage().getCommonBehavior()
.getAContextRaisedSignal().getRaisedSignal(
(BehavioralFeature) handle);
}
@@ -3063,7 +3063,7 @@
public Collection getReceptions(Object handle) {
try {
if (handle instanceof Signal) {
- return implementation.getUmlPackage().getCommonBehavior()
+ return modelImpl.getUmlPackage().getCommonBehavior()
.getASignalReception().getReception((Signal) handle);
}
} catch (InvalidObjectException e) {
@@ -3244,7 +3244,7 @@
return illegalArgumentCollection(handle);
}
try {
- return implementation.getUmlPackage().getCore()
+ return modelImpl.getUmlPackage().getCore()
.getAParentSpecialization().getSpecialization(
(GeneralizableElement) handle);
} catch (InvalidObjectException e) {
@@ -3271,7 +3271,7 @@
public Object getState(Object handle) {
try {
if (handle instanceof Transition) {
- return implementation.getUmlPackage().getStateMachines()
+ return modelImpl.getUmlPackage().getStateMachines()
.getAStateInternalTransition().getState(
(Transition) handle);
}
@@ -3285,7 +3285,7 @@
public Collection getStates(Object handle) {
try {
if (handle instanceof Event) {
- return implementation.getUmlPackage().getStateMachines()
+ return modelImpl.getUmlPackage().getStateMachines()
.getAStateDeferrableEvent().getState((Event) handle);
}
return illegalArgumentCollection(handle);
@@ -3310,12 +3310,12 @@
public Collection getStimuli(Object handle) {
try {
if (isALink(handle)) {
- return implementation.getUmlPackage().getCommonBehavior()
+ return modelImpl.getUmlPackage().getCommonBehavior()
.getAStimulusCommunicationLink().getStimulus(
(Link) handle);
}
if (isAAction(handle)) {
- return implementation.getUmlPackage().getCommonBehavior()
+ return modelImpl.getUmlPackage().getCommonBehavior()
.getADispatchActionStimulus().getStimulus(
(Action) handle);
}
@@ -3328,7 +3328,7 @@
public Collection getReceivedStimuli(Object handle) {
try {
if (handle instanceof Instance) {
- return implementation.getUmlPackage().getCommonBehavior()
+ return modelImpl.getUmlPackage().getCommonBehavior()
.getAReceiverStimulus().getStimulus((Instance) handle);
}
return illegalArgumentCollection(handle);
@@ -3341,7 +3341,7 @@
public Collection getSentStimuli(Object handle) {
try {
if (handle instanceof Instance) {
- return implementation.getUmlPackage().getCommonBehavior()
+ return modelImpl.getUmlPackage().getCommonBehavior()
.getAStimulusSender().getStimulus((Instance) handle);
}
return illegalArgumentCollection(handle);
@@ -3390,7 +3390,7 @@
public Collection getSupplierDependencies(Object handle) {
try {
if (handle instanceof ModelElement) {
- return implementation.getUmlPackage().getCore()
+ return modelImpl.getUmlPackage().getCore()
.getASupplierSupplierDependency()
.getSupplierDependency((ModelElement) handle);
}
@@ -3419,7 +3419,7 @@
return ((Guard) handle).getTransition();
}
if (handle instanceof Action) {
- return implementation.getUmlPackage().getStateMachines()
+ return modelImpl.getUmlPackage().getStateMachines()
.getATransitionEffect().getTransition((Action) handle);
}
} catch (InvalidObjectException e) {
@@ -3475,7 +3475,7 @@
public Collection getTypedValues(Object handle) {
try {
if (handle instanceof TagDefinition) {
- return implementation.getUmlPackage().getCore()
+ return modelImpl.getUmlPackage().getCore()
.getATypeTypedValue().getTypedValue(
(TagDefinition) handle);
}
@@ -3600,7 +3600,7 @@
} else if (isACompositeState(handle)) {
return ((CompositeState) handle).getInternalTransition();
} else if (isAEvent(handle)) {
- return implementation.getUmlPackage().getStateMachines()
+ return modelImpl.getUmlPackage().getStateMachines()
.getATransitionTrigger().getTransition((Event) handle);
}
return illegalArgumentCollection(handle);
@@ -3660,7 +3660,7 @@
return ((AssociationEnd) handle).getSpecification();
}
if (handle instanceof Classifier) {
- return implementation.getCoreHelper().getRealizedInterfaces(
+ return modelImpl.getCoreHelper().getRealizedInterfaces(
handle);
}
return illegalArgumentCollection(handle);
@@ -3688,7 +3688,7 @@
public Object getAction(Object handle) {
try {
if (handle instanceof Message) {
- return implementation.getUmlPackage().getCollaborations()
+ return modelImpl.getUmlPackage().getCollaborations()
.getAActionMessage().getAction((Message) handle);
}
if (handle instanceof Argument) {
@@ -3856,7 +3856,7 @@
return me.getName();
}
if (handle instanceof Multiplicity) {
- return implementation.getDataTypesHelper()
+ return modelImpl.getDataTypesHelper()
.multiplicityToString(handle);
}
} catch (InvalidObjectException e) {
@@ -4120,7 +4120,7 @@
if (base instanceof RefBaseObject) {
String mofId = ((RefBaseObject) base).refMofId();
// Look for an existing reference matching our MofID
- XmiReference ref = ((XmiReference) implementation
+ XmiReference ref = ((XmiReference) modelImpl
.getObjectToId().get(mofId));
if (ref == null) {
return mofId;
@@ -4270,7 +4270,7 @@
return illegalArgumentString(handle);
}
try {
- return implementation.getMetaTypes().getName(handle);
+ return modelImpl.getMetaTypes().getName(handle);
} catch (InvalidObjectException e) {
throw new InvalidElementException(e);
}
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/KindsMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/KindsMDRImpl.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/KindsMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/KindsMDRImpl.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/KindsMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/KindsMDRImpl.java 2007-05-30 23:47:02-0700
@@ -50,7 +50,7 @@
PseudostateKind, ScopeKind, ConcurrencyKind, DirectionKind,
OrderingKind, VisibilityKind {
- private MDRModelImplementation modelImplementation;
+ private MDRModelImplementation modelImpl;
/**
* Constructor.
@@ -58,7 +58,7 @@
* @param mi The MDRModelImplementation.
*/
KindsMDRImpl(MDRModelImplementation mi) {
- modelImplementation = mi;
+ modelImpl = mi;
}
/*
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/ModelEventPumpMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/ModelEventPumpMDRImpl.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/ModelEventPumpMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/ModelEventPumpMDRImpl.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/ModelEventPumpMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/ModelEventPumpMDRImpl.java 2007-05-30 23:47:02-0700
@@ -86,7 +86,7 @@
private static final Logger LOG =
Logger.getLogger(ModelEventPumpMDRImpl.class);
- private MDRModelImplementation modelImplementation;
+ private MDRModelImplementation modelImpl;
private Object lock = new Byte[0];
@@ -127,9 +127,9 @@
public ModelEventPumpMDRImpl(MDRModelImplementation implementation,
MDRepository repo) {
super();
- modelImplementation = implementation;
+ modelImpl = implementation;
repository = repo;
- subtypeMap = buildTypeMap(modelImplementation.getModelPackage());
+ subtypeMap = buildTypeMap(modelImpl.getModelPackage());
}
/*
@@ -398,9 +398,9 @@
if (LOG.isDebugEnabled()) {
LOG.debug("Firing "
- + modelImplementation.getMetaTypes().getName(event)
+ + modelImpl.getMetaTypes().getName(event)
+ " source "
- + modelImplementation.getMetaTypes().getName(
+ + modelImpl.getMetaTypes().getName(
event.getSource())
+ " [" + ((MDRObject) event.getSource()).refMofId()
+ "]." + event.getPropertyName()
@@ -424,9 +424,9 @@
// OR the logging for every event which is fired - not both
if (false/*LOG.isDebugEnabled()*/) {
LOG.debug("No listener for "
- + modelImplementation.getMetaTypes().getName(event)
+ + modelImpl.getMetaTypes().getName(event)
+ " source "
- + modelImplementation.getMetaTypes().getName(
+ + modelImpl.getMetaTypes().getName(
event.getSource())
+ " ["
+ ((MDRObject) event.getSource()).refMofId() + "]."
@@ -509,7 +509,7 @@
String className = getClassName(modelClass);
if (LOG.isDebugEnabled()) {
LOG.debug("Register class ["
- + modelImplementation.getMetaTypes().getName(modelClass)
+ + modelImpl.getMetaTypes().getName(modelClass)
+ "properties:" + formatArray(propertyNames)
+ ", listener:" + listener + "]");
}
@@ -558,7 +558,7 @@
}
private String getClassName(Object elementOrClass) {
- return modelImplementation.getMetaTypes().getName(elementOrClass);
+ return modelImpl.getMetaTypes().getName(elementOrClass);
}
/*
@@ -775,13 +775,13 @@
private String formatElement(Object element) {
try {
if (element instanceof MDRObject) {
- return modelImplementation.getMetaTypes().getName(element)
+ return modelImpl.getMetaTypes().getName(element)
+ "<" + ((MDRObject) element).refMofId() + ">";
} else if (element != null) {
return element.toString();
}
} catch (InvalidObjectException e) {
- return modelImplementation.getMetaTypes().getName(element)
+ return modelImpl.getMetaTypes().getName(element)
+ "<deleted>";
}
return null;
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java 2007-05-30 23:47:02-0700
@@ -66,7 +66,7 @@
/**
* The model implementation.
*/
- private ModelImplementation nsmodel;
+ private ModelImplementation modelImpl;
/**
* Constructor.
@@ -76,7 +76,7 @@
*/
public ModelManagementFactoryMDRImpl(MDRModelImplementation mi) {
modelManagementPackage = mi.getUmlPackage().getModelManagement();
- nsmodel = mi;
+ modelImpl = mi;
}
/*
@@ -192,7 +192,7 @@
* The target package.
*/
private void doCopyPackage(UmlPackage source, UmlPackage target) {
- ((CoreFactoryMDRImpl) nsmodel.getCoreFactory())
+ ((CoreFactoryMDRImpl) modelImpl.getCoreFactory())
.doCopyNamespace(source, target);
}
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java 2007-05-30 23:47:02-0700
@@ -67,7 +67,7 @@
/**
* The model implementation.
*/
- private MDRModelImplementation nsmodel;
+ private MDRModelImplementation modelImpl;
/**
* Don't allow instantiation.
@@ -76,7 +76,7 @@
* To get other helpers and factories.
*/
ModelManagementHelperMDRImpl(MDRModelImplementation implementation) {
- nsmodel = implementation;
+ modelImpl = implementation;
}
/*
@@ -194,7 +194,7 @@
Collection allOfType = Collections.EMPTY_LIST;
// Get all (UML) metaclasses and search for the requested one
- Collection metaTypes = nsmodel.getModelPackage().getMofClass()
+ Collection metaTypes = modelImpl.getModelPackage().getMofClass()
.refAllOfClass();
for (Iterator it = metaTypes.iterator(); it.hasNext();) {
MofClass elem = (MofClass) it.next();
@@ -204,7 +204,7 @@
List names = elem.getQualifiedName();
// TODO: Generalize to handle more than one level of package
// OK for UML 1.4 because of clustering
- RefPackage pkg = nsmodel.getUmlPackage().refPackage(
+ RefPackage pkg = modelImpl.getUmlPackage().refPackage(
(String) names.get(0));
// Get the metatype proxy and use it to find all instances
RefClass classProxy = pkg.refClass((String) names.get(1));
@@ -234,7 +234,7 @@
while (current != null) {
if (container.equals(current))
return true;
- current = nsmodel.getFacade().getModelElementContainer(current);
+ current = modelImpl.getFacade().getModelElementContainer(current);
}
return false;
}
@@ -293,11 +293,11 @@
ArrayList features = new ArrayList();
try {
Collection classifiers = getAllModelElementsOfKind(ns,
- nsmodel.getMetaTypes().getClassifier());
+ modelImpl.getMetaTypes().getClassifier());
Iterator i = classifiers.iterator();
// Get Features owned by those Classifiers
while (i.hasNext()) {
- features.addAll(nsmodel.getFacade().getFeatures(i.next()));
+ features.addAll(modelImpl.getFacade().getFeatures(i.next()));
}
} catch (InvalidObjectException e) {
throw new InvalidElementException(e);
@@ -321,20 +321,20 @@
// TODO: Fully implement this!
Object container = pack;
- Object cc = nsmodel.getFacade().getModelElementContainer(pack);
+ Object cc = modelImpl.getFacade().getModelElementContainer(pack);
while (cc != null) {
container = cc;
- cc = nsmodel.getFacade().getModelElementContainer(cc);
+ cc = modelImpl.getFacade().getModelElementContainer(cc);
}
Collection mes = getAllModelElementsOfKind(container,
- nsmodel.getMetaTypes().getModelElement());
+ modelImpl.getMetaTypes().getModelElement());
Collection vmes = new ArrayList();
Iterator i = mes.iterator();
while (i.hasNext()) {
Object me = i.next();
- if (nsmodel.getCoreHelper().isValidNamespace(me, pack)) {
+ if (modelImpl.getCoreHelper().isValidNamespace(me, pack)) {
vmes.add(me);
}
}
@@ -386,8 +386,8 @@
return new Vector();
}
- path = getPath(nsmodel.getFacade().getModelElementContainer(element));
- path.add(nsmodel.getFacade().getName(element));
+ path = getPath(modelImpl.getFacade().getModelElementContainer(element));
+ path.add(modelImpl.getFacade().getName(element));
return path;
}
@@ -415,7 +415,7 @@
}
// Trivial case
- if (nsmodel.getFacade().getModel(elem) == model) {
+ if (modelImpl.getFacade().getModel(elem) == model) {
return elem;
}
@@ -445,7 +445,7 @@
return null;
}
- return nsmodel.getCopyHelper().copy(elem, ns);
+ return modelImpl.getCopyHelper().copy(elem, ns);
}
/**
@@ -501,10 +501,10 @@
private List getOwnerShipPath(Object elem) {
if (elem instanceof ModelElement) {
List ownershipPath = new ArrayList();
- Object parent = nsmodel.getFacade().getModelElementContainer(elem);
+ Object parent = modelImpl.getFacade().getModelElementContainer(elem);
while (parent != null) {
ownershipPath.add(parent);
- parent = nsmodel.getFacade().getModelElementContainer(parent);
+ parent = modelImpl.getFacade().getModelElementContainer(parent);
}
return ownershipPath;
}
@@ -560,7 +560,7 @@
i = toAdd.iterator();
while (i.hasNext()) {
ModelElement me = (ModelElement) i.next();
- toAddEIs.add(nsmodel.getModelManagementFactory()
+ toAddEIs.add(modelImpl.getModelManagementFactory()
.buildElementImport(pack, me));
}
eis.addAll(toAddEIs);
@@ -610,33 +610,33 @@
* This part (1) is about drawing an <<import>> permission
* between packages.
* The part (2) below is about ModelManagement.ElementImport. */
- Collection deps = nsmodel.getFacade().getClientDependencies(pack);
+ Collection deps = modelImpl.getFacade().getClientDependencies(pack);
Iterator i = deps.iterator();
while (i.hasNext()) {
Object dep = i.next();
if (dep instanceof Permission) {
- if (nsmodel.getExtensionMechanismsHelper()
+ if (modelImpl.getExtensionMechanismsHelper()
.hasStereoType(dep, FRIEND_STEREOTYPE)) {
- Collection mes = nsmodel.getFacade().getSuppliers(dep);
+ Collection mes = modelImpl.getFacade().getSuppliers(dep);
Iterator mei = mes.iterator();
while (mei.hasNext()) {
Object o = mei.next();
- if (nsmodel.getFacade().isANamespace(o)) {
+ if (modelImpl.getFacade().isANamespace(o)) {
Collection v =
- nsmodel.getFacade().getOwnedElements(o);
+ modelImpl.getFacade().getOwnedElements(o);
c.addAll(v);
}
}
- } else if (nsmodel.getExtensionMechanismsHelper()
+ } else if (modelImpl.getExtensionMechanismsHelper()
.hasStereoType(dep, IMPORT_STEREOTYPE)
- || nsmodel.getExtensionMechanismsHelper()
+ || modelImpl.getExtensionMechanismsHelper()
.hasStereoType(dep, ACCESS_STEREOTYPE)) {
- Collection mes = nsmodel.getFacade().getSuppliers(dep);
+ Collection mes = modelImpl.getFacade().getSuppliers(dep);
Iterator mei = mes.iterator();
while (mei.hasNext()) {
Object o = mei.next();
- if (nsmodel.getFacade().isANamespace(o)) {
- Collection v = nsmodel.getCoreHelper()
+ if (modelImpl.getFacade().isANamespace(o)) {
+ Collection v = modelImpl.getCoreHelper()
.getAllVisibleElements(o);
c.addAll(v);
}
@@ -645,7 +645,7 @@
}
}
/* TODO: This is the 2nd part of this method: */
- Collection imports = nsmodel.getFacade().getImportedElements(pack);
+ Collection imports = modelImpl.getFacade().getImportedElements(pack);
c.addAll(imports);
} catch (InvalidObjectException e) {
throw new InvalidElementException(e);
@@ -708,7 +708,7 @@
results.add(element);
}
}
- it = nsmodel.getFacade().getGeneralizations(pack).iterator();
+ it = modelImpl.getFacade().getGeneralizations(pack).iterator();
while (it.hasNext()) {
results.addAll(getAllContents(it.next()));
}
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java 2007-05-30 23:47:02-0700
@@ -79,7 +79,7 @@
/**
* The model implementation.
*/
- private MDRModelImplementation nsmodel;
+ private MDRModelImplementation modelImpl;
/**
* The State Machine Package proxy
@@ -93,8 +93,8 @@
* To get other helpers and factories.
*/
StateMachinesFactoryMDRImpl(MDRModelImplementation implementation) {
- nsmodel = implementation;
- smPackage = nsmodel.getUmlPackage().getStateMachines();
+ modelImpl = implementation;
+ smPackage = modelImpl.getUmlPackage().getStateMachines();
}
@@ -249,7 +249,7 @@
*/
public Object buildStateMachine(Object oContext) {
if (oContext != null
- && (nsmodel.getStateMachinesHelper().
+ && (modelImpl.getStateMachinesHelper().
isAddingStatemachineAllowed(oContext))) {
StateMachine machine = (StateMachine) createStateMachine();
@@ -417,7 +417,7 @@
Transition trans = (Transition) createTransition();
trans.setSource((StateVertex) source);
trans.setTarget((StateVertex) target);
- trans.setStateMachine((StateMachine) nsmodel.
+ trans.setStateMachine((StateMachine) modelImpl.
getStateMachinesHelper().getStateMachine(source));
return trans;
}
@@ -447,7 +447,7 @@
String operationName = (name.indexOf("(") > 0) ? name.substring(0,
name.indexOf("(")).trim() : name.trim();
evt.setName(operationName);
- Object op = nsmodel.getStateMachinesHelper().findOperationByName(trans,
+ Object op = modelImpl.getStateMachinesHelper().findOperationByName(trans,
operationName);
if (op != null) {
evt.setOperation((Operation) op);
@@ -492,7 +492,7 @@
TimeEvent event = (TimeEvent) createTimeEvent();
event.setNamespace((Namespace) ns);
event.setName("");
- Object te = nsmodel.getDataTypesFactory().createTimeExpression("", s);
+ Object te = modelImpl.getDataTypesFactory().createTimeExpression("", s);
event.setWhen((TimeExpression) te);
return event;
}
@@ -514,7 +514,7 @@
ChangeEvent event = (ChangeEvent) createChangeEvent();
event.setNamespace((Namespace) ns);
event.setName("");
- Object ce = nsmodel.getDataTypesFactory()
+ Object ce = modelImpl.getDataTypesFactory()
.createBooleanExpression("", s);
event.setChangeExpression((BooleanExpression) ce);
return event;
@@ -572,7 +572,7 @@
Iterator it = vertices.iterator();
while (it.hasNext()) {
StateVertex vertex = (StateVertex) it.next();
- nsmodel.getUmlFactory().delete(vertex);
+ modelImpl.getUmlFactory().delete(vertex);
}
}
@@ -652,10 +652,10 @@
// associated by composition
State top = (State) Model.getFacade().getTop(elem);
if (top != null) {
- nsmodel.getUmlFactory().delete(top);
+ modelImpl.getUmlFactory().delete(top);
}
- nsmodel.getUmlHelper().deleteCollection(
+ modelImpl.getUmlHelper().deleteCollection(
((StateMachine) elem).getSubmachineState());
}
@@ -671,9 +671,9 @@
throw new IllegalArgumentException();
}
- nsmodel.getUmlHelper().deleteCollection(
+ modelImpl.getUmlHelper().deleteCollection(
((StateVertex) elem).getIncoming());
- nsmodel.getUmlHelper().deleteCollection(
+ modelImpl.getUmlHelper().deleteCollection(
((StateVertex) elem).getOutgoing());
}
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java 2007-05-30 23:47:02-0700
@@ -65,7 +65,7 @@
*/
class StateMachinesHelperMDRImpl implements StateMachinesHelper {
- private MDRModelImplementation implementation;
+ private MDRModelImplementation modelImpl;
/**
* Constructor.
@@ -74,7 +74,7 @@
*/
public StateMachinesHelperMDRImpl(MDRModelImplementation impl) {
super();
- this.implementation = impl;
+ this.modelImpl = impl;
}
/*
@@ -117,13 +117,13 @@
}
try {
Object container =
- implementation.getFacade().getModelElementContainer(handle);
+ modelImpl.getFacade().getModelElementContainer(handle);
while (container != null) {
if (Model.getFacade().isAStateMachine(container)) {
return container;
}
container =
- implementation.getFacade()
+ modelImpl.getFacade()
.getModelElementContainer(container);
}
/* In this case, either the container was not set,
@@ -347,7 +347,7 @@
public void addSubvertex(Object handle, Object subvertex) {
if (handle instanceof CompositeState
&& subvertex instanceof StateVertex) {
- implementation.getUmlPackage().getStateMachines().
+ modelImpl.getUmlPackage().getStateMachines().
getAContainerSubvertex().add((CompositeState) handle,
(StateVertex) subvertex);
return;
@@ -769,7 +769,7 @@
*/
public void addDeferrableEvent(Object state, Object deferrableEvent) {
if (state instanceof State && deferrableEvent instanceof Event) {
- implementation.getUmlPackage().getStateMachines()
+ modelImpl.getUmlPackage().getStateMachines()
.getAStateDeferrableEvent().add((State) state,
(Event) deferrableEvent);
return;
@@ -783,7 +783,7 @@
public void removeDeferrableEvent(Object state, Object deferrableEvent) {
try {
if (state instanceof State && deferrableEvent instanceof Event) {
- implementation.getUmlPackage().getStateMachines()
+ modelImpl.getUmlPackage().getStateMachines()
.getAStateDeferrableEvent().remove((State) state,
(Event) deferrableEvent);
return;
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java 2007-05-30 23:47:02-0700
@@ -161,7 +161,7 @@
/**
* The model implementation.
*/
- private MDRModelImplementation nsmodel;
+ private MDRModelImplementation modelImpl;
/**
* The meta types factory.
@@ -253,8 +253,8 @@
* To get other helpers and factories.
*/
UmlFactoryMDRImpl(MDRModelImplementation implementation) {
- nsmodel = implementation;
- metaTypes = nsmodel.getMetaTypes();
+ modelImpl = implementation;
+ metaTypes = modelImpl.getMetaTypes();
buildValidConnectionMap();
}
@@ -421,7 +421,7 @@
} else if (elementType == metaTypes.getState()) {
throw new IllegalArgumentException(
"Attempt to instantiate abstract type");
- } else if (elementType == nsmodel.getMetaTypes().getSimpleState()) {
+ } else if (elementType == modelImpl.getMetaTypes().getSimpleState()) {
return getStateMachines().createSimpleState();
} else if (elementType == metaTypes.getClassifierRole()) {
return getCollaborations().createClassifierRole();
@@ -540,7 +540,7 @@
* @return the ExtensionMechanisms factory instance.
*/
private ExtensionMechanismsFactoryMDRImpl getExtensionMechanisms() {
- return (ExtensionMechanismsFactoryMDRImpl) nsmodel.
+ return (ExtensionMechanismsFactoryMDRImpl) modelImpl.
getExtensionMechanismsFactory();
}
@@ -550,7 +550,7 @@
* @return the Core factory instance.
*/
private CoreFactoryMDRImpl getCore() {
- return (CoreFactoryMDRImpl) nsmodel.getCoreFactory();
+ return (CoreFactoryMDRImpl) modelImpl.getCoreFactory();
}
/**
@@ -560,7 +560,7 @@
* @return the CommonBehavior factory instance.
*/
private CommonBehaviorFactoryMDRImpl getCommonBehavior() {
- return (CommonBehaviorFactoryMDRImpl) nsmodel.
+ return (CommonBehaviorFactoryMDRImpl) modelImpl.
getCommonBehaviorFactory();
}
@@ -571,7 +571,7 @@
* @return the UseCases factory instance.
*/
private UseCasesFactoryMDRImpl getUseCases() {
- return (UseCasesFactoryMDRImpl) nsmodel.getUseCasesFactory();
+ return (UseCasesFactoryMDRImpl) modelImpl.getUseCasesFactory();
}
/**
@@ -581,7 +581,7 @@
* @return the StateMachines factory instance.
*/
private StateMachinesFactoryMDRImpl getStateMachines() {
- return (StateMachinesFactoryMDRImpl) nsmodel.getStateMachinesFactory();
+ return (StateMachinesFactoryMDRImpl) modelImpl.getStateMachinesFactory();
}
/**
@@ -591,7 +591,7 @@
* @return the Collaborations factory instance.
*/
private CollaborationsFactoryMDRImpl getCollaborations() {
- return (CollaborationsFactoryMDRImpl) nsmodel.
+ return (CollaborationsFactoryMDRImpl) modelImpl.
getCollaborationsFactory();
}
@@ -602,7 +602,7 @@
* @return the ActivityGraphs factory instance.
*/
private ActivityGraphsFactoryMDRImpl getActivityGraphs() {
- return (ActivityGraphsFactoryMDRImpl) nsmodel.
+ return (ActivityGraphsFactoryMDRImpl) modelImpl.
getActivityGraphsFactory();
}
@@ -612,7 +612,7 @@
* @return the ModelManagement factory instance.
*/
private ModelManagementFactoryMDRImpl getModelManagement() {
- return (ModelManagementFactoryMDRImpl) nsmodel.
+ return (ModelManagementFactoryMDRImpl) modelImpl.
getModelManagementFactory();
}
@@ -679,7 +679,7 @@
// Begin a write transaction - we'll do a bunch of reads first
// to collect a set of elements to delete - then delete them all
- nsmodel.getRepository().beginTrans(true);
+ modelImpl.getRepository().beginTrans(true);
try {
// TODO: Encountering a deleted object during
// any part of this traversal will
@@ -792,7 +792,7 @@
LOG.error("Encountered deleted object during delete of " + elem);
} finally {
// Commit our transacation
- nsmodel.getRepository().endTrans();
+ modelImpl.getRepository().endTrans();
}
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/UmlHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/UmlHelperMDRImpl.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/UmlHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/UmlHelperMDRImpl.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/UmlHelperMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/UmlHelperMDRImpl.java 2007-05-30 23:47:02-0700
@@ -43,7 +43,7 @@
/**
* The model implementation.
*/
- private MDRModelImplementation nsmodel;
+ private MDRModelImplementation modelImpl;
/**
* Don't allow instantiation.
@@ -52,7 +52,7 @@
* To get other helpers and factories.
*/
UmlHelperMDRImpl(MDRModelImplementation implementation) {
- nsmodel = implementation;
+ modelImpl = implementation;
}
public void addListenersToModel(Object model) {
@@ -65,7 +65,7 @@
public void deleteCollection(Collection col) {
Iterator it = col.iterator();
while (it.hasNext()) {
- nsmodel.getUmlFactory().delete(it.next());
+ modelImpl.getUmlFactory().delete(it.next());
}
}
@@ -76,13 +76,13 @@
if (relationship instanceof Relationship) {
// handles all children of relationship including extend and
// include which are not members of core
- return nsmodel.getCoreHelper().getSource(relationship);
+ return modelImpl.getCoreHelper().getSource(relationship);
}
if (relationship instanceof Transition) {
- return nsmodel.getStateMachinesHelper().getSource(relationship);
+ return modelImpl.getStateMachinesHelper().getSource(relationship);
}
if (relationship instanceof AssociationEnd) {
- return nsmodel.getCoreHelper().getSource(relationship);
+ return modelImpl.getCoreHelper().getSource(relationship);
}
throw new IllegalArgumentException();
}
@@ -94,14 +94,14 @@
if (relationShip instanceof Relationship) {
// handles all children of relationship including extend and
// include which are not members of core
- return nsmodel.getCoreHelper().getDestination(relationShip);
+ return modelImpl.getCoreHelper().getDestination(relationShip);
}
if (relationShip instanceof Transition) {
- return nsmodel.getStateMachinesHelper().
+ return modelImpl.getStateMachinesHelper().
getDestination(relationShip);
}
if (relationShip instanceof AssociationEnd) {
- return nsmodel.getCoreHelper().getDestination(relationShip);
+ return modelImpl.getCoreHelper().getDestination(relationShip);
}
throw new IllegalArgumentException();
}
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java 2007-05-30 23:47:02-0700
@@ -51,7 +51,7 @@
/**
* The model implementation.
*/
- private MDRModelImplementation nsmodel;
+ private MDRModelImplementation modelImpl;
/**
* Don't allow instantiation.
@@ -60,14 +60,14 @@
* To get other helpers and factories.
*/
UseCasesFactoryMDRImpl(MDRModelImplementation implementation) {
- nsmodel = implementation;
+ modelImpl = implementation;
}
/*
* @see org.argouml.model.UseCasesFactory#createExtend()
*/
public Object createExtend() {
- Extend myExtend = nsmodel.getUmlPackage().getUseCases().getExtend().
+ Extend myExtend = modelImpl.getUmlPackage().getUseCases().getExtend().
createExtend();
super.initialize(myExtend);
return myExtend;
@@ -77,7 +77,7 @@
* @see org.argouml.model.UseCasesFactory#createExtensionPoint()
*/
public Object createExtensionPoint() {
- ExtensionPoint myExtensionPoint = nsmodel.getUmlPackage().
+ ExtensionPoint myExtensionPoint = modelImpl.getUmlPackage().
getUseCases().getExtensionPoint().createExtensionPoint();
super.initialize(myExtensionPoint);
return myExtensionPoint;
@@ -87,7 +87,7 @@
* @see org.argouml.model.UseCasesFactory#createActor()
*/
public Object createActor() {
- Actor myActor = nsmodel.getUmlPackage().getUseCases().getActor().
+ Actor myActor = modelImpl.getUmlPackage().getUseCases().getActor().
createActor();
super.initialize(myActor);
return myActor;
@@ -97,7 +97,7 @@
* @see org.argouml.model.UseCasesFactory#createInclude()
*/
public Object createInclude() {
- Include myInclude = nsmodel.getUmlPackage().getUseCases().getInclude().
+ Include myInclude = modelImpl.getUmlPackage().getUseCases().getInclude().
createInclude();
super.initialize(myInclude);
return myInclude;
@@ -107,7 +107,7 @@
* @see org.argouml.model.UseCasesFactory#createUseCase()
*/
public Object createUseCase() {
- UseCase myUseCase = nsmodel.getUmlPackage().getUseCases().getUseCase().
+ UseCase myUseCase = modelImpl.getUmlPackage().getUseCases().getUseCase().
createUseCase();
super.initialize(myUseCase);
return myUseCase;
@@ -118,7 +118,7 @@
* @see org.argouml.model.UseCasesFactory#createUseCaseInstance()
*/
public Object createUseCaseInstance() {
- UseCaseInstance myUseCaseInstance = nsmodel.getUmlPackage().
+ UseCaseInstance myUseCaseInstance = modelImpl.getUmlPackage().
getUseCases().getUseCaseInstance().createUseCaseInstance();
super.initialize(myUseCaseInstance);
return myUseCaseInstance;
@@ -257,7 +257,7 @@
throw new IllegalArgumentException();
}
- nsmodel.getUmlHelper().deleteCollection(
+ modelImpl.getUmlHelper().deleteCollection(
((Extend) elem).getExtensionPoint());
}
@@ -270,13 +270,13 @@
throw new IllegalArgumentException();
}
// Delete Extends which have this as their only ExtensionPoint
- Collection xtends = nsmodel.getUmlPackage().getUseCases()
+ Collection xtends = modelImpl.getUmlPackage().getUseCases()
.getAExtensionPointExtend().getExtend((ExtensionPoint) elem);
for (Iterator it = xtends.iterator(); it.hasNext(); ) {
Extend extend = (Extend) it.next();
Collection eps = extend.getExtensionPoint();
if (eps.size() == 1 && eps.contains(elem)) {
- nsmodel.getUmlFactory().delete(extend);
+ modelImpl.getUmlFactory().delete(extend);
}
}
}
@@ -302,15 +302,15 @@
}
UseCase useCase = ((UseCase) elem);
- nsmodel.getUmlHelper().deleteCollection(useCase.getExtend());
- nsmodel.getUmlHelper().deleteCollection(useCase.getInclude());
+ modelImpl.getUmlHelper().deleteCollection(useCase.getExtend());
+ modelImpl.getUmlHelper().deleteCollection(useCase.getInclude());
// delete Extends where this is the base
- nsmodel.getUmlHelper().deleteCollection(
- nsmodel.getUmlPackage().getUseCases().getABaseExtender()
+ modelImpl.getUmlHelper().deleteCollection(
+ modelImpl.getUmlPackage().getUseCases().getABaseExtender()
.getExtender(useCase));
// delete Includes where this is the addition
- nsmodel.getUmlHelper().deleteCollection(
- nsmodel.getUmlPackage().getUseCases().getAIncluderAddition()
+ modelImpl.getUmlHelper().deleteCollection(
+ modelImpl.getUmlPackage().getUseCases().getAIncluderAddition()
.getIncluder(useCase));
}
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesHelperMDRImpl.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesHelperMDRImpl.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesHelperMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesHelperMDRImpl.java 2007-05-30 23:47:02-0700
@@ -60,7 +60,7 @@
/**
* The model implementation.
*/
- private MDRModelImplementation nsmodel;
+ private MDRModelImplementation modelImpl;
/**
* Don't allow instantiation.
@@ -69,7 +69,7 @@
* To get other helpers and factories.
*/
UseCasesHelperMDRImpl(MDRModelImplementation implementation) {
- nsmodel = implementation;
+ modelImpl = implementation;
}
/*
@@ -245,7 +245,7 @@
UseCase uc = (UseCase) ausecase;
Set set = new HashSet();
try {
- set.addAll(nsmodel.getModelManagementHelper().
+ set.addAll(modelImpl.getModelManagementHelper().
getAllSurroundingNamespaces(uc));
Set set2 = new HashSet();
Iterator it = set.iterator();
@@ -290,7 +290,7 @@
removeExtend(point, theExtend);
}
ExtensionPoint point =
- (ExtensionPoint) nsmodel.
+ (ExtensionPoint) modelImpl.
getUseCasesFactory().buildExtensionPoint(base);
theExtend.setBase((UseCase) base);
addExtensionPoint(theExtend, point);
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java 2007-05-30 23:47:02-0700
@@ -63,7 +63,6 @@
import org.omg.uml.UmlPackage;
import org.omg.uml.foundation.core.ModelElement;
import org.omg.uml.modelmanagement.Model;
-import org.openide.ErrorManager;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLFilter;
@@ -82,7 +81,7 @@
*/
private static final Logger LOG = Logger.getLogger(XmiReaderImpl.class);
- private MDRModelImplementation parent;
+ private MDRModelImplementation modelImpl;
private XmiReferenceResolverImpl resolver;
@@ -123,7 +122,7 @@
public XmiReaderImpl(MDRModelImplementation parentModelImplementation,
RefPackage mp) {
- parent = parentModelImplementation;
+ modelImpl = parentModelImplementation;
modelPackage = mp;
}
@@ -168,7 +167,7 @@
config.setUnknownElementsIgnored(true);
resolver = new XmiReferenceResolverImpl(new RefPackage[] {extent},
- config, parent.getObjectToId());
+ config, modelImpl.getObjectToId());
config.setReferenceResolver(resolver);
XMIReader xmiReader =
@@ -205,7 +204,7 @@
ignoredElementCount = 0;
// Disable event delivery during model load
- parent.getModelEventPump().stopPumpingEvents();
+ modelImpl.getModelEventPump().stopPumpingEvents();
Collection startTopElements = getTopLevelElements();
int numElements = startTopElements.size();
@@ -284,7 +283,7 @@
}
} finally {
- parent.getModelEventPump().startPumpingEvents();
+ modelImpl.getModelEventPump().startPumpingEvents();
}
if (unknownElement) {
@@ -318,7 +317,7 @@
} else {
LOG.debug("Saving profile with MofID : "
+ model.refMofId());
- parent.setProfileModel(model);
+ modelImpl.setProfileModel(model);
}
}
@@ -364,7 +363,7 @@
*/
private Collection getTopLevelElements() {
Collection elements = new ArrayList();
- UmlPackage pkg = parent.getUmlPackage();
+ UmlPackage pkg = modelImpl.getUmlPackage();
for (Iterator it =
pkg.getCore().getElement().refAllOfType().iterator();
it.hasNext();) {
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java?view=diff&rev=12736&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java&r1=12735&r2=12736
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java 2007-05-30 23:47:02-0700
@@ -61,7 +61,7 @@
private Logger LOG = Logger.getLogger(XmiWriterMDRImpl.class);
- private MDRModelImplementation parent;
+ private MDRModelImplementation modelImpl;
private Object model;
@@ -108,12 +108,12 @@
if (theParent == null) {
throw new IllegalArgumentException("A parent must be provided");
}
- this.parent = theParent;
+ this.modelImpl = theParent;
this.model = theModel;
this.writer = theWriter;
config = new OutputConfig();
config.setEncoding(ENCODING);
- config.setReferenceProvider(new XmiReferenceProviderImpl(parent
+ config.setReferenceProvider(new XmiReferenceProviderImpl(modelImpl
.getObjectToId()));
config.setHeaderProvider(new XmiHeaderProviderImpl(version));
}
@@ -130,8 +130,8 @@
elements.add(model);
LOG.info("Saving model '" + ((Model) model).getName() + "'");
} else {
- RefObject profile = parent.getProfileModel();
- UmlPackage pkg = parent.getUmlPackage();
+ RefObject profile = modelImpl.getProfileModel();
+ UmlPackage pkg = modelImpl.getUmlPackage();
for (Iterator it = pkg.getCore().getElement().refAllOfType()
.iterator(); it.hasNext();) {
RefObject obj = (RefObject) it.next();
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.