Author: mvw Date: 2014-09-14 08:34:37-0700 New Revision: 19950 Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java
Log: Fix some association class related exceptions Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java?view=diff&pathrev=19950&r1=19949&r2=19950 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java 2014-09-14 08:34:37-0700 @@ -47,6 +47,7 @@ import org.argouml.cognitive.ToDoItem; import org.argouml.model.Model; import org.argouml.ui.Clarifier; +import org.argouml.uml.diagram.ui.FigAssociationClass; import org.argouml.uml.diagram.ui.FigCompartment; import org.argouml.uml.diagram.ui.FigCompartmentBox; import org.tigris.gef.presentation.Fig; @@ -86,6 +87,9 @@ final Object modelElement = fig.getOwner(); if (Model.getUmlFactory().isContainmentValid( Model.getMetaTypes().getAttribute(), modelElement)) { + if (fig instanceof FigAssociationClass) { + fig = ((FigAssociationClass) fig).getAssociationClass(); + } FigCompartmentBox fcb = (FigCompartmentBox) fig; FigCompartment fc = fcb.getCompartment(Model.getMetaTypes().getAttribute()); @@ -149,6 +153,9 @@ final Object modelElement = fig.getOwner(); if (Model.getUmlFactory().isContainmentValid( Model.getMetaTypes().getAttribute(), modelElement)) { + if (fig instanceof FigAssociationClass) { + fig = ((FigAssociationClass) fig).getAssociationClass(); + } if (fig instanceof FigCompartmentBox) { FigCompartmentBox fcb = (FigCompartmentBox) fig; FigCompartment fc = @@ -156,7 +163,7 @@ Rectangle fr = fc.getBounds(); fig = null; return fr.contains(x, y); - } // else it is a FigAssociationClass, then what? + } } return false; } ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=3088414 To unsubscribe from this discussion, e-mail: [[email protected]].
