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

Author: bobtarling
Date: 2008-12-21 17:00:16-0800
New Revision: 16408

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

Log:
Allow to add association classes

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=16408&r1=16407&r2=16408
==============================================================================
--- 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-21 17:00:16-0800
@@ -190,6 +190,7 @@
         if (Model.getFacade().isAAssociation(node)
                 && !Model.getFacade().isANaryAssociation(node)) {
             // A binary association is not a node so reject.
+            LOG.debug("A binary association cannot be added as a node");
             return false;
         }
         
@@ -425,12 +426,7 @@
             while (iter.hasNext()) {
                 Object association =
                         Model.getFacade().getAssociation(iter.next());
-                // TODO: We should be able to add AssociationClasses, but the
-                // way things are now, we only half add them, so just disable
-                // until fixed. - tfm  20061208
-                if (!Model.getFacade().isANaryAssociation(association)
-                        && !Model.getFacade().isAAssociationClass(association)
-                        && canAddEdge(association)) {
+                if (canAddEdge(association)) {
                     addEdge(association);
                 }
             }

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

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