Author: bobtarling Date: 2011-04-18 13:33:46-0700 New Revision: 19257 Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDisplayState.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseNode.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNotation.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java
Log: Update FigNotation on a notation event Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDisplayState.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDisplayState.java?view=diff&pathrev=19257&r1=19256&r2=19257 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDisplayState.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDisplayState.java 2011-04-18 13:33:46-0700 @@ -14,13 +14,14 @@ package org.argouml.activity2.diagram; import java.awt.Color; -import java.awt.Dimension; import java.awt.Rectangle; import org.argouml.notation2.NotationType; import org.argouml.uml.diagram.DiagramSettings; +import org.tigris.gef.presentation.Fig; +import org.tigris.gef.presentation.FigGroup; -abstract class BaseDisplayState implements StereotypeDisplayer, NameDisplayer { +abstract class BaseDisplayState extends FigGroup implements StereotypeDisplayer, NameDisplayer { private final DiagramElement bigPort; private final DiagramElement nameDisplay; @@ -37,6 +38,8 @@ settings, NotationType.NAME); bigPort = createBigPort(rect, lineColor, fillColor); + addFig((Fig) bigPort); + addFig((Fig) getNameDisplay()); } public DiagramElement getStereotypeDisplay() { @@ -47,7 +50,6 @@ return nameDisplay; } - abstract Dimension getMinimumSize(); abstract DiagramElement createBigPort( final Rectangle rect, final Color lineColor, 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=19257&r1=19256&r2=19257 ============================================================================== --- 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-04-18 13:33:46-0700 @@ -46,9 +46,8 @@ void setDisplayState(BaseDisplayState displayState) { this.displayState = displayState; - Fig port = (Fig) displayState.getPort(); - port.setOwner(getOwner()); - addFig(port); + displayState.setOwner(getOwner()); + addFig(displayState); } @Override Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNotation.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNotation.java?view=diff&pathrev=19257&r1=19256&r2=19257 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNotation.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNotation.java 2011-04-18 13:33:46-0700 @@ -53,7 +53,6 @@ setReturnAction(FigText.END_EDITING); setLineWidth(0); super.setFilled(true); - setFillColor(Color.red); NotationManager.getInstance().addListener(this); } @@ -97,7 +96,10 @@ } public void notationTextChanged(NotationTextEvent event) { + System.out.println("Notation=" + event.getText()); this.setText(event.getText()); this.setUnderline(event.isUnderlined()); + this.setUnderline(event.isBold()); + this.setItalic(event.isBold()); } } Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java?view=diff&pathrev=19257&r1=19256&r2=19257 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java 2011-04-18 13:33:46-0700 @@ -41,13 +41,20 @@ @Override public Dimension getMinimumSize() { - final Dimension stereoDim = getStereotypeDisplay().getMinimumSize(); + final Dimension nameDim = getNameDisplay().getMinimumSize(); - - int w = Math.max(stereoDim.width, nameDim.width) + PADDING * 2; + int width = nameDim.width; + int height = nameDim.width; + if (getStereotypeDisplay() != null) { + final Dimension stereoDim = getStereotypeDisplay().getMinimumSize(); + width += Math.max(stereoDim.width, nameDim.width); + height += (stereoDim.height - 2); + } + + int w = width + PADDING * 2; /* The stereoDim has height=2, even if it is empty, * hence the -2 below: */ - final int h = stereoDim.height - 2 + nameDim.height + PADDING; + final int h = height + PADDING; w = Math.max(w, h + 44); // the width needs to be > the height return new Dimension(w, h); } ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2721142 To unsubscribe from this discussion, e-mail: [[email protected]].
