svn commit: r18730 - trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java

Author: bobtarling
Date: 2010-09-10 20:00:44-0700
New Revision: 18730

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

Log:
Allow an association end to be added to the diagram

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=18730&r1=18729&r2=18730
==============================================================================
--- 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	2010-09-10 20:00:44-0700
@@ -447,10 +447,13 @@
             Collection ends = Model.getFacade().getAssociationEnds(node);
             Iterator iter = ends.iterator();
             while (iter.hasNext()) {
+                final Object associationEnd = iter.next();
                 Object association =
-                        Model.getFacade().getAssociation(iter.next());
-                if (!Model.getFacade().isANaryAssociation(association) 
-                        && canAddEdge(association)) {
+                        Model.getFacade().getAssociation(associationEnd);
+                if (Model.getFacade().isANaryAssociation(association) 
+                        && canAddEdge(associationEnd)) {
+                    addEdge(associationEnd);
+                } else if (canAddEdge(association)){
                     addEdge(association);
                 }
             }

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

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