svn commit: r16350 - trunk/src/argouml-app/src/org/argouml/uml/diagram: . static_structure

Author: bobtarling
Date: 2008-12-12 16:47:22-0800
New Revision: 16350

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/UMLMutableGraphSupport.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java

Log:
Issue 5523 Make a copy of a model element collection before adding any elements to it.

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/UMLMutableGraphSupport.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/UMLMutableGraphSupport.java?view=diff&pathrev=16350&r1=16349&r2=16350
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/UMLMutableGraphSupport.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/UMLMutableGraphSupport.java	2008-12-12 16:47:22-0800
@@ -385,6 +385,20 @@
      * @see org.tigris.gef.graph.MutableGraphModel#addNodeRelatedEdges(java.lang.Object)
      */
     public void addNodeRelatedEdges(Object node) {
+        if (Model.getFacade().isAModelElement(node)) {
+            List specs =
+                new ArrayList(Model.getFacade().getClientDependencies(node));
+            specs.addAll(Model.getFacade().getSupplierDependencies(node));
+            Iterator iter = specs.iterator();
+            while (iter.hasNext()) {
+                Object dependency = iter.next();
+                if (canAddEdge(dependency)) {
+                    addEdge(dependency);
+                    // return;
+                }
+            }
+        }
+        
         // Commentlinks for comments. Iterate over all the comment links
         // to find the comment and annotated elements.
 

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java?view=diff&pathrev=16350&r1=16349&r2=16350
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java	2008-12-12 16:47:22-0800
@@ -457,18 +457,6 @@
         	}
             }
         }
-        if (Model.getFacade().isAModelElement(node)) {
-            Collection specs = Model.getFacade().getClientDependencies(node);
-            specs.addAll(Model.getFacade().getSupplierDependencies(node));
-            Iterator iter = specs.iterator();
-            while (iter.hasNext()) {
-        	Object dependency = iter.next();
-        	if (canAddEdge(dependency)) {
-        	    addEdge(dependency);
-        	    // return;
-                }
-            }
-        }
         if (Model.getFacade().isAAssociation(node)) {
             Collection ends = Model.getFacade().getConnections(node);
             Iterator iter = ends.iterator();

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=983600

To unsubscribe from this discussion, e-mail: [[email protected]].