Author: bobtarling Date: 2011-04-26 12:12:56-0700 New Revision: 19279 Added: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigComposite.java Modified: 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/FigNamedConcavePentagon.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedPentagon.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRRect.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRect.java
Log: The new implementation doesn't have the concept of port (the node will be the port). But the presentation will have a Fig for drawing the main border 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=19279&r1=19278&r2=19279 ============================================================================== --- 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-04-26 12:12:56-0700 @@ -23,10 +23,10 @@ import org.tigris.gef.presentation.Fig; import org.tigris.gef.presentation.FigGroup; -abstract class FigBasePresentation extends FigGroup +abstract class FigBasePresentation extends FigComposite implements StereotypeDisplayer, NameDisplayer { - private final DiagramElement bigPort; + private final DiagramElement border; private final DiagramElement nameDisplay; private Rectangle bounds; private static final int PADDING = 2; @@ -43,8 +43,8 @@ new Rectangle(0, 0, 0, 0), settings, NotationType.NAME); - bigPort = createBigPort(rect, lineColor, fillColor); - addFig((Fig) bigPort); + border = createBorder(rect, lineColor, fillColor); + addFig((Fig) border); addFig((Fig) getNameDisplay()); setBounds(rect); } @@ -57,13 +57,13 @@ return nameDisplay; } - abstract DiagramElement createBigPort( + abstract DiagramElement createBorder( final Rectangle rect, final Color lineColor, final Color fillColor); - DiagramElement getPort() { - return bigPort; + DiagramElement getBorder() { + return border; } public void propertyChange(PropertyChangeEvent pce) { @@ -100,7 +100,7 @@ protected void positionChildren() { Rectangle myBounds = getBounds(); - getPort().setBounds(myBounds); + getBorder().setBounds(myBounds); final Dimension nameDim = getNameDisplay().getMinimumSize(); final int nameWidth = nameDim.width; 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=19279&r1=19278&r2=19279 ============================================================================== --- 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-04-26 12:12:56-0700 @@ -34,11 +34,7 @@ * * @author Bob Tarling */ -class FigCompartment extends FigGroup { - - private static final int MARGIN = 0; - - private Rectangle bounds; +class FigCompartment extends FigComposite { public FigCompartment(Object owner, Rectangle bounds, DiagramSettings settings, List elements) { @@ -56,22 +52,6 @@ } } - int getRightMargin() { - return MARGIN; - } - - int getLeftMargin() { - return MARGIN; - } - - int getTopMargin() { - return MARGIN; - } - - int getBottomMargin() { - return MARGIN; - } - @Override public Dimension getMinimumSize() { int minWidth = 0; @@ -97,7 +77,7 @@ w = Math.max(w, minimumSize.width); h = Math.max(h, minimumSize.height); - bounds = new Rectangle(x, y, w, h); + super.setBoundsImpl(x, y, w, h); w -= getLeftMargin() + getRightMargin(); h -= getTopMargin() + getBottomMargin(); @@ -109,10 +89,5 @@ fig.setBounds(x, y, w, fig.getHeight()); y += fig.getHeight(); } - firePropChange("bounds", oldBounds, getBounds()); - } - - protected Rectangle getBoundsImpl() { - return bounds; } } Added: 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=markup&pathrev=19279 ============================================================================== --- (empty file) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigComposite.java 2011-04-26 12:12:56-0700 @@ -0,0 +1,32 @@ +package org.argouml.activity2.diagram; + +import java.awt.Rectangle; + +import org.tigris.gef.presentation.FigGroup; + +public class FigComposite extends FigGroup { + + private Rectangle bounds; + + private static final int MARGIN = 0; + + int getRightMargin() { + return MARGIN; + } + + int getLeftMargin() { + return MARGIN; + } + + int getTopMargin() { + return MARGIN; + } + + int getBottomMargin() { + return MARGIN; + } + + protected Rectangle getBoundsImpl() { + return bounds; + } +} Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedConcavePentagon.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedConcavePentagon.java?view=diff&pathrev=19279&r1=19278&r2=19279 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedConcavePentagon.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedConcavePentagon.java 2011-04-26 12:12:56-0700 @@ -26,10 +26,10 @@ public FigNamedConcavePentagon(Rectangle rect, Color lineColor, Color fillColor, Object modelElement, DiagramSettings settings) { super(rect, lineColor, fillColor, modelElement, settings); - createBigPort(rect, lineColor, fillColor); + createBorder(rect, lineColor, fillColor); } - protected DiagramElement createBigPort( + protected DiagramElement createBorder( final Rectangle rect, final Color lineColor, final Color fillColor) { Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedPentagon.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedPentagon.java?view=diff&pathrev=19279&r1=19278&r2=19279 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedPentagon.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedPentagon.java 2011-04-26 12:12:56-0700 @@ -28,10 +28,10 @@ public FigNamedPentagon(Rectangle rect, Color lineColor, Color fillColor, Object modelElement, DiagramSettings settings) { super(rect, lineColor, fillColor, modelElement, settings); - createBigPort(rect, lineColor, fillColor); + createBorder(rect, lineColor, fillColor); } - protected DiagramElement createBigPort( + protected DiagramElement createBorder( final Rectangle rect, final Color lineColor, final Color fillColor) { Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRRect.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRRect.java?view=diff&pathrev=19279&r1=19278&r2=19279 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRRect.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRRect.java 2011-04-26 12:12:56-0700 @@ -36,10 +36,10 @@ final Object modelElement, final DiagramSettings settings) { super(rect, lineColor, fillColor, modelElement, settings); - createBigPort(rect, lineColor, fillColor); + createBorder(rect, lineColor, fillColor); } - DiagramElement createBigPort(Rectangle rect, Color lineColor, Color fillColor) { + DiagramElement createBorder(Rectangle rect, Color lineColor, Color fillColor) { return new RRect( rect.x, rect.y, rect.width, rect.height, lineColor, fillColor); } Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRect.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRect.java?view=diff&pathrev=19279&r1=19278&r2=19279 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRect.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNamedRect.java 2011-04-26 12:12:56-0700 @@ -29,10 +29,10 @@ Color fillColor, Object modelElement, DiagramSettings settings) { super(rect, lineColor, fillColor, modelElement, settings); - createBigPort(rect, lineColor, fillColor); + createBorder(rect, lineColor, fillColor); } - DiagramElement createBigPort( + DiagramElement createBorder( final Rectangle rect, final Color lineColor, final Color fillColor) { ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2724403 To unsubscribe from this discussion, e-mail: [[email protected]].
