svn commit: r12936 - trunk/src/model-mdr/src/org/argouml/model/mdr
[email protected] 30 Jun 2007 19:55:45 -0000
Newsgroups
gmane.comp.lang.uml.argouml.cvs
Message-ID
<[email protected] >
Author: tfmorris
Date: 2007-06-30 12:55:44-0700
New Revision: 12936
Modified:
trunk/src/model-mdr/src/org/argouml/model/mdr/ActivityGraphsFactoryMDRImpl.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/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/ModelManagementHelperMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java
Log:
Cleanup minor style warnings and Javadoc refs.
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=12936&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=12935&r2=12936
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/ActivityGraphsFactoryMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/ActivityGraphsFactoryMDRImpl.java 2007-06-30 12:55:44-0700
@@ -68,19 +68,15 @@
modelImpl = implementation;
}
- /*
- * @see org.argouml.model.ActivityGraphsFactory#createActionState()
- */
+
public Object createActionState() {
- ActionState myActionState = modelImpl.getUmlPackage().getActivityGraphs().
- getActionState().createActionState();
+ ActionState myActionState = modelImpl.getUmlPackage()
+ .getActivityGraphs().getActionState().createActionState();
super.initialize(myActionState);
return myActionState;
}
- /*
- * @see org.argouml.model.ActivityGraphsFactory#createActivityGraph()
- */
+
public Object createActivityGraph() {
ActivityGraph myActivityGraph = modelImpl.getUmlPackage().
getActivityGraphs().getActivityGraph().createActivityGraph();
@@ -88,9 +84,7 @@
return myActivityGraph;
}
- /*
- * @see org.argouml.model.ActivityGraphsFactory#createCallState()
- */
+
public Object createCallState() {
CallState myCallState = modelImpl.getUmlPackage().getActivityGraphs().
getCallState().createCallState();
@@ -98,9 +92,7 @@
return myCallState;
}
- /*
- * @see org.argouml.model.ActivityGraphsFactory#createClassifierInState()
- */
+
public Object createClassifierInState() {
ClassifierInState myClassifierInState = modelImpl.getUmlPackage().
getActivityGraphs().getClassifierInState().
@@ -109,9 +101,7 @@
return myClassifierInState;
}
- /*
- * @see org.argouml.model.ActivityGraphsFactory#createObjectFlowState()
- */
+
public Object createObjectFlowState() {
ObjectFlowState myObjectFlowState = modelImpl.getUmlPackage().
getActivityGraphs().getObjectFlowState().
@@ -120,9 +110,7 @@
return myObjectFlowState;
}
- /*
- * @see org.argouml.model.ActivityGraphsFactory#createPartition()
- */
+
public Object createPartition() {
Partition myPartition = modelImpl.getUmlPackage().getActivityGraphs().
getPartition().createPartition();
@@ -130,9 +118,7 @@
return myPartition;
}
- /*
- * @see org.argouml.model.ActivityGraphsFactory#createSubactivityState()
- */
+
public Object createSubactivityState() {
SubactivityState mySubactivityState = modelImpl.getUmlPackage().
getActivityGraphs().getSubactivityState().
@@ -141,9 +127,7 @@
return mySubactivityState;
}
- /*
- * @see org.argouml.model.ActivityGraphsFactory#buildActivityGraph(java.lang.Object)
- */
+
public Object buildActivityGraph(Object theContext) {
if (theContext instanceof ModelElement) {
ActivityGraph myActivityGraph = (ActivityGraph)
@@ -164,9 +148,7 @@
"Cannot create an ActivityGraph with context " + theContext);
}
- /*
- * @see org.argouml.model.ActivityGraphsFactory#buildObjectFlowState(java.lang.Object)
- */
+
public Object buildObjectFlowState(Object compositeState) {
if (!(compositeState instanceof CompositeState)) {
throw new IllegalArgumentException();
@@ -177,9 +159,7 @@
return state;
}
- /*
- * @see org.argouml.model.ActivityGraphsFactory#buildClassifierInState(java.lang.Object, java.util.Collection)
- */
+
public Object buildClassifierInState(Object classifier, Collection state) {
if (!(classifier instanceof Classifier)) {
throw new IllegalArgumentException();
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=12936&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=12935&r2=12936
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java 2007-06-30 12:55:44-0700
@@ -82,16 +82,14 @@
modelImpl = implementation;
}
- /*
- * @see org.argouml.model.CollaborationsHelper#getAllClassifierRoles(java.lang.Object)
- */
+
public Collection getAllClassifierRoles(Object ns) {
if (!(ns instanceof Namespace)) {
throw new IllegalArgumentException();
}
try {
- List list = new ArrayList();
+ List<Object> list = new ArrayList<Object>();
Iterator it = ((Namespace) ns).getOwnedElement().iterator();
while (it.hasNext()) {
Object o = it.next();
@@ -108,9 +106,7 @@
}
}
- /*
- * @see org.argouml.model.CollaborationsHelper#getAllPossibleAssociationRoles(java.lang.Object)
- */
+
public Collection getAllPossibleAssociationRoles(Object roleArg) {
if (!(roleArg instanceof ClassifierRole)) {
throw new IllegalArgumentException();
@@ -126,8 +122,8 @@
Set associations = new HashSet();
while (it.hasNext()) {
Classifier base = (Classifier) it.next();
- associations.addAll(modelImpl.getCoreHelper().getAssociations(
- base));
+ associations.addAll(
+ modelImpl.getCoreHelper().getAssociations(base));
}
return associations;
} catch (InvalidObjectException e) {
@@ -135,9 +131,7 @@
}
}
- /*
- * @see org.argouml.model.CollaborationsHelper#getClassifierRoles(java.lang.Object)
- */
+
public Collection getClassifierRoles(Object role) {
if (role == null) {
return new ArrayList();
@@ -175,10 +169,7 @@
return roles;
}
- /*
- * @see org.argouml.model.CollaborationsHelper#getAssociationRole(java.lang.Object,
- * java.lang.Object)
- */
+
public Object getAssociationRole(Object afrom, Object ato) {
if (afrom == null || ato == null) {
throw new IllegalArgumentException();
@@ -208,9 +199,7 @@
return null;
}
- /*
- * @see org.argouml.model.CollaborationsHelper#getAllPossibleActivators(java.lang.Object)
- */
+
public Collection getAllPossibleActivators(Object ames) {
Message mes = (Message) ames;
if (mes == null || mes.getInteraction() == null) {
@@ -237,10 +226,7 @@
}
}
- /*
- * @see org.argouml.model.CollaborationsHelper#hasAsActivator(java.lang.Object,
- * java.lang.Object)
- */
+
public boolean hasAsActivator(Object message, Object activator) {
if (!(message instanceof Message)) {
throw new IllegalArgumentException();
@@ -264,10 +250,7 @@
}
}
- /*
- * @see org.argouml.model.CollaborationsHelper#setActivator(java.lang.Object,
- * java.lang.Object)
- */
+
public void setActivator(Object ames, Object anactivator) {
if (ames == null) {
throw new IllegalArgumentException("message is null");
@@ -327,9 +310,7 @@
}
- /*
- * @see org.argouml.model.CollaborationsHelper#getAllPossiblePredecessors(java.lang.Object)
- */
+
public Collection getAllPossiblePredecessors(Object amessage) {
Message message = (Message) amessage;
if (message == null) {
@@ -374,7 +355,8 @@
|| modelImpl.getFacade().getName(role).equals("")) {
Collaboration collab = (Collaboration) role.getNamespace();
- ModelManagementHelper mmHelper = modelImpl.getModelManagementHelper();
+ ModelManagementHelper mmHelper =
+ modelImpl.getModelManagementHelper();
Collection roles = mmHelper.getAllModelElementsOfKind(collab,
ClassifierRole.class);
Iterator it = roles.iterator();
@@ -410,10 +392,7 @@
}
}
- /*
- * @see org.argouml.model.CollaborationsHelper#setBases(java.lang.Object,
- * java.util.Collection)
- */
+
public void setBases(Object role, Collection bases) {
if (role == null || bases == null) {
throw new IllegalArgumentException("In setBases: either the role "
@@ -422,9 +401,7 @@
CollectionHelper.update(((ClassifierRole) role).getBase(), bases);
}
- /*
- * @see org.argouml.model.CollaborationsHelper#allAvailableFeatures(java.lang.Object)
- */
+
public Collection allAvailableFeatures(Object arole) {
if (arole instanceof ClassifierRole) {
@@ -452,9 +429,7 @@
+ arole);
}
- /*
- * @see org.argouml.model.CollaborationsHelper#allAvailableContents(java.lang.Object)
- */
+
public Collection allAvailableContents(Object arole) {
try {
if (arole instanceof ClassifierRole) {
@@ -482,9 +457,7 @@
+ arole);
}
- /*
- * @see org.argouml.model.CollaborationsHelper#getAllPossibleBases(java.lang.Object)
- */
+
public Collection getAllPossibleBases(Object role) {
try {
if (role instanceof ClassifierRole) {
@@ -533,7 +506,8 @@
if (bases.isEmpty()) {
ModelManagementHelper mmh = modelImpl.getModelManagementHelper();
Namespace ns = ((Collaboration) role.getNamespace()).getNamespace();
- ret.addAll(mmh.getAllModelElementsOfKind(ns, UmlAssociation.class));
+ ret.addAll(
+ mmh.getAllModelElementsOfKind(ns, UmlAssociation.class));
ret.removeAll(mmh.getAllModelElementsOfKind(ns,
AssociationRole.class));
} else {
@@ -646,10 +620,7 @@
return out;
}
- /*
- * @see org.argouml.model.CollaborationsHelper#setBase( java.lang.Object,
- * java.lang.Object)
- */
+
public void setBase(Object arole, Object abase) {
if (arole == null) {
throw new IllegalArgumentException("role is null");
@@ -664,10 +635,10 @@
+ "this role");
}
role.setBase(base);
- ClassifierRole sender = (ClassifierRole) modelImpl.getCoreHelper().
- getSource(role);
- ClassifierRole receiver = (ClassifierRole) modelImpl.getCoreHelper().
- getDestination(role);
+ ClassifierRole sender = (ClassifierRole) modelImpl.getCoreHelper()
+ .getSource(role);
+ ClassifierRole receiver = (ClassifierRole) modelImpl
+ .getCoreHelper().getDestination(role);
Collection senderBases = sender.getBase();
Collection receiverBases = receiver.getBase();
@@ -702,19 +673,17 @@
throw new IllegalArgumentException("role");
}
- /*
- * @see org.argouml.model.CollaborationsHelper#isAddingCollaborationAllowed(java.lang.Object)
- */
+
public boolean isAddingCollaborationAllowed(Object context) {
- return (/* context instanceof Collaboration || */
- context instanceof Classifier || context instanceof Operation
- /* || context instanceof Model */);
+ return (
+ context instanceof Classifier
+ || context instanceof Operation
+ //|| context instanceof Collaboration
+ //|| context instanceof Model
+ );
}
- /*
- * @see org.argouml.model.CollaborationsHelper#removeBase(java.lang.Object,
- * java.lang.Object)
- */
+
public void removeBase(Object handle, Object c) {
try {
if (handle instanceof ClassifierRole && c instanceof Classifier) {
@@ -729,10 +698,7 @@
"There must be a ClassifierRole and a Classifier");
}
- /*
- * @see org.argouml.model.CollaborationsHelper#removeConstrainingElement(java.lang.Object,
- * java.lang.Object)
- */
+
public void removeConstrainingElement(Object handle, Object constraint) {
try {
if (handle instanceof Collaboration
@@ -749,10 +715,7 @@
+ " or constraint: " + constraint);
}
- /*
- * @see org.argouml.model.CollaborationsHelper#removeMessage(java.lang.Object,
- * java.lang.Object)
- */
+
public void removeMessage(Object handle, Object message) {
try {
if (handle instanceof Interaction && message instanceof Message) {
@@ -771,10 +734,7 @@
+ " or message: " + message);
}
- /*
- * @see org.argouml.model.CollaborationsHelper#removeSuccessor(java.lang.Object,
- * java.lang.Object)
- */
+
public void removeSuccessor(Object handle, Object mess) {
try {
if (handle instanceof Message && mess instanceof Message) {
@@ -790,10 +750,7 @@
+ " or successor: " + mess);
}
- /*
- * @see org.argouml.model.CollaborationsHelper#removePredecessor(java.lang.Object,
- * java.lang.Object)
- */
+
public void removePredecessor(Object handle, Object message) {
try {
if (handle instanceof Message && message instanceof Message) {
@@ -807,10 +764,7 @@
+ " or message: " + message);
}
- /*
- * @see org.argouml.model.CollaborationsHelper#addConstrainingElement(java.lang.Object,
- * java.lang.Object)
- */
+
public void addConstrainingElement(Object handle, Object constraint) {
if (handle instanceof Collaboration
&& constraint instanceof ModelElement) {
@@ -823,10 +777,7 @@
+ " or constraint: " + constraint);
}
- /*
- * @see org.argouml.model.CollaborationsHelper#addInstance(java.lang.Object,
- * java.lang.Object)
- */
+
public void addInstance(Object classifierRole, Object instance) {
if (classifierRole instanceof ClassifierRole
&& instance instanceof Instance) {
@@ -838,10 +789,6 @@
}
- /*
- * @see org.argouml.model.CollaborationsHelper#addMessage(java.lang.Object,
- * java.lang.Object)
- */
public void addMessage(Object handle, Object elem) {
if (handle instanceof Interaction && elem instanceof Message) {
((Interaction) handle).getMessage().add(elem);
@@ -857,10 +804,7 @@
+ elem);
}
- /*
- * @see org.argouml.model.CollaborationsHelper#addSuccessor(java.lang.Object,
- * java.lang.Object)
- */
+
public void addSuccessor(Object handle, Object mess) {
if (handle instanceof Message && mess instanceof Message) {
modelImpl.getUmlPackage().getCollaborations().
@@ -873,41 +817,29 @@
+ " or successor: " + mess);
}
- /*
- * @see org.argouml.model.CollaborationsHelper#addPredecessor(java.lang.Object,
- * java.lang.Object)
- */
+
public void addPredecessor(Object handle, Object predecessor) {
if (handle != null && handle instanceof Message && predecessor != null
&& predecessor instanceof Message) {
((Message) handle).getPredecessor().add(predecessor);
-
return;
}
-
throw new IllegalArgumentException("handle: " + handle
+ " or predecessor: " + predecessor);
}
- /*
- * @see org.argouml.model.CollaborationsHelper#setAction(java.lang.Object,
- * java.lang.Object)
- */
+
public void setAction(Object handle, Object action) {
if (handle instanceof Message
&& (action == null || action instanceof Action)) {
((Message) handle).setAction((Action) action);
return;
}
-
throw new IllegalArgumentException("handle: " + handle + " or action: "
+ action);
}
- /*
- * @see org.argouml.model.CollaborationsHelper#setContext(java.lang.Object,
- * java.lang.Object)
- */
+
public void setContext(Object handle, Object col) {
if (handle instanceof Interaction
&& (col instanceof Collaboration || col == null)) {
@@ -919,10 +851,7 @@
+ col);
}
- /*
- * @see org.argouml.model.CollaborationsHelper#setSuccessors(java.lang.Object,
- * java.util.Collection)
- */
+
public void setSuccessors(Object handle, Collection messages) {
if (handle instanceof Message) {
Collection currentMessages =
@@ -945,10 +874,7 @@
+ " or messages: " + messages);
}
- /*
- * @see org.argouml.model.CollaborationsHelper#setPredecessors(java.lang.Object,
- * java.util.Collection)
- */
+
public void setPredecessors(Object handle, Collection predecessors) {
if (handle instanceof Message) {
CollectionHelper.update(
@@ -959,10 +885,7 @@
+ " or predecessors: " + predecessors);
}
- /*
- * @see org.argouml.model.CollaborationsHelper#setRepresentedClassifier(java.lang.Object,
- * java.lang.Object)
- */
+
public void setRepresentedClassifier(Object handle, Object classifier) {
if (handle instanceof Collaboration
&& ((classifier == null) || classifier instanceof Classifier)) {
@@ -974,10 +897,7 @@
+ " or classifier: " + classifier);
}
- /*
- * @see org.argouml.model.CollaborationsHelper#setRepresentedOperation(java.lang.Object,
- * java.lang.Object)
- */
+
public void setRepresentedOperation(Object handle, Object operation) {
if (handle instanceof Collaboration
&& ((operation == null) || operation instanceof Operation)) {
@@ -990,10 +910,7 @@
+ " or operation: " + operation);
}
- /*
- * @see org.argouml.model.CollaborationsHelper#setSender(java.lang.Object,
- * java.lang.Object)
- */
+
public void setSender(Object handle, Object sender) {
if (handle instanceof Message
&& (sender instanceof ClassifierRole || sender == null)) {
@@ -1008,11 +925,7 @@
+ sender);
}
- /*
- *
- * @see org.argouml.model.CollaborationsHelper#removeInteraction(java.lang.Object,
- * java.lang.Object)
- */
+
public void removeInteraction(Object collab, Object interaction) {
try {
if (collab instanceof Collaboration
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=12936&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=12935&r2=12936
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/CommonBehaviorFactoryMDRImpl.java 2007-06-30 12:55:44-0700
@@ -457,8 +457,8 @@
(Action) elem));
// Delete Messages which have this as their action
modelImpl.getUmlHelper().deleteCollection(
- modelImpl.getUmlPackage().getCollaborations().getAActionMessage()
- .getMessage((Action) elem));
+ modelImpl.getUmlPackage().getCollaborations()
+ .getAActionMessage().getMessage((Action) elem));
}
/**
@@ -566,7 +566,8 @@
}
// Delete LinkEnds
- modelImpl.getUmlHelper().deleteCollection(((Instance) elem).getLinkEnd());
+ modelImpl.getUmlHelper().deleteCollection(
+ ((Instance) elem).getLinkEnd());
// Delete AttributeLinks where this is the value
modelImpl.getUmlHelper().deleteCollection(
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=12936&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=12935&r2=12936
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java 2007-06-30 12:55:44-0700
@@ -661,8 +661,8 @@
* Get a 1..1 multiplicity
*/
private Multiplicity getMultiplicity11() {
- return (Multiplicity) modelImpl.getDataTypesFactory().createMultiplicity(
- 1, 1);
+ return (Multiplicity) modelImpl.getDataTypesFactory()
+ .createMultiplicity(1, 1);
}
/*
@@ -763,8 +763,8 @@
// Force type element into given namespace if not already there
// side effect!
if (model != clsType.getNamespace()
- && !(modelImpl.getModelManagementHelper().getAllNamespaces(model).
- contains(clsType.getNamespace()))) {
+ && !(modelImpl.getModelManagementHelper().getAllNamespaces(
+ model).contains(clsType.getNamespace()))) {
clsType.setNamespace((Model) model);
}
return buildAttribute2(theType);
@@ -826,9 +826,7 @@
return attr;
}
- /*
- * @see org.argouml.model.CoreFactory#buildClass()
- */
+
public Object buildClass() {
UmlClass cl = (UmlClass) createClass();
cl.setName("");
@@ -841,9 +839,7 @@
return cl;
}
- /*
- * @see org.argouml.model.CoreFactory#buildClass(java.lang.Object)
- */
+
public Object buildClass(Object owner) {
Object clazz = buildClass();
if (owner instanceof Namespace) {
@@ -852,31 +848,24 @@
return clazz;
}
- /*
- * @see org.argouml.model.CoreFactory#buildClass(java.lang.String)
- */
+
public Object buildClass(String name) {
Object clazz = buildClass();
modelImpl.getCoreHelper().setName(clazz, name);
return clazz;
}
- /*
- * @see org.argouml.model.CoreFactory#buildClass(java.lang.String,
- * java.lang.Object)
- */
+
public Object buildClass(String name, Object owner) {
Object clazz = buildClass();
modelImpl.getCoreHelper().setName(clazz, name);
if (owner instanceof Namespace) {
- modelImpl.getCoreHelper().setNamespace(clazz, /* MNamespace */owner);
+ modelImpl.getCoreHelper().setNamespace(clazz, owner);
}
return clazz;
}
- /*
- * @see org.argouml.model.CoreFactory#buildInterface()
- */
+
public Object buildInterface() {
Interface cl = (Interface) createInterface();
cl.setName("");
@@ -888,9 +877,7 @@
return cl;
}
- /*
- * @see org.argouml.model.CoreFactory#buildInterface(java.lang.Object)
- */
+
public Object buildInterface(Object owner) {
Interface cl = (Interface) buildInterface();
if (owner instanceof Namespace) {
@@ -899,19 +886,14 @@
return cl;
}
- /*
- * @see org.argouml.model.CoreFactory#buildInterface(java.lang.String)
- */
+
public Object buildInterface(String name) {
Interface cl = (Interface) buildInterface();
cl.setName(name);
return cl;
}
- /*
- * @see org.argouml.model.CoreFactory#buildInterface(java.lang.String,
- * java.lang.Object)
- */
+
public Object buildInterface(String name, Object owner) {
Interface cl = (Interface) buildInterface();
cl.setName(name);
@@ -2199,8 +2181,9 @@
.getModel(targetME);
Iterator it = sourceME.getStereotype().iterator();
while (it.hasNext()) {
- Stereotype st = (Stereotype) modelImpl.getModelManagementHelper()
- .getCorrespondingElement(it.next(), targetModel, true);
+ Stereotype st = (Stereotype) modelImpl
+ .getModelManagementHelper().getCorrespondingElement(
+ it.next(), targetModel, true);
targetME.getStereotype().add(st);
}
}
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=12936&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=12935&r2=12936
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java 2007-06-30 12:55:44-0700
@@ -153,9 +153,7 @@
return stereo;
}
- /*
- * @see org.argouml.model.ExtensionMechanismsFactory#buildStereotype(java.lang.Object, java.lang.String, java.lang.Object, java.util.Collection)
- */
+
public Object buildStereotype(
Object theModelElementObject,
String theName,
@@ -198,9 +196,7 @@
return stereotype;
}
- /*
- * @see org.argouml.model.ExtensionMechanismsFactory#buildStereotype(java.lang.String, java.lang.Object)
- */
+
public Object buildStereotype(String text, Object ns) {
if (!(ns instanceof Namespace)) {
throw new IllegalArgumentException(
@@ -212,9 +208,7 @@
return stereo;
}
- /*
- * @see org.argouml.model.ExtensionMechanismsFactory#buildTaggedValue(java.lang.String, java.lang.String)
- */
+
public Object buildTaggedValue(String tag, String value) {
TaggedValue tv = (TaggedValue) createTaggedValue();
TagDefinition td = (TagDefinition) getTagDefinition(tag);
@@ -230,9 +224,7 @@
return tv;
}
- /*
- * @see org.argouml.model.ExtensionMechanismsFactory#copyTaggedValues(java.lang.Object, java.lang.Object)
- */
+
public void copyTaggedValues(Object source, Object target) {
if (!(source instanceof ModelElement)
|| !(target instanceof ModelElement)) {
@@ -302,9 +294,7 @@
.getTypedValue((TagDefinition) elem));
}
- /*
- * @see org.argouml.model.ExtensionMechanismsFactory#copyStereotype(java.lang.Object, java.lang.Object)
- */
+
public Object copyStereotype(Object source, Object ns) {
if (!(source instanceof Stereotype)) {
throw new IllegalArgumentException("source");
@@ -337,10 +327,7 @@
// TODO: required tags
}
- /*
- * @see org.argouml.model.ExtensionMechanismsFactory#buildTagDefinition(
- * java.lang.String, java.lang.Object, java.lang.Object)
- */
+
public Object buildTagDefinition(String text, Object owner, Object ns) {
if (owner != null) {
if (!(owner instanceof Stereotype)) {
@@ -367,19 +354,15 @@
return td;
}
- /*
- * @see org.argouml.model.ExtensionMechanismsFactory#createTagDefinition()
- */
+
public Object createTagDefinition() {
- TagDefinition td = modelImpl.getUmlPackage().getCore().getTagDefinition()
- .createTagDefinition();
+ TagDefinition td = modelImpl.getUmlPackage().getCore()
+ .getTagDefinition().createTagDefinition();
super.initialize(td);
return td;
}
- /*
- * @see org.argouml.model.ExtensionMechanismsFactory#createStereotype()
- */
+
public Object createStereotype() {
Stereotype st = modelImpl.getUmlPackage().getCore().getStereotype()
.createStereotype();
@@ -387,9 +370,7 @@
return st;
}
- /*
- * @see org.argouml.model.ExtensionMechanismsFactory#copyTagDefinition(java.lang.Object, java.lang.Object)
- */
+
public Object copyTagDefinition(Object anElement, Object aNs) {
if (!(anElement instanceof TagDefinition)) {
throw new IllegalArgumentException("source: " + anElement);
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=12936&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=12935&r2=12936
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java 2007-06-30 12:55:44-0700
@@ -92,10 +92,7 @@
packageMap.put("modelmanagement", "Model_Management");
}
-
- /*
- * @see org.argouml.model.ExtensionMechanismsHelper#getStereotypes(java.lang.Object)
- */
+
public Collection getStereotypes(Object ns) {
if (!(ns instanceof Namespace)) {
throw new IllegalArgumentException();
@@ -120,9 +117,6 @@
}
- /*
- * @see org.argouml.model.ExtensionMechanismsHelper#getStereotype(java.lang.Object, java.lang.Object)
- */
public Object getStereotype(Object ns, Object stereo) {
if (!(ns instanceof Namespace)) {
throw new IllegalArgumentException("namespace");
@@ -157,9 +151,6 @@
}
- /*
- * @see org.argouml.model.ExtensionMechanismsHelper#getStereotype(java.util.Collection, java.lang.Object)
- */
public Object getStereotype(Collection models, Object stereo) {
if (stereo == null) {
throw new IllegalArgumentException("null argument");
@@ -198,9 +189,7 @@
return null;
}
- /*
- * @see org.argouml.model.ExtensionMechanismsHelper#getMetaModelName(java.lang.Object)
- */
+
public String getMetaModelName(Object m) {
return getMetaModelName(m.getClass());
}
@@ -311,9 +300,6 @@
}
- /*
- * @see org.argouml.model.ExtensionMechanismsHelper#isValidStereoType(java.lang.Object, java.lang.Object)
- */
public boolean isValidStereoType(Object theModelElement,
Object theStereotype) {
if (theModelElement == null) {
@@ -323,9 +309,6 @@
}
- /*
- * @see org.argouml.model.ExtensionMechanismsHelper#getStereotypes(java.util.Collection)
- */
public Collection getStereotypes(Collection models) {
List ret = new ArrayList();
Iterator it = models.iterator();
@@ -347,9 +330,6 @@
}
- /*
- * @see org.argouml.model.ExtensionMechanismsHelper#addCopyStereotype(java.lang.Object, java.lang.Object)
- */
public void addCopyStereotype(Object modelElement, Object stereotype) {
if (stereotype != null) {
stereotype =
@@ -361,9 +341,7 @@
}
- /*
- * @see org.argouml.model.ExtensionMechanismsHelper#isStereotype(java.lang.Object, java.lang.String, java.lang.String)
- */
+
public boolean isStereotype(Object object, String name, String base) {
if (!(object instanceof Stereotype)) {
return false;
@@ -385,9 +363,7 @@
}
}
- /*
- * @see org.argouml.model.ExtensionMechanismsHelper#isStereotypeInh(java.lang.Object, java.lang.String, java.lang.String)
- */
+
public boolean isStereotypeInh(Object object, String name, String base) {
if (!(object instanceof Stereotype)) {
return false;
@@ -409,9 +385,7 @@
return false;
}
- /*
- * @see org.argouml.model.ExtensionMechanismsHelper#addExtendedElement(java.lang.Object, java.lang.Object)
- */
+
public void addExtendedElement(Object handle, Object extendedElement) {
if (handle instanceof Stereotype
&& extendedElement instanceof ModelElement) {
@@ -423,9 +397,6 @@
}
- /*
- * @see org.argouml.model.ExtensionMechanismsHelper#addBaseClass(java.lang.Object, java.lang.Object)
- */
public void addBaseClass(Object handle, Object baseClass) {
if (handle instanceof Stereotype) {
if (baseClass instanceof String) {
@@ -442,9 +413,7 @@
+ " or baseClass: " + baseClass);
}
- /*
- * @see org.argouml.model.ExtensionMechanismsHelper#removeBaseClass(java.lang.Object, java.lang.Object)
- */
+
public void removeBaseClass(Object handle, Object baseClass) {
try {
if (handle instanceof Stereotype) {
@@ -465,9 +434,7 @@
+ " or baseClass: " + baseClass);
}
- /*
- * @see org.argouml.model.ExtensionMechanismsHelper#setIcon(java.lang.Object, java.lang.Object)
- */
+
public void setIcon(Object handle, Object icon) {
if (handle instanceof Stereotype
&& (icon == null || icon instanceof String)) {
@@ -504,8 +471,8 @@
.getTagDefinition(tag.toString());
Object model = modelImpl.getFacade().getModel(handle);
if (!modelImpl.getFacade().isAModel(model)) {
- model =
- modelImpl.getModelManagementFactory().getRootModel();
+ model = modelImpl.getModelManagementFactory()
+ .getRootModel();
}
td =
(TagDefinition)
@@ -525,9 +492,6 @@
}
- /*
- * @see org.argouml.model.ExtensionMechanismsHelper#setValueOfTag(java.lang.Object, java.lang.String)
- */
public void setValueOfTag(Object handle, String value) {
if (handle instanceof TaggedValue) {
TaggedValue tv = (TaggedValue) handle;
@@ -543,9 +507,7 @@
}
}
- /*
- * @see org.argouml.model.ExtensionMechanismsHelper#addTaggedValue(java.lang.Object, java.lang.Object)
- */
+
public void addTaggedValue(Object handle, Object taggedValue) {
if (handle instanceof ModelElement
&& taggedValue instanceof TaggedValue) {
@@ -556,9 +518,7 @@
+ " or taggedValue: " + taggedValue);
}
- /*
- * @see org.argouml.model.ExtensionMechanismsHelper#removeTaggedValue(java.lang.Object, java.lang.Object)
- */
+
public void removeTaggedValue(Object handle, Object taggedValue) {
if (handle instanceof ModelElement
&& taggedValue instanceof TaggedValue) {
@@ -569,9 +529,7 @@
+ " or taggedValue: " + taggedValue);
}
- /*
- * @see org.argouml.model.ExtensionMechanismsHelper#setTaggedValue(java.lang.Object, java.util.Collection)
- */
+
public void setTaggedValue(Object handle, Collection taggedValues) {
if (handle instanceof ModelElement) {
Collection tv =
@@ -601,10 +559,7 @@
+ " or taggedValues: " + taggedValues);
}
- /*
- * @see org.argouml.model.ExtensionMechanismsHelper#setType(
- * java.lang.Object, java.lang.Object)
- */
+
public void setType(Object handle, Object type) {
if (type == null || type instanceof TagDefinition) {
if (handle instanceof TaggedValue) {
@@ -614,8 +569,8 @@
modelImpl.getModelManagementFactory().getRootModel();
}
type =
- modelImpl.getModelManagementHelper().getCorrespondingElement(
- type, model, true);
+ modelImpl.getModelManagementHelper()
+ .getCorrespondingElement(type, model, true);
((TaggedValue) handle).setType((TagDefinition) type);
return;
}
@@ -624,9 +579,7 @@
+ type);
}
- /*
- * @see org.argouml.model.ExtensionMechanismsHelper#hasStereoType(java.lang.Object, java.lang.String)
- */
+
public boolean hasStereoType(Object handle, String name) {
try {
Collection sts = modelImpl.getFacade().getStereotypes(handle);
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=12936&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=12935&r2=12936
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java 2007-06-30 12:55:44-0700
@@ -79,9 +79,7 @@
modelImpl = implementation;
}
- /*
- * @see org.argouml.model.ModelManagementHelper#getAllSubSystems(java.lang.Object)
- */
+
public Collection getAllSubSystems(Object ns) {
if (ns == null) {
return new ArrayList();
@@ -106,11 +104,8 @@
}
/*
- * @see org.argouml.model.ModelManagementHelper#getAllNamespaces(java.lang.Object)
- *
* This method is CPU intensive and therefore needs to be as efficient as
* possible.
- *
*/
public Collection getAllNamespaces(Object ns) {
@@ -149,9 +144,7 @@
return list;
}
- /*
- * @see org.argouml.model.ModelManagementHelper#getAllModelElementsOfKindWithModel(java.lang.Object, java.lang.Object)
- */
+
public Collection getAllModelElementsOfKindWithModel(Object model,
Object type) {
if (model == null) {
@@ -168,9 +161,7 @@
return ret;
}
- /*
- * @see org.argouml.model.ModelManagementHelper#getAllModelElementsOfKind(java.lang.Object, java.lang.Object)
- */
+
public Collection getAllModelElementsOfKind(Object nsa, Object type) {
if (nsa == null || type == null) {
return Collections.EMPTY_LIST;
@@ -239,10 +230,7 @@
return false;
}
- /*
- * @see org.argouml.model.ModelManagementHelper#getAllModelElementsOfKind(java.lang.Object,
- * java.lang.String)
- */
+
public Collection getAllModelElementsOfKind(Object nsa, String kind) {
if (nsa == null || kind == null) {
@@ -262,9 +250,7 @@
return col;
}
- /*
- * @see org.argouml.model.ModelManagementHelper#getAllSurroundingNamespaces(java.lang.Object)
- */
+
public Collection getAllSurroundingNamespaces(Object ns) {
if (!(ns instanceof Namespace)) {
throw new IllegalArgumentException();
@@ -280,8 +266,6 @@
}
/*
- * @see org.argouml.model.ModelManagementHelper#getAllBehavioralFeatures(java.lang.Object)
- *
* TODO: As currently coded, this actually returns all BehavioralFeatures
* which are owned by Classifiers contained in the given namespace, which
* is slightly different then what's documented. It will not include any
@@ -314,9 +298,7 @@
return behavioralfeatures;
}
- /*
- * @see org.argouml.model.ModelManagementHelper#getAllPossibleImports(java.lang.Object)
- */
+
public Collection getAllPossibleImports(Object pack) {
// TODO: Fully implement this!
@@ -342,9 +324,7 @@
return vmes;
}
- /*
- * @see org.argouml.model.ModelManagementHelper#getElement(java.util.Vector, java.lang.Object)
- */
+
public Object getElement(Vector path, Object theRootNamespace) {
ModelElement root = (ModelElement) theRootNamespace;
Object name;
@@ -374,9 +354,7 @@
return root;
}
- /*
- * @see org.argouml.model.ModelManagementHelper#getPath(java.lang.Object)
- */
+
public Vector getPath(Object element) {
Vector path;
@@ -392,17 +370,12 @@
return path;
}
-
- /*
- * @see org.argouml.model.ModelManagementHelper#getCorrespondingElement(java.lang.Object, java.lang.Object)
- */
+
public Object getCorrespondingElement(Object elem, Object model) {
return getCorrespondingElement(elem, model, true);
}
/*
- * @see org.argouml.model.ModelManagementHelper#getCorrespondingElement(java.lang.Object, java.lang.Object, boolean)
- *
* TODO: This should be supplement/replaced with methods to manage
* references to external profiles using HREFs rather than using
* copy-on-reference semantics
@@ -469,9 +442,7 @@
return true;
}
- /*
- * @see org.argouml.model.ModelManagementHelper#corresponds(java.lang.Object, java.lang.Object)
- */
+
public boolean corresponds(Object obj1, Object obj2) {
if (!(obj1 instanceof ModelElement)) {
throw new IllegalArgumentException("obj1");
@@ -491,17 +462,24 @@
((ModelElement) obj1).getNamespace());
}
- /*
- * @see org.argouml.model.ModelManagementHelper#isCyclicOwnership(java.lang.Object, java.lang.Object)
- */
+
public boolean isCyclicOwnership(Object parent, Object child) {
return (getOwnerShipPath(parent).contains(child) || parent == child);
}
+ /**
+ * Return a list of all ModelElements which contain this one, starting with
+ * the immediate parent and ending with the top level ModelElement.
+ *
+ * @param elem
+ * the model element to search for
+ * @return a list of ModelElements
+ */
private List getOwnerShipPath(Object elem) {
if (elem instanceof ModelElement) {
List ownershipPath = new ArrayList();
- Object parent = modelImpl.getFacade().getModelElementContainer(elem);
+ Object parent = modelImpl.getFacade()
+ .getModelElementContainer(elem);
while (parent != null) {
ownershipPath.add(parent);
parent = modelImpl.getFacade().getModelElementContainer(parent);
@@ -511,9 +489,7 @@
throw new IllegalArgumentException("Not a base");
}
- /*
- * @see org.argouml.model.ModelManagementHelper#removeImportedElement(java.lang.Object, java.lang.Object)
- */
+
public void removeImportedElement(Object pack, Object me) {
try {
if (pack instanceof UmlPackage && me instanceof ModelElement) {
@@ -537,9 +513,7 @@
"There must be a Package and a ModelElement");
}
- /*
- * @see org.argouml.model.ModelManagementHelper#setImportedElements(java.lang.Object, java.util.Collection)
- */
+
public void setImportedElements(Object pack, Collection imports) {
if (pack instanceof UmlPackage) {
Collection eis = ((UmlPackage) pack).getElementImport();
@@ -570,9 +544,7 @@
"There must be a Package and a ModelElement");
}
- /*
- * @see org.argouml.model.ModelManagementHelper#setAlias(java.lang.Object, java.lang.String)
- */
+
public void setAlias(Object handle, String alias) {
if ((handle instanceof ElementImport) && (alias != null)) {
((ElementImport) handle).setAlias(alias);
@@ -590,17 +562,13 @@
throw new IllegalArgumentException("handle: " + handle);
}
- /*
- * @see org.argouml.model.ModelManagementHelper#getContents(java.lang.Object)
- */
+
public Collection getContents(Object namespace) {
// TODO: Auto-generated method stub
return null;
}
- /*
- * @see org.argouml.model.ModelManagementHelper#getAllImportedElements(java.lang.Object)
- */
+
public Collection getAllImportedElements(Object pack) {
Collection c = new ArrayList();
try {
@@ -617,7 +585,8 @@
if (dep instanceof Permission) {
if (modelImpl.getExtensionMechanismsHelper()
.hasStereoType(dep, FRIEND_STEREOTYPE)) {
- Collection mes = modelImpl.getFacade().getSuppliers(dep);
+ Collection mes = modelImpl.getFacade()
+ .getSuppliers(dep);
Iterator mei = mes.iterator();
while (mei.hasNext()) {
Object o = mei.next();
@@ -631,7 +600,8 @@
.hasStereoType(dep, IMPORT_STEREOTYPE)
|| modelImpl.getExtensionMechanismsHelper()
.hasStereoType(dep, ACCESS_STEREOTYPE)) {
- Collection mes = modelImpl.getFacade().getSuppliers(dep);
+ Collection mes = modelImpl.getFacade()
+ .getSuppliers(dep);
Iterator mei = mes.iterator();
while (mei.hasNext()) {
Object o = mei.next();
@@ -645,7 +615,8 @@
}
}
/* TODO: This is the 2nd part of this method: */
- Collection imports = modelImpl.getFacade().getImportedElements(pack);
+ Collection imports = modelImpl.getFacade()
+ .getImportedElements(pack);
c.addAll(imports);
} catch (InvalidObjectException e) {
throw new InvalidElementException(e);
@@ -653,9 +624,7 @@
return c;
}
- /*
- * @see org.argouml.model.ModelManagementHelper#getAllContents(java.lang.Object)
- */
+
public Collection getAllContents(Object pack) {
Set results = new HashSet();
if (pack == null) {
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=12936&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=12935&r2=12936
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesFactoryMDRImpl.java 2007-06-30 12:55:44-0700
@@ -87,7 +87,7 @@
private StateMachinesPackage smPackage;
/**
- * Don't allow instantiation.
+ * Package-private constructor.
*
* @param implementation
* To get other helpers and factories.
@@ -95,21 +95,16 @@
StateMachinesFactoryMDRImpl(MDRModelImplementation implementation) {
modelImpl = implementation;
smPackage = modelImpl.getUmlPackage().getStateMachines();
-
}
- /*
- * @see org.argouml.model.StateMachinesFactory#createCallEvent()
- */
+
public Object createCallEvent() {
CallEvent myCallEvent = smPackage.getCallEvent().createCallEvent();
super.initialize(myCallEvent);
return myCallEvent;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#createChangeEvent()
- */
+
public Object createChangeEvent() {
ChangeEvent myChangeEvent = smPackage.getChangeEvent()
.createChangeEvent();
@@ -117,9 +112,7 @@
return myChangeEvent;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#createCompositeState()
- */
+
public Object createCompositeState() {
CompositeState myCompositeState = smPackage.getCompositeState()
.createCompositeState();
@@ -127,27 +120,21 @@
return myCompositeState;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#createFinalState()
- */
+
public Object createFinalState() {
FinalState myFinalState = smPackage.getFinalState().createFinalState();
super.initialize(myFinalState);
return myFinalState;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#createGuard()
- */
+
public Object createGuard() {
Guard myGuard = smPackage.getGuard().createGuard();
super.initialize(myGuard);
return myGuard;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#createPseudostate()
- */
+
public Object createPseudostate() {
Pseudostate myPseudostate = smPackage.getPseudostate()
.createPseudostate();
@@ -155,9 +142,7 @@
return myPseudostate;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#createSignalEvent()
- */
+
public Object createSignalEvent() {
SignalEvent mySignalEvent = smPackage.getSignalEvent()
.createSignalEvent();
@@ -165,9 +150,7 @@
return mySignalEvent;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#createSimpleState()
- */
+
public Object createSimpleState() {
SimpleState mySimpleState = smPackage.getSimpleState()
.createSimpleState();
@@ -175,9 +158,7 @@
return mySimpleState;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#createStateMachine()
- */
+
public Object createStateMachine() {
StateMachine myStateMachine = smPackage.getStateMachine()
.createStateMachine();
@@ -185,18 +166,14 @@
return myStateMachine;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#createStubState()
- */
+
public Object createStubState() {
StubState myStubState = smPackage.getStubState().createStubState();
super.initialize(myStubState);
return myStubState;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#createSubmachineState()
- */
+
public Object createSubmachineState() {
SubmachineState mySubmachineState = smPackage.getSubmachineState()
.createSubmachineState();
@@ -204,36 +181,28 @@
return mySubmachineState;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#createSynchState()
- */
+
public Object createSynchState() {
SynchState mySynchState = smPackage.getSynchState().createSynchState();
super.initialize(mySynchState);
return mySynchState;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#createTimeEvent()
- */
+
public Object createTimeEvent() {
TimeEvent myTimeEvent = smPackage.getTimeEvent().createTimeEvent();
super.initialize(myTimeEvent);
return myTimeEvent;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#createTransition()
- */
+
public Object createTransition() {
Transition myTransition = smPackage.getTransition().createTransition();
super.initialize(myTransition);
return myTransition;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildCompositeStateOnStateMachine(java.lang.Object)
- */
+
public Object buildCompositeStateOnStateMachine(Object statemachine) {
if (statemachine instanceof StateMachine) {
CompositeState state = (CompositeState) createCompositeState();
@@ -244,9 +213,7 @@
throw new IllegalArgumentException("statemachine");
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildStateMachine(java.lang.Object)
- */
+
public Object buildStateMachine(Object oContext) {
if (oContext != null
&& (modelImpl.getStateMachinesHelper().
@@ -269,9 +236,7 @@
+ "context null or not legal");
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildTransition(java.lang.Object, java.lang.Object, java.lang.Object)
- */
+
public Object buildTransition(Object owningState, Object source,
Object dest) {
if (!(owningState instanceof CompositeState)) {
@@ -299,9 +264,6 @@
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildPseudoState(java.lang.Object)
- */
public Object buildPseudoState(Object compositeState) {
if (compositeState instanceof CompositeState) {
Pseudostate state = (Pseudostate) createPseudostate();
@@ -314,9 +276,7 @@
"Argument must be a CompositeState");
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildSynchState(java.lang.Object)
- */
+
public Object buildSynchState(Object compositeState) {
if (compositeState instanceof CompositeState) {
SynchState state = (SynchState) createSynchState();
@@ -328,9 +288,7 @@
"Argument must be a CompositeState");
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildStubState(java.lang.Object)
- */
+
public Object buildStubState(Object compositeState) {
if (compositeState instanceof CompositeState) {
StubState state = (StubState) createStubState();
@@ -342,9 +300,7 @@
"Argument must be a CompositeState");
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildCompositeState(java.lang.Object)
- */
+
public Object buildCompositeState(Object compositeState) {
if (compositeState instanceof CompositeState) {
CompositeState state = (CompositeState) createCompositeState();
@@ -356,9 +312,7 @@
"Argument must be a CompositeState");
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildSimpleState(java.lang.Object)
- */
+
public Object buildSimpleState(Object compositeState) {
if (compositeState instanceof CompositeState) {
SimpleState state = (SimpleState) createSimpleState();
@@ -369,9 +323,7 @@
"Argument must be a CompositeState");
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildFinalState(java.lang.Object)
- */
+
public Object buildFinalState(Object compositeState) {
if (compositeState instanceof CompositeState) {
FinalState state = (FinalState) createFinalState();
@@ -382,9 +334,7 @@
"Argument must be a CompositeState");
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildSubmachineState(java.lang.Object)
- */
+
public Object buildSubmachineState(Object compositeState) {
if (compositeState instanceof CompositeState) {
SubmachineState state = (SubmachineState) createSubmachineState();
@@ -395,9 +345,7 @@
"Argument must be a CompositeState");
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildInternalTransition(java.lang.Object)
- */
+
public Object buildInternalTransition(Object state) {
if (state instanceof State) {
Transition trans = (Transition) createTransition();
@@ -409,9 +357,7 @@
throw new IllegalArgumentException("Argument must be a State");
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildTransition(java.lang.Object, java.lang.Object)
- */
+
public Object buildTransition(Object source, Object target) {
if (source instanceof StateVertex && target instanceof StateVertex) {
Transition trans = (Transition) createTransition();
@@ -424,9 +370,7 @@
throw new IllegalArgumentException();
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildCallEvent(java.lang.Object)
- */
+
public Object buildCallEvent(Object ns) {
CallEvent event = (CallEvent) createCallEvent();
event.setNamespace((Namespace) ns);
@@ -434,9 +378,7 @@
return event;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildCallEvent(java.lang.Object, java.lang.String, java.lang.Object)
- */
+
public Object buildCallEvent(Object trans, String name, Object ns) {
if (!(trans instanceof Transition)) {
throw new IllegalArgumentException();
@@ -447,17 +389,15 @@
String operationName = (name.indexOf("(") > 0) ? name.substring(0,
name.indexOf("(")).trim() : name.trim();
evt.setName(operationName);
- Object op = modelImpl.getStateMachinesHelper().findOperationByName(trans,
- operationName);
+ Object op = modelImpl.getStateMachinesHelper().findOperationByName(
+ trans, operationName);
if (op != null) {
evt.setOperation((Operation) op);
}
return evt;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildSignalEvent(java.lang.Object)
- */
+
public Object buildSignalEvent(Object ns) {
SignalEvent event = (SignalEvent) createSignalEvent();
event.setNamespace((Namespace) ns);
@@ -465,9 +405,7 @@
return event;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildSignalEvent(java.lang.String, java.lang.Object)
- */
+
public Object buildSignalEvent(String name, Object ns) {
SignalEvent event = (SignalEvent) createSignalEvent();
event.setNamespace((Namespace) ns);
@@ -475,9 +413,7 @@
return event;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildTimeEvent(java.lang.Object)
- */
+
public Object buildTimeEvent(Object ns) {
TimeEvent event = (TimeEvent) createTimeEvent();
event.setNamespace((Namespace) ns);
@@ -485,9 +421,7 @@
return event;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildTimeEvent(java.lang.String, java.lang.Object)
- */
+
public Object buildTimeEvent(String s, Object ns) {
TimeEvent event = (TimeEvent) createTimeEvent();
event.setNamespace((Namespace) ns);
@@ -497,9 +431,7 @@
return event;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildChangeEvent(java.lang.Object)
- */
+
public Object buildChangeEvent(Object ns) {
ChangeEvent event = (ChangeEvent) createChangeEvent();
event.setNamespace((Namespace) ns);
@@ -507,9 +439,7 @@
return event;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildChangeEvent(java.lang.String, java.lang.Object)
- */
+
public Object buildChangeEvent(String s, Object ns) {
ChangeEvent event = (ChangeEvent) createChangeEvent();
event.setNamespace((Namespace) ns);
@@ -520,10 +450,8 @@
return event;
}
- /*
- * @see org.argouml.model.StateMachinesFactory#buildGuard(java.lang.Object)
- */
- public Object/*Guard*/ buildGuard(Object transition) {
+
+ public Object buildGuard(Object transition) {
if (transition instanceof Transition) {
Transition t = (Transition) transition;
if (t.getGuard() != null) {
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=12936&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=12935&r2=12936
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java 2007-06-30 12:55:44-0700
@@ -247,7 +247,7 @@
};
/**
- * Don't allow external instantiation.
+ * Package-private constructor.
*
* @param implementation
* To get other helpers and factories.
@@ -297,9 +297,7 @@
}
}
- /*
- * @see org.argouml.model.UmlFactory#buildConnection(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)
- */
+
public Object buildConnection(Object elementType, Object fromElement,
Object fromStyle, Object toElement, Object toStyle,
Object unidirectional, Object namespace)
@@ -371,9 +369,7 @@
return connection;
}
- /*
- * @see org.argouml.model.UmlFactory#buildNode(java.lang.Object)
- */
+
public Object buildNode(Object elementType) {
if (elementType == metaTypes.getActor()) {
return getUseCases().createActor();
@@ -581,7 +577,8 @@
* @return the StateMachines factory instance.
*/
private StateMachinesFactoryMDRImpl getStateMachines() {
- return (StateMachinesFactoryMDRImpl) modelImpl.getStateMachinesFactory();
+ return (StateMachinesFactoryMDRImpl) modelImpl
+ .getStateMachinesFactory();
}
/**
@@ -837,9 +834,7 @@
Model.notifyMementoCreationObserver(new DummyModelMemento());
}
- /*
- * @see org.argouml.model.UmlFactory#isRemoved(java.lang.Object)
- */
+
public boolean isRemoved(Object o) {
if (!(o instanceof RefObject)) {
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=12936&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=12935&r2=12936
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java 2007-06-30 12:55:44-0700
@@ -83,9 +83,7 @@
return myExtensionPoint;
}
- /*
- * @see org.argouml.model.UseCasesFactory#createActor()
- */
+
public Object createActor() {
Actor myActor = modelImpl.getUmlPackage().getUseCases().getActor().
createActor();
@@ -93,30 +91,25 @@
return myActor;
}
- /*
- * @see org.argouml.model.UseCasesFactory#createInclude()
- */
+
public Object createInclude() {
- Include myInclude = modelImpl.getUmlPackage().getUseCases().getInclude().
- createInclude();
+ Include myInclude = modelImpl.getUmlPackage().getUseCases()
+ .getInclude().createInclude();
super.initialize(myInclude);
return myInclude;
}
- /*
- * @see org.argouml.model.UseCasesFactory#createUseCase()
- */
+
public Object createUseCase() {
- UseCase myUseCase = modelImpl.getUmlPackage().getUseCases().getUseCase().
- createUseCase();
+ UseCase myUseCase = modelImpl.getUmlPackage().getUseCases()
+ .getUseCase().createUseCase();
super.initialize(myUseCase);
return myUseCase;
}
- /*
- * @see org.argouml.model.UseCasesFactory#createUseCaseInstance()
- */
+
+ @SuppressWarnings("deprecation")
public Object createUseCaseInstance() {
UseCaseInstance myUseCaseInstance = modelImpl.getUmlPackage().
getUseCases().getUseCaseInstance().createUseCaseInstance();
@@ -124,16 +117,12 @@
return myUseCaseInstance;
}
- /*
- * @see org.argouml.model.UseCasesFactory#buildExtend(java.lang.Object, java.lang.Object)
- */
+
public Object buildExtend(Object abase, Object anextension) {
return buildExtend(abase, anextension, null);
}
- /*
- * @see org.argouml.model.UseCasesFactory#buildExtend(java.lang.Object, java.lang.Object, java.lang.Object)
- */
+
public Object buildExtend(Object abase, Object anextension, Object apoint) {
UseCase base = (UseCase) abase;
UseCase extension = (UseCase) anextension;
@@ -161,9 +150,7 @@
return extend;
}
- /*
- * @see org.argouml.model.UseCasesFactory#buildExtensionPoint(java.lang.Object)
- */
+
public Object buildExtensionPoint(Object modelElement) {
if (!(modelElement instanceof UseCase)) {
throw new IllegalArgumentException("An extension point can only "
@@ -183,9 +170,7 @@
return extensionPoint;
}
- /*
- * @see org.argouml.model.UseCasesFactory#buildInclude(java.lang.Object, java.lang.Object)
- */
+
public Object buildInclude(Object/* MUseCase */abase,
Object/* MUseCase */anaddition) {
UseCase base = (UseCase) abase;
@@ -227,9 +212,6 @@
}
- /*
- * @see org.argouml.model.UseCasesFactory#buildActor(java.lang.Object, java.lang.Object)
- */
public Object buildActor(Object actor, Object model) {
if (actor instanceof Actor) {
return buildActor(((Actor) actor).getNamespace(), model);