svn commit: r14192 - trunk/src/app/src/org/argouml/uml/diagram/ui/FigAssociation.java
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: mvw
Date: 2008-03-16 03:31:40-0700
New Revision: 14192
Modified:
trunk/src/app/src/org/argouml/uml/diagram/ui/FigAssociation.java
Log:
Fix for issue 4987: Refresh the association end multiplicities when the notation changes.
Modified: trunk/src/app/src/org/argouml/uml/diagram/ui/FigAssociation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/ui/FigAssociation.java?view=diff&rev=14192&p1=trunk/src/app/src/org/argouml/uml/diagram/ui/FigAssociation.java&p2=trunk/src/app/src/org/argouml/uml/diagram/ui/FigAssociation.java&r1=14191&r2=14192
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/ui/FigAssociation.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/ui/FigAssociation.java 2008-03-16 03:31:40-0700
@@ -176,6 +176,17 @@
destMult.setOwner(dest);
}
+ /**
+ * @see org.argouml.uml.diagram.ui.FigEdgeModelElement#renderingChanged()
+ */
+ @Override
+ protected void renderingChanged() {
+ /* This fixes issue 4987: */
+ srcMult.update();
+ destMult.update();
+ super.renderingChanged();
+ }
+
@Override
protected void initNotationProviders(Object own) {
super.initNotationProviders(own);
@@ -497,6 +508,15 @@
damage();
}
+ protected void update() {
+ Object owner = getOwner();
+ if (Model.getFacade().isAAssociationEnd(owner)) {
+ /* If we have an owner, then we also have
+ * a notation provider, so it is safe to call the following: */
+ setText();
+ }
+ }
+
protected void textEdited() {
notationProvider.parse(getOwner(), getText());
setText(notationProvider.toString(getOwner(), null));