Author: bobtarling Date: 2011-04-26 15:25:08-0700 New Revision: 19287 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/FigComposite.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNameCompartment.java
Log: Use FigNameCompartment instead of just FigNotation for the name. 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=19287&r1=19286&r2=19287 ============================================================================== --- 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 15:25:08-0700 @@ -25,7 +25,7 @@ implements StereotypeDisplayer, NameDisplayer { private final DiagramElement border; - private final DiagramElement nameDisplay; + private final FigNameCompartment nameDisplay; private static final int MIN_WIDTH = 90; private static final int MARGIN = 1; @@ -38,11 +38,10 @@ final DiagramSettings settings) { super(owner, settings); - nameDisplay = new FigNotation( + nameDisplay = new FigNameCompartment( modelElement, new Rectangle(0, 0, 0, 0), - settings, - NotationType.NAME); + settings); border = createBorder(rect, lineColor, fillColor); addFig((Fig) border); addFig((Fig) getNameDisplay()); 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=19287&r1=19286&r2=19287 ============================================================================== --- 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 15:25:08-0700 @@ -68,8 +68,17 @@ } } } + + // TODO: Add listeners for add/remove events + } + + public FigCompartment( + final Object owner, + final DiagramSettings settings) { + super(owner, settings); } + @Override public Dimension getMinimumSize() { int minWidth = 0; 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=19287&r1=19286&r2=19287 ============================================================================== --- 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-04-26 15:25:08-0700 @@ -6,7 +6,7 @@ import org.argouml.uml.diagram.DiagramSettings; import org.tigris.gef.presentation.FigGroup; -public class FigComposite extends FigGroup { +public class FigComposite extends FigGroup implements DiagramElement { private static final int MARGIN = 0; Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNameCompartment.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNameCompartment.java?view=diff&pathrev=19287&r1=19286&r2=19287 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNameCompartment.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNameCompartment.java 2011-04-26 15:25:08-0700 @@ -1,3 +1,16 @@ +/* $Id: $ + ***************************************************************************** + * Copyright (c) 2011 Contributors - see below + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Bob Tarling + ***************************************************************************** + */ + package org.argouml.activity2.diagram; import java.awt.Rectangle; @@ -7,7 +20,7 @@ import org.argouml.uml.diagram.DiagramSettings; import org.tigris.gef.presentation.Fig; -public class FigNameCompartment extends FigComposite { +public class FigNameCompartment extends FigCompartment { public FigNameCompartment(Object owner, Rectangle bounds, DiagramSettings settings) { ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2724438 To unsubscribe from this discussion, e-mail: [[email protected]].
