Author: tfmorris
Date: 2007-09-17 12:51:07-0700
New Revision: 13553
Modified:
trunk/src_new/org/argouml/uml/diagram/collaboration/CollabDiagramGraphModel.java
trunk/src_new/org/argouml/uml/diagram/deployment/DeploymentDiagramGraphModel.java
trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java
Log:
Resolve random "wasteful" comments. Remove use of deprecated methods. Update from Vector to List and Java 5 for loops.
Modified: trunk/src_new/org/argouml/uml/diagram/collaboration/CollabDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/collaboration/CollabDiagramGraphModel.java?view=diff&rev=13553&p1=trunk/src_new/org/argouml/uml/diagram/collaboration/CollabDiagramGraphModel.java&p2=trunk/src_new/org/argouml/uml/diagram/collaboration/CollabDiagramGraphModel.java&r1=13552&r2=13553
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/collaboration/CollabDiagramGraphModel.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/collaboration/CollabDiagramGraphModel.java 2007-09-17 12:51:07-0700
@@ -26,10 +26,11 @@
import java.beans.PropertyChangeEvent;
import java.beans.VetoableChangeListener;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import java.util.Vector;
import org.apache.log4j.Logger;
import org.argouml.model.Model;
@@ -81,11 +82,12 @@
* @see org.tigris.gef.graph.GraphModel#getPorts(java.lang.Object)
*/
public List getPorts(Object nodeOrEdge) {
- Vector res = new Vector(); //wasteful!
if (Model.getFacade().isAClassifierRole(nodeOrEdge)) {
- res.addElement(nodeOrEdge);
+ List result = new ArrayList();
+ result.add(nodeOrEdge);
+ return result;
}
- return res;
+ return Collections.EMPTY_LIST;
}
/*
@@ -103,20 +105,19 @@
* @see org.tigris.gef.graph.GraphModel#getInEdges(java.lang.Object)
*/
public List getInEdges(Object port) {
- Vector res = new Vector(); //wasteful!
+
if (Model.getFacade().isAClassifierRole(port)) {
- Object cr = /*(MClassifierRole)*/ port;
+ Object cr = port;
Collection ends = Model.getFacade().getAssociationEnds(cr);
if (ends == null) {
- return res; // empty Vector
+ return Collections.EMPTY_LIST;
}
- Iterator iter = ends.iterator();
- while (iter.hasNext()) {
- Object aer = /*(MAssociationEndRole)*/ iter.next();
- res.addElement(Model.getFacade().getAssociation(aer));
+ List result = new ArrayList();
+ for (Object end : ends) {
+ result.add(Model.getFacade().getAssociation(end));
}
}
- return res;
+ return Collections.EMPTY_LIST;
}
/*
@@ -125,7 +126,7 @@
* @see org.tigris.gef.graph.GraphModel#getOutEdges(java.lang.Object)
*/
public List getOutEdges(Object port) {
- return new Vector(); // TODO:?
+ return Collections.EMPTY_LIST; // TODO:?
}
////////////////////////////////////////////////////////////////
@@ -136,6 +137,7 @@
*
* @see org.tigris.gef.graph.MutableGraphModel#canAddNode(java.lang.Object)
*/
+ @Override
public boolean canAddNode(Object node) {
if (node == null) {
return false;
@@ -159,6 +161,7 @@
*
* @see org.tigris.gef.graph.MutableGraphModel#canAddEdge(java.lang.Object)
*/
+ @Override
public boolean canAddEdge(Object edge) {
if (edge == null) {
return false;
@@ -183,16 +186,17 @@
end1 = Model.getFacade().getType(associationEndRole1);
} else if (Model.getFacade().isAGeneralization(edge)) {
Object gen = /*(MGeneralization)*/ edge;
- end0 = Model.getFacade().getParent(gen);
- end1 = Model.getFacade().getChild(gen);
+ end0 = Model.getFacade().getGeneral(gen);
+ end1 = Model.getFacade().getSpecific(gen);
} else if (Model.getFacade().isADependency(edge)) {
Collection clients = Model.getFacade().getClients(edge);
Collection suppliers = Model.getFacade().getSuppliers(edge);
- if (clients == null || suppliers == null) {
+ if (clients == null || clients.isEmpty()
+ || suppliers == null || suppliers.isEmpty()) {
return false;
}
- end0 = (clients.toArray())[0];
- end1 = (suppliers.toArray())[0];
+ end0 = clients.iterator().next();
+ end1 = suppliers.iterator().next();
} else if (edge instanceof CommentEdge) {
end0 = ((CommentEdge) edge).getSource();
end1 = ((CommentEdge) edge).getDestination();
@@ -228,6 +232,7 @@
*
* @see org.tigris.gef.graph.MutableGraphModel#addNode(java.lang.Object)
*/
+ @Override
public void addNode(Object node) {
LOG.debug("adding MClassifierRole node!!");
if (!canAddNode(node)) {
@@ -248,6 +253,7 @@
*
* @see org.tigris.gef.graph.MutableGraphModel#addEdge(java.lang.Object)
*/
+ @Override
public void addEdge(Object edge) {
LOG.debug("adding class edge!!!!!!");
if (!canAddEdge(edge)) {
@@ -265,48 +271,42 @@
/*
* @see org.tigris.gef.graph.MutableGraphModel#addNodeRelatedEdges(java.lang.Object)
*/
+ @Override
public void addNodeRelatedEdges(Object node) {
super.addNodeRelatedEdges(node);
if (Model.getFacade().isAClassifier(node)) {
Collection ends = Model.getFacade().getAssociationEnds(node);
- Iterator iter = ends.iterator();
- while (iter.hasNext()) {
- Object ae = /*(MAssociationEndRole)*/ iter.next();
- if (canAddEdge(Model.getFacade().getAssociation(ae))) {
- addEdge(Model.getFacade().getAssociation(ae));
+ for (Object end : ends) {
+ if (canAddEdge(Model.getFacade().getAssociation(end))) {
+ addEdge(Model.getFacade().getAssociation(end));
}
}
}
if (Model.getFacade().isAGeneralizableElement(node)) {
- Collection gn = Model.getFacade().getGeneralizations(node);
- Iterator iter = gn.iterator();
- while (iter.hasNext()) {
- Object g = /*(MGeneralization)*/ iter.next();
- if (canAddEdge(g)) {
- addEdge(g);
+ Collection generalizations =
+ Model.getFacade().getGeneralizations(node);
+ for (Object generalization : generalizations) {
+ if (canAddEdge(generalization)) {
+ addEdge(generalization);
return;
}
}
- Collection sp = Model.getFacade().getSpecializations(node);
- iter = sp.iterator();
- while (iter.hasNext()) {
- Object s = /*(MGeneralization)*/ iter.next();
- if (canAddEdge(s)) {
- addEdge(s);
+ Collection specializations = Model.getFacade().getSpecializations(node);
+ for (Object specialization : specializations) {
+ if (canAddEdge(specialization)) {
+ addEdge(specialization);
return;
}
}
}
if (Model.getFacade().isAModelElement(node)) {
- Vector specs =
- new Vector(Model.getFacade().getClientDependencies(node));
- specs.addAll(Model.getFacade().getSupplierDependencies(node));
- Iterator iter = specs.iterator();
- while (iter.hasNext()) {
- Object dep = /*(MDependency)*/ iter.next();
- if (canAddEdge(dep)) {
- addEdge(dep);
+ Collection dependencies =
+ new ArrayList(Model.getFacade().getClientDependencies(node));
+ dependencies.addAll(Model.getFacade().getSupplierDependencies(node));
+ for (Object dependency : dependencies) {
+ if (canAddEdge(dependency)) {
+ addEdge(dependency);
return;
}
}
@@ -321,6 +321,7 @@
* @see org.tigris.gef.graph.MutableGraphModel#canConnect(java.lang.Object,
* java.lang.Object)
*/
+ @Override
public boolean canConnect(Object fromP, Object toP) {
if ((Model.getFacade().isAClassifierRole(fromP))
&& (Model.getFacade().isAClassifierRole(toP))) {
@@ -339,7 +340,7 @@
//throws PropertyVetoException
if ("ownedElement".equals(pce.getPropertyName())) {
- Vector oldOwned = (Vector) pce.getOldValue();
+ List oldOwned = (List) pce.getOldValue();
Object eo = /*(MElementImport)*/ pce.getNewValue();
Object me = Model.getFacade().getModelElement(eo);
if (oldOwned.contains(eo)) {
Modified: trunk/src_new/org/argouml/uml/diagram/deployment/DeploymentDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/deployment/DeploymentDiagramGraphModel.java?view=diff&rev=13553&p1=trunk/src_new/org/argouml/uml/diagram/deployment/DeploymentDiagramGraphModel.java&p2=trunk/src_new/org/argouml/uml/diagram/deployment/DeploymentDiagramGraphModel.java&r1=13552&r2=13553
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/deployment/DeploymentDiagramGraphModel.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/deployment/DeploymentDiagramGraphModel.java 2007-09-17 12:51:07-0700
@@ -26,10 +26,10 @@
import java.beans.PropertyChangeEvent;
import java.beans.VetoableChangeListener;
+import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
+import java.util.Collections;
import java.util.List;
-import java.util.Vector;
import org.apache.log4j.Logger;
import org.argouml.model.Model;
@@ -61,28 +61,28 @@
* @see org.tigris.gef.graph.GraphModel#getPorts(java.lang.Object)
*/
public List getPorts(Object nodeOrEdge) {
- Vector res = new Vector(); //wasteful!
+ List res = new ArrayList();
if (Model.getFacade().isANode(nodeOrEdge)) {
- res.addElement(nodeOrEdge);
+ res.add(nodeOrEdge);
}
if (Model.getFacade().isANodeInstance(nodeOrEdge)) {
- res.addElement(nodeOrEdge);
+ res.add(nodeOrEdge);
}
if (Model.getFacade().isAComponent(nodeOrEdge)) {
- res.addElement(nodeOrEdge);
+ res.add(nodeOrEdge);
}
if (Model.getFacade().isAComponentInstance(nodeOrEdge)) {
- res.addElement(nodeOrEdge);
+ res.add(nodeOrEdge);
}
if (Model.getFacade().isAClass(nodeOrEdge)) {
- res.addElement(nodeOrEdge);
+ res.add(nodeOrEdge);
}
if (Model.getFacade().isAInterface(nodeOrEdge)) {
- res.addElement(nodeOrEdge);
+ res.add(nodeOrEdge);
}
if (Model.getFacade().isAObject(nodeOrEdge)) {
- res.addElement(nodeOrEdge);
+ res.add(nodeOrEdge);
}
return res;
}
@@ -99,16 +99,14 @@
* @see org.tigris.gef.graph.GraphModel#getInEdges(java.lang.Object)
*/
public List getInEdges(Object port) {
- Vector res = new Vector(); //wasteful!
+ List res = new ArrayList();
if (Model.getFacade().isANode(port)) {
Collection ends = Model.getFacade().getAssociationEnds(port);
if (ends == null) {
- return res; // empty Vector
+ return Collections.EMPTY_LIST;
}
- Iterator iter = ends.iterator();
- while (iter.hasNext()) {
- Object aec = iter.next();
- res.add(Model.getFacade().getAssociation(aec));
+ for (Object end : ends) {
+ res.add(Model.getFacade().getAssociation(end));
}
}
if (Model.getFacade().isANodeInstance(port)) {
@@ -119,12 +117,10 @@
if (Model.getFacade().isAComponent(port)) {
Collection ends = Model.getFacade().getAssociationEnds(port);
if (ends == null) {
- return res; // empty Vector
+ return Collections.EMPTY_LIST;
}
- Iterator endEnum = ends.iterator();
- while (endEnum.hasNext()) {
- Object aec = endEnum.next();
- res.addElement(Model.getFacade().getAssociation(aec));
+ for (Object end : ends) {
+ res.add(Model.getFacade().getAssociation(end));
}
}
if (Model.getFacade().isAComponentInstance(port)) {
@@ -135,23 +131,19 @@
if (Model.getFacade().isAClass(port)) {
Collection ends = Model.getFacade().getAssociationEnds(port);
if (ends == null) {
- return res; // empty Vector
+ return Collections.EMPTY_LIST;
}
- Iterator endEnum = ends.iterator();
- while (endEnum.hasNext()) {
- Object ae = endEnum.next();
- res.addElement(Model.getFacade().getAssociation(ae));
+ for (Object end : ends) {
+ res.add(Model.getFacade().getAssociation(end));
}
}
if (Model.getFacade().isAInterface(port)) {
Collection ends = Model.getFacade().getAssociationEnds(port);
if (ends == null) {
- return res; // empty Vector
+ return Collections.EMPTY_LIST;
}
- Iterator endEnum = ends.iterator();
- while (endEnum.hasNext()) {
- Object ae = endEnum.next();
- res.addElement(Model.getFacade().getAssociation(ae));
+ for (Object end : ends) {
+ res.add(Model.getFacade().getAssociation(end));
}
}
if (Model.getFacade().isAObject(port)) {
@@ -168,7 +160,7 @@
* @see org.tigris.gef.graph.GraphModel#getOutEdges(java.lang.Object)
*/
public List getOutEdges(Object port) {
- return new Vector(); // TODO:?
+ return Collections.EMPTY_LIST; // TODO:?
}
////////////////////////////////////////////////////////////////
@@ -177,6 +169,7 @@
/*
* @see org.tigris.gef.graph.MutableGraphModel#canAddNode(java.lang.Object)
*/
+ @Override
public boolean canAddNode(Object node) {
if (node == null) {
return false;
@@ -191,11 +184,10 @@
}
if (Model.getFacade().isAAssociation(node)) {
Collection ends = Model.getFacade().getConnections(node);
- Iterator iter = ends.iterator();
boolean canAdd = true;
- while (iter.hasNext()) {
+ for (Object end : ends) {
Object classifier =
- Model.getFacade().getClassifier(iter.next());
+ Model.getFacade().getClassifier(end);
if (!containsNode(classifier)) {
canAdd = false;
break;
@@ -216,6 +208,7 @@
/*
* @see org.tigris.gef.graph.MutableGraphModel#canAddEdge(java.lang.Object)
*/
+ @Override
public boolean canAddEdge(Object edge) {
if (edge == null) {
return false;
@@ -277,6 +270,7 @@
/*
* @see org.tigris.gef.graph.MutableGraphModel#addNode(java.lang.Object)
*/
+ @Override
public void addNode(Object node) {
LOG.debug("adding class node!!");
if (!canAddNode(node)) {
@@ -295,6 +289,7 @@
/*
* @see org.tigris.gef.graph.MutableGraphModel#addEdge(java.lang.Object)
*/
+ @Override
public void addEdge(Object edge) {
LOG.debug("adding class edge!!!!!!");
if (!canAddEdge(edge)) {
@@ -312,14 +307,13 @@
/*
* @see org.tigris.gef.graph.MutableGraphModel#addNodeRelatedEdges(java.lang.Object)
*/
+ @Override
public void addNodeRelatedEdges(Object node) {
super.addNodeRelatedEdges(node);
if (Model.getFacade().isAClassifier(node)) {
Collection ends = Model.getFacade().getAssociationEnds(node);
- Iterator iter = ends.iterator();
- while (iter.hasNext()) {
- Object ae = iter.next();
+ for (Object ae : ends) {
if (!Model.getFacade().isANaryAssociation(
Model.getFacade().getAssociation(ae))
&& canAddEdge(Model.getFacade().getAssociation(ae))) {
@@ -330,9 +324,7 @@
}
if (Model.getFacade().isAAssociation(node)) {
Collection ends = Model.getFacade().getConnections(node);
- Iterator iter = ends.iterator();
- while (iter.hasNext()) {
- Object associationEnd = iter.next();
+ for (Object associationEnd : ends) {
if (canAddEdge(associationEnd)) {
addEdge(associationEnd);
}
@@ -340,9 +332,8 @@
}
if (Model.getFacade().isAInstance(node)) {
Collection ends = Model.getFacade().getLinkEnds(node);
- Iterator iter = ends.iterator();
- while (iter.hasNext()) {
- Object link = Model.getFacade().getLink(iter.next());
+ for (Object end : ends) {
+ Object link = Model.getFacade().getLink(end);
if (canAddEdge(link)) {
addEdge(link);
}
@@ -350,35 +341,31 @@
}
}
if (Model.getFacade().isAGeneralizableElement(node)) {
- Iterator iter =
- Model.getFacade().getGeneralizations(node).iterator();
- while (iter.hasNext()) {
- // g contains a Generalization
- Object g = iter.next();
- if (canAddEdge(g)) {
- addEdge(g);
+ Collection generalizations =
+ Model.getFacade().getGeneralizations(node);
+
+ for (Object generalization : generalizations) {
+ if (canAddEdge(generalization)) {
+ addEdge(generalization);
}
return;
}
- iter = Model.getFacade().getSpecializations(node).iterator();
- while (iter.hasNext()) {
- // s contains a specialization
- Object s = iter.next();
- if (canAddEdge(s)) {
- addEdge(s);
+ Collection specializations =
+ Model.getFacade().getSpecializations(node);
+ for (Object specialization : specializations) {
+ if (canAddEdge(specialization)) {
+ addEdge(specialization);
}
return;
}
}
if (Model.getFacade().isAModelElement(node)) {
- Vector specs =
- new Vector(Model.getFacade().getClientDependencies(node));
- specs.addAll(Model.getFacade().getSupplierDependencies(node));
- Iterator iter = specs.iterator();
- while (iter.hasNext()) {
- Object dep = iter.next();
- if (canAddEdge(dep)) {
- addEdge(dep);
+ List dependencies =
+ new ArrayList(Model.getFacade().getClientDependencies(node));
+ dependencies.addAll(Model.getFacade().getSupplierDependencies(node));
+ for (Object dependency : dependencies) {
+ if (canAddEdge(dependency)) {
+ addEdge(dependency);
}
return;
}
@@ -391,7 +378,7 @@
*/
public void vetoableChange(PropertyChangeEvent pce) {
if ("ownedElement".equals(pce.getPropertyName())) {
- Vector oldOwned = (Vector) pce.getOldValue();
+ List oldOwned = (List) pce.getOldValue();
Object eo = pce.getNewValue();
Object me = Model.getFacade().getModelElement(eo);
if (oldOwned.contains(eo)) {
@@ -437,4 +424,4 @@
*/
static final long serialVersionUID = 1003748292917485298L;
-} /* end class DeploymentDiagramGraphModel */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java?view=diff&rev=13553&p1=trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java&p2=trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java&r1=13552&r2=13553
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java 2007-09-17 12:51:07-0700
@@ -26,10 +26,12 @@
import java.beans.PropertyChangeEvent;
import java.beans.VetoableChangeListener;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import java.util.Vector;
+
import org.apache.log4j.Logger;
import org.argouml.model.Model;
@@ -70,15 +72,17 @@
* @return A vector of the ports found.
*/
public List getPorts(Object nodeOrEdge) {
- Vector res = new Vector(); //wasteful!
-
if (Model.getFacade().isAActor(nodeOrEdge)) {
- res.addElement(nodeOrEdge);
+ List result = new ArrayList();
+ result.add(nodeOrEdge);
+ return result;
} else if (Model.getFacade().isAUseCase(nodeOrEdge)) {
- res.addElement(nodeOrEdge);
+ List result = new ArrayList();
+ result.add(nodeOrEdge);
+ return result;
}
- return res;
+ return Collections.EMPTY_LIST;
}
@@ -109,53 +113,19 @@
* @return A vector of objects which are the incoming edges.
*/
public List getInEdges(Object port) {
- Vector res = new Vector(); //wasteful!
-
- // The actor case
-
- if (Model.getFacade().isAActor(port)) {
- Object act = /*(MActor)*/ port;
- Vector ends = new Vector(Model.getFacade().getAssociationEnds(act));
-
- // If there are no ends, return the empty vector
-
- if (ends == null) {
- return res;
- }
-
- // Enumerate the elements and add to the result vector
-
- java.util.Enumeration endEnum = ends.elements();
-
- while (endEnum.hasMoreElements()) {
- Object ae = /*(MAssociationEnd)*/ endEnum.nextElement();
- res.addElement(Model.getFacade().getAssociation(ae));
- }
- } else if (Model.getFacade().isAUseCase(port)) {
- // The use case
-
- Object use = /*(MUseCase)*/ port;
- Vector ends = new Vector(Model.getFacade().getAssociationEnds(use));
-
- // If there are no ends, return the empty vector
-
+ if (Model.getFacade().isAActor(port)
+ || Model.getFacade().isAUseCase(port)) {
+ List result = new ArrayList();
+ Collection ends = Model.getFacade().getAssociationEnds(port);
if (ends == null) {
- return res;
+ return Collections.EMPTY_LIST;
}
-
- // Enumerate the elements and add to the result vector
-
- java.util.Enumeration endEnum = ends.elements();
-
- while (endEnum.hasMoreElements()) {
- Object ae = /*(MAssociationEnd)*/ endEnum.nextElement();
- res.addElement(Model.getFacade().getAssociation(ae));
+ for (Object ae : ends) {
+ result.add(Model.getFacade().getAssociation(ae));
}
+ return result;
}
-
- // Return what we have built up
-
- return res;
+ return Collections.EMPTY_LIST;
}
@@ -172,7 +142,7 @@
* return the empty vector.
*/
public List getOutEdges(Object port) {
- return new Vector();
+ return Collections.EMPTY_LIST;
}
///////////////////////////////////////////////////////////////////////////
@@ -197,6 +167,7 @@
* @return <code>true</code> if the given object is a valid node in
* this graph, <code>false</code> otherwise.
*/
+ @Override
public boolean canAddNode(Object node) {
if (Model.getFacade().isAAssociation(node)
&& !Model.getFacade().isANaryAssociation(node)) {
@@ -231,6 +202,7 @@
* @return <code>true</code> if the given object is a valid edge in
* this graph, <code>false</code> otherwise.
*/
+ @Override
public boolean canAddEdge(Object edge) {
if (edge == null) {
return false;
@@ -265,8 +237,8 @@
sourceModelElement = Model.getFacade().getType(associationEnd0);
destModelElement = Model.getFacade().getType(associationEnd1);
} else if (Model.getFacade().isAGeneralization(edge)) {
- sourceModelElement = Model.getFacade().getChild(edge);
- destModelElement = Model.getFacade().getParent(edge);
+ sourceModelElement = Model.getFacade().getSpecific(edge);
+ destModelElement = Model.getFacade().getGeneral(edge);
} else if (Model.getFacade().isAExtend(edge)) {
sourceModelElement = Model.getFacade().getBase(edge);
destModelElement = Model.getFacade().getExtension(edge);
@@ -283,14 +255,13 @@
Collection clients = Model.getFacade().getClients(edge);
Collection suppliers = Model.getFacade().getSuppliers(edge);
- // Give up if either clients or suppliers is undefined
-
- if ((clients == null) || (suppliers == null)) {
+ if (clients == null || clients.isEmpty()
+ || suppliers == null || suppliers.isEmpty()) {
return false;
}
+ sourceModelElement = clients.iterator().next();
+ destModelElement = suppliers.iterator().next();
- sourceModelElement = (clients.toArray())[0];
- destModelElement = (suppliers.toArray())[0];
} else if (edge instanceof CommentEdge) {
sourceModelElement = ((CommentEdge) edge).getSource();
destModelElement = ((CommentEdge) edge).getDestination();
@@ -340,9 +311,10 @@
*
* @param node The node to be added to the graph.
*/
+ @Override
public void addNode(Object node) {
- LOG.debug("adding usecase node!!");
+ LOG.debug("adding usecase node");
// Give up if we are already on the graph. This is a bit inconistent
// with canAddNode above.
@@ -381,6 +353,7 @@
*
* @param edge The edge to be added to the graph.
*/
+ @Override
public void addEdge(Object edge) {
if (edge == null) {
throw new IllegalArgumentException("Cannot add a null edge");
@@ -429,100 +402,58 @@
*
* @param node The node whose edges are to be added.
*/
+ @Override
public void addNodeRelatedEdges(Object node) {
super.addNodeRelatedEdges(node);
- // Extend and include relationships for use cases. Collect all the
- // relationships of which the use case is either end and iterate to see
- // if they can be added.
-
if (Model.getFacade().isAUseCase(node)) {
- Vector ends = new Vector();
+ List relations = new ArrayList();
- // Collect all the includes at either end.
-
- ends.addAll(Model.getFacade().getIncludes(node));
- ends.addAll(Model.getFacade().getIncluders(node));
- ends.addAll(Model.getFacade().getExtends(node));
- ends.addAll(Model.getFacade().getExtenders(node));
-
- Iterator iter = ends.iterator();
-
- while (iter.hasNext()) {
- Object rel = /*(MRelationship)*/ iter.next();
-
- if (canAddEdge(rel)) {
- addEdge(rel);
+ relations.addAll(Model.getFacade().getIncludes(node));
+ relations.addAll(Model.getFacade().getIncluders(node));
+ relations.addAll(Model.getFacade().getExtends(node));
+ relations.addAll(Model.getFacade().getExtenders(node));
+
+ for (Object relation : relations) {
+ if (canAddEdge(relation)) {
+ addEdge(relation);
}
}
}
- // Associations for classifiers. Iterate over all the association ends
- // to find the associations.
-
if (Model.getFacade().isAClassifier(node)) {
Collection ends = Model.getFacade().getAssociationEnds(node);
- Iterator iter = ends.iterator();
-
- while (iter.hasNext()) {
- Object ae = /*(MAssociationEnd)*/ iter.next();
-
+ for (Object ae : ends) {
if (canAddEdge(Model.getFacade().getAssociation(ae))) {
addEdge(Model.getFacade().getAssociation(ae));
}
}
}
- // Generalizations and specializations for generalizable
- // elements. Iterate over each set in turn
-
if (Model.getFacade().isAGeneralizableElement(node)) {
-
- // The generalizations
-
Collection gn = Model.getFacade().getGeneralizations(node);
-
- Iterator iter = gn.iterator();
-
- while (iter.hasNext()) {
- Object g = /*(MGeneralization)*/ iter.next();
-
+ for (Object g : gn) {
if (canAddEdge(g)) {
addEdge(g);
}
}
-
- // The specializations
-
Collection sp = Model.getFacade().getSpecializations(node);
-
- iter = sp.iterator();
-
- while (iter.hasNext()) {
- Object s = /*(MGeneralization)*/ iter.next();
-
+ for (Object s : sp) {
if (canAddEdge(s)) {
addEdge(s);
}
}
}
- // Dependencies for model elements. Iterate over client and suppliers
- // together.
-
if (Model.getFacade().isAUMLElement(node)) {
- Vector specs =
- new Vector(Model.getFacade().getClientDependencies(node));
-
- specs.addAll(Model.getFacade().getSupplierDependencies(node));
-
- Iterator iter = specs.iterator();
+ Collection dependencies =
+ new ArrayList(Model.getFacade().getClientDependencies(node));
- while (iter.hasNext()) {
- Object dep = /*(MDependency)*/ iter.next();
+ dependencies.addAll(Model.getFacade().getSupplierDependencies(node));
- if (canAddEdge(dep)) {
- addEdge(dep);
+ for (Object dependency : dependencies) {
+ if (canAddEdge(dependency)) {
+ addEdge(dependency);
}
}
}
@@ -548,6 +479,7 @@
* by a kind of edge to be determined by the
* ports. <code>false</code> otherwise.
*/
+ @Override
public boolean canConnect(Object fromP, Object toP) {
// Suggest that actors may not connect (see JavaDoc comment about
@@ -591,7 +523,7 @@
// model from which it was removed
if ("ownedElement".equals(pce.getPropertyName())) {
- Vector oldOwned = (Vector) pce.getOldValue();
+ List oldOwned = (List) pce.getOldValue();
Object eo = /*(MElementImport)*/ pce.getNewValue();
Object me = Model.getFacade().getModelElement(eo);
@@ -629,4 +561,4 @@
*/
static final long serialVersionUID = -8516841965639203796L;
-} /* end class UseCaseDiagramGraphModel */
+}
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.