Author: mvw
Date: 2008-11-13 06:56:56-0800
New Revision: 16042
Modified:
trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Log:
The method setOwner() is meant to set the owner (only when creating a Fig, it is not supposed to change afterwards).
The methods updateStereotype() and updateNametext() are supposed to update the rendering without changing any stored setting.
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java?view=diff&rev=16042&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java&r1=16041&r2=16042
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java 2008-11-13 06:56:56-0800
@@ -195,7 +195,7 @@
}
int heightWithoutStereo = getHeight() - stereotypeHeight;
- getStereotypeFig().setOwner(getOwner());
+ getStereotypeFig().populate();
stereotypeHeight = 0;
if (getStereotypeFig().isVisible()) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java?view=diff&rev=16042&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java&r1=16041&r2=16042
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java 2008-11-13 06:56:56-0800
@@ -206,7 +206,7 @@
}
int heightWithoutStereo = getHeight() - stereotypeHeight;
- getStereotypeFig().setOwner(getOwner());
+ getStereotypeFig().populate();
stereotypeHeight = 0;
if (getStereotypeFig().isVisible()) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java?view=diff&rev=16042&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&r1=16041&r2=16042
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java 2008-11-13 06:56:56-0800
@@ -848,13 +848,13 @@
return;
}
Object modelElement = getOwner();
- stereotypeFig.setOwner(modelElement);
+ stereotypeFig.populate();
}
/**
* This method should only be called once for any one Fig instance that
* represents a model element (ie not for a FigEdgeNote). It is called
- * either by the constructor that takes an model element as an argument or
+ * either by the constructor that takes a model element as an argument or
* it is called by PGMLStackParser after it has created the Fig by use of
* the empty constructor.
* <p>
@@ -868,7 +868,7 @@
*/
/*
* TODO: It is planned to refactor so that there is only one Fig
- * constructor. When this is achieved this method can refactored out.
+ * constructor. When this is achieved this method can be refactored out.
*/
@Override
public void setOwner(Object owner) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&rev=16042&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java&r1=16041&r2=16042
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java 2008-11-13 06:56:56-0800
@@ -1420,6 +1420,7 @@
* of this 1st fig. */
bindPort(owner, bigPort);
nameFig.setOwner(owner); // for setting abstract
+ stereotypeFig.setOwner(owner);
updateListeners(null, owner);
}
@@ -1467,9 +1468,7 @@
+ this.getClass());
return;
}
-
- Object modelElement = getOwner();
- stereotypeFig.setOwner(modelElement);
+ stereotypeFig.populate();
}
/**
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.