Author: bobtarling
Date: 2011-05-04 09:40:27-0700
New Revision: 19348
Modified:
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseNode.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBasePresentation.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigCompartment.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigComposite.java
Log:
Addition and removal of stereotypes in activity diagram now displays stereotypes using minimal redraw and new notations
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseNode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseNode.java?view=diff&pathrev=19348&r1=19347&r2=19348
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseNode.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseNode.java 2011-05-04 09:40:27-0700
@@ -102,15 +102,13 @@
* delegated to that parent.
*/
public void calcBounds() {
- final Dimension min = getMinimumSize();
- if (getGroup() != null
- && (getBounds().height < min.height
- || getBounds().width < min.width)) {
+ if (getGroup() != null) {
((FigGroup) getGroup()).calcBounds();
} else {
+ final Dimension min = getMinimumSize();
int maxw = Math.max(getWidth(), min.width);
int maxh = Math.max(getHeight(), min.height);
- setSize(maxw, maxh);
+ setBounds(_x, _y, maxw, maxh);
}
}
}
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBasePresentation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBasePresentation.java?view=diff&pathrev=19348&r1=19347&r2=19348
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBasePresentation.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBasePresentation.java 2011-05-04 09:40:27-0700
@@ -67,23 +67,12 @@
// TODO: Move an empty implementation to FigGroup in GEF
protected void positionChildren() {
- Rectangle myBounds = getBounds();
-
- getBorder().setBounds(myBounds);
-
- final Dimension nameDim = getNameDisplay().getMinimumSize();
- final int nameWidth = nameDim.width;
- final int nameHeight = nameDim.height;
-
final Rectangle bounds = getBounds();
- final int nx = bounds.x + getLeftMargin()
- + (bounds.width - (nameWidth + getLeftMargin() + getRightMargin()))
- / 2;
- final int ny = bounds.y + getTopMargin()
- + (bounds.height - nameHeight - getTopMargin() - getBottomMargin())
- / 2;
- getNameDisplay().setLocation(nx, ny);
+ getBorder().setBounds(bounds);
+
+ getNameDisplay().setBounds(
+ new Rectangle(bounds.x + getLeftMargin(), bounds.y + getTopMargin(), bounds.width - (getLeftMargin() + getRightMargin()), bounds.height - (getTopMargin() + getBottomMargin())));
}
@Override
@@ -92,11 +81,6 @@
final Dimension nameDim = getNameDisplay().getMinimumSize();
int width = nameDim.width;
int height = nameDim.height;
-// if (getStereotypeDisplay() != null) {
-// final Dimension stereoDim = getStereotypeDisplay().getMinimumSize();
-// width += Math.max(stereoDim.width, nameDim.width);
-// height += (stereoDim.height - 2);
-// }
int w = width + getRightMargin() + getLeftMargin();
final int h = height + getTopMargin() + getBottomMargin();
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigCompartment.java?view=diff&pathrev=19348&r1=19347&r2=19348
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigCompartment.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigCompartment.java 2011-05-04 09:40:27-0700
@@ -120,7 +120,7 @@
for (Object f : getFigs()) {
Fig fig = (Fig) f;
- fig.setBounds(x, y, w, fig.getHeight());
+ fig.setBounds(x, y, w, fig.getMinimumSize().height);
y += fig.getHeight();
}
}
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigComposite.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigComposite.java?view=diff&pathrev=19348&r1=19347&r2=19348
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigComposite.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigComposite.java 2011-05-04 09:40:27-0700
@@ -70,15 +70,13 @@
* delegated to that parent.
*/
public void calcBounds() {
- final Dimension min = getMinimumSize();
- if (getGroup() != null
- && (getBounds().height < min.height
- || getBounds().width < min.width)) {
+ if (getGroup() != null) {
((FigGroup) getGroup()).calcBounds();
} else {
+ final Dimension min = getMinimumSize();
int maxw = Math.max(getWidth(), min.width);
int maxh = Math.max(getHeight(), min.height);
- setSize(maxw, maxh);
+ setBounds(_x, _y, maxw, maxh);
}
}
}
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2730156
To unsubscribe from this discussion, e-mail: [[email protected]].
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.