Author: bobtarling Date: 2011-04-17 10:17:45-0700 New Revision: 19249 Added: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramElement.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramNode.java Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDiagram.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDisplayState.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/CreateDiagramElementAction.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/ModePlaceDiagramElement.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/NameDisplayer.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/StereotypeDisplayer.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java
Log: Remove all knowledge of FigNodeModelElement Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDiagram.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDiagram.java?view=diff&pathrev=19249&r1=19248&r2=19249 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDiagram.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDiagram.java 2011-04-17 10:17:45-0700 @@ -29,12 +29,14 @@ import javax.xml.parsers.ParserConfigurationException; import org.apache.log4j.Logger; +import org.argouml.kernel.Owned; import org.argouml.model.Model; import org.argouml.uml.diagram.UMLMutableGraphSupport; import org.argouml.uml.diagram.UmlDiagramRenderer; import org.argouml.uml.diagram.ui.ActionSetMode; import org.argouml.uml.diagram.ui.RadioAction; import org.argouml.uml.diagram.ui.UMLDiagram; +import org.tigris.gef.base.Diagram; import org.tigris.gef.base.LayerPerspective; import org.tigris.gef.base.LayerPerspectiveMutable; import org.tigris.gef.base.ModeCreatePolyEdge; @@ -48,13 +50,16 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; -abstract class BaseDiagram extends UMLDiagram { +abstract class BaseDiagram extends UMLDiagram implements Owned { private static final Logger LOG = Logger .getLogger(BaseDiagram.class); + final Object owner; + BaseDiagram(Object owner) { - super(owner); + super(); + this.owner = owner; MutableGraphModel gm = createGraphModel(); setGraphModel(gm); @@ -70,11 +75,10 @@ if (LOG.isDebugEnabled()) { LOG.debug("Constructing diagram for " + owner); } - try { - this.setName(getNewDiagramName()); - } catch (PropertyVetoException e) { - LOG.error("Exception", e); - } + } + + public Object getOwner() { + return owner; } abstract UmlDiagramRenderer createDiagramRenderer(); @@ -83,7 +87,6 @@ private Map<String, Class<?>> metaTypeByName; private Map<Class<?>, String> nameByMetaType; - @Override protected Object[] getUmlActions() { try { final Document doc = getDocument(); @@ -216,12 +219,6 @@ label)); } - @Override - public void encloserChanged(FigNode enclosed, FigNode oldEncloser, - FigNode newEncloser) { - // Do nothing. - } - /* * @see org.argouml.uml.diagram.ui.UMLDiagram#isRelocationAllowed(java.lang.Object) */ 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=19249&r1=19248&r2=19249 ============================================================================== --- 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-17 10:17:45-0700 @@ -20,13 +20,11 @@ import org.argouml.notation2.NotationType; import org.argouml.uml.diagram.DiagramSettings; import org.argouml.uml.diagram.ui.FigStereotypesGroup; -import org.tigris.gef.presentation.Fig; abstract class BaseDisplayState implements StereotypeDisplayer, NameDisplayer { - private final Fig bigPort; - private final Fig stereotypeFig; - private final Fig nameFig; + private final DiagramElement bigPort; + private final DiagramElement nameDisplay; public BaseDisplayState( final Rectangle rect, @@ -34,8 +32,7 @@ final Color fillColor, final Object modelElement, final DiagramSettings settings) { - stereotypeFig = new FigStereotypesGroup(modelElement, new Rectangle(0, 0, 0, 0), settings); - nameFig = new FigNotation( + nameDisplay = new FigNotation( modelElement, new Rectangle(0, 0, 0, 0), settings, @@ -43,18 +40,18 @@ bigPort = createBigPort(rect, lineColor, fillColor); } - public Fig getStereotypeDisplay() { - return stereotypeFig; + public DiagramElement getStereotypeDisplay() { + return null; } - public Fig getNameDisplay() { - return nameFig; + public DiagramElement getNameDisplay() { + return nameDisplay; } abstract Dimension getMinimumSize(); - abstract Fig createBigPort(Rectangle rect, Color lineColor, Color fillColor); + abstract DiagramElement createBigPort(Rectangle rect, Color lineColor, Color fillColor); - Fig getBigPort() { + DiagramElement getPort() { return bigPort; } } Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java?view=diff&pathrev=19249&r1=19248&r2=19249 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java 2011-04-17 10:17:45-0700 @@ -19,7 +19,6 @@ import java.awt.Rectangle; import org.argouml.uml.diagram.DiagramSettings; -import org.tigris.gef.presentation.Fig; import org.tigris.gef.presentation.FigPoly; public class ConcavePentagonDisplayState extends BaseDisplayState implements StereotypeDisplayer, NameDisplayer { @@ -45,8 +44,8 @@ return new Dimension(w, h); } - protected Fig createBigPort(Rectangle rect, Color lineColor, Color fillColor) { - final FigPoly polyFig = new FigPoly(); + protected DiagramElement createBigPort(Rectangle rect, Color lineColor, Color fillColor) { + final Poly poly = new Poly(); final int[] xs = new int[6]; final int[] ys = new int[6]; final int x = rect.x; @@ -60,8 +59,15 @@ xs[4] = x + h / 2; ys[4] = y + h / 2; xs[5] = x; ys[5] = y; final Polygon p = new Polygon(xs, ys, 6); - polyFig.setPolygon(p); + poly.setPolygon(p); - return polyFig; + return poly; + } + + + private class Poly extends FigPoly implements DiagramElement { + Poly() { + super(); + } } } Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/CreateDiagramElementAction.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/CreateDiagramElementAction.java?view=diff&pathrev=19249&r1=19248&r2=19249 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/CreateDiagramElementAction.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/CreateDiagramElementAction.java 2011-04-17 10:17:45-0700 @@ -24,9 +24,9 @@ final Object metaType; final String style; - final ArgoDiagram diagram; + final BaseDiagram diagram; - CreateDiagramElementAction(Object metaType, String style, String name, ArgoDiagram diagram) { + CreateDiagramElementAction(Object metaType, String style, String name, BaseDiagram diagram) { super(name, ResourceLoaderWrapper.lookupIconResource( ResourceLoaderWrapper.getImageBinding(name))); this.diagram = diagram; Added: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramElement.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramElement.java?view=markup&pathrev=19249 ============================================================================== --- (empty file) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramElement.java 2011-04-17 10:17:45-0700 @@ -0,0 +1,8 @@ +package org.argouml.activity2.diagram; + +import java.awt.Dimension; + +public interface DiagramElement extends org.argouml.uml.diagram.DiagramElement { + + Dimension getMinimumSize(); +} Added: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramNode.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramNode.java?view=markup&pathrev=19249 ============================================================================== --- (empty file) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/DiagramNode.java 2011-04-17 10:17:45-0700 @@ -0,0 +1,14 @@ +package org.argouml.activity2.diagram; + +import java.awt.Rectangle; + +/** + * This is the interface for all visual nodes. When mature the intention is to + * move to the diagrams module + * @author Bob Tarling + */ +public interface DiagramNode extends DiagramElement { + + Rectangle getBounds(); + void setNameDiagramElement(DiagramElement name); +} 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=19249&r1=19248&r2=19249 ============================================================================== --- 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-17 10:17:45-0700 @@ -17,16 +17,19 @@ import java.awt.Rectangle; import org.argouml.uml.diagram.DiagramSettings; -import org.argouml.uml.diagram.ui.FigNodeModelElement; +import org.tigris.gef.presentation.Fig; +import org.tigris.gef.presentation.FigNode; /** * The Fig for all node diagram elements. All specialist diagram elements * decorate this to get specialist behaviour * @author Bob Tarling */ -class FigBaseNode extends FigNodeModelElement { +class FigBaseNode extends FigNode implements DiagramNode { private BaseDisplayState displayState; + private final DiagramSettings settings; + private DiagramElement nameDiagramElement; /** * Constructor a new FigBaseNode @@ -37,21 +40,29 @@ */ FigBaseNode(final Object owner, final Rectangle bounds, final DiagramSettings settings) { - super(owner, bounds, settings); - addFig(getBigPort()); + super(owner); + this.settings = settings; } void setDisplayState(BaseDisplayState displayState) { this.displayState = displayState; - if (getBigPort() != null) { - removeFig(getBigPort()); - } - setBigPort(displayState.getBigPort()); - addFig(displayState.getBigPort()); + Fig port = (Fig) displayState.getPort(); + port.setOwner(getOwner()); + addFig(port); + } + + @Override + public boolean isDragConnectable() { + return false; } @Override public Dimension getMinimumSize() { return displayState.getMinimumSize(); } + + public void setNameDiagramElement(DiagramElement name) { + // TODO Auto-generated method stub + + } } 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=19249&r1=19248&r2=19249 ============================================================================== --- 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-17 10:17:45-0700 @@ -13,8 +13,8 @@ package org.argouml.activity2.diagram; +import java.awt.Color; import java.awt.Dimension; -import java.awt.FontMetrics; import java.awt.Rectangle; import org.argouml.notation2.NotatedItem; @@ -28,7 +28,7 @@ /** * @author Bob Tarling */ -public class FigNotation extends FigText implements NotatedItem { +public class FigNotation extends FigText implements NotatedItem, DiagramElement { private final NotationType notationType; @@ -52,7 +52,8 @@ setTabAction(FigText.END_EDITING); setReturnAction(FigText.END_EDITING); setLineWidth(0); - super.setFilled(false); + super.setFilled(true); + setFillColor(Color.red); NotationManager.getInstance().addListener(this); } Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ModePlaceDiagramElement.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ModePlaceDiagramElement.java?view=diff&pathrev=19249&r1=19248&r2=19249 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ModePlaceDiagramElement.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ModePlaceDiagramElement.java 2011-04-17 10:17:45-0700 @@ -6,23 +6,16 @@ import java.awt.Rectangle; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; -import java.util.Iterator; -import java.util.List; import org.apache.log4j.Logger; import org.argouml.model.Model; -import org.argouml.uml.diagram.ArgoDiagram; import org.argouml.uml.diagram.DiagramSettings; import org.tigris.gef.base.FigModifyingModeImpl; import org.tigris.gef.base.Globals; import org.tigris.gef.base.Layer; import org.tigris.gef.di.GraphNode; -import org.tigris.gef.graph.GraphModel; -import org.tigris.gef.graph.GraphNodeHooks; -import org.tigris.gef.graph.GraphNodeRenderer; import org.tigris.gef.graph.MutableGraphModel; import org.tigris.gef.presentation.Fig; -import org.tigris.gef.presentation.FigNode; import org.tigris.gef.undo.UndoManager; public class ModePlaceDiagramElement extends FigModifyingModeImpl { @@ -31,7 +24,7 @@ private final Object metaType; private final String style; private final String instructions; - private final ArgoDiagram diagram; + private final BaseDiagram diagram; private Object modelElement; private GraphNode graphNode; @@ -40,7 +33,7 @@ private static final int HEIGHT = 25; public ModePlaceDiagramElement( - ArgoDiagram diagram, + BaseDiagram diagram, Object metaType, String style, String instructions) { @@ -70,7 +63,7 @@ // TODO: Something might go wrong during processing. We don't really // want to create the model element until the user releases the mouse // in the place expected. - modelElement = Model.getUmlFactory().buildNode(metaType, diagram.getNamespace()); + modelElement = Model.getUmlFactory().buildNode(metaType, diagram.getOwner()); LOG.info("Created " + modelElement); // start(); Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/NameDisplayer.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/NameDisplayer.java?view=diff&pathrev=19249&r1=19248&r2=19249 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/NameDisplayer.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/NameDisplayer.java 2011-04-17 10:17:45-0700 @@ -13,9 +13,8 @@ package org.argouml.activity2.diagram; -import org.tigris.gef.presentation.Fig; interface NameDisplayer { - Fig getStereotypeDisplay(); + DiagramElement getStereotypeDisplay(); } Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java?view=diff&pathrev=19249&r1=19248&r2=19249 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java 2011-04-17 10:17:45-0700 @@ -18,7 +18,6 @@ import java.awt.Rectangle; import org.argouml.uml.diagram.DiagramSettings; -import org.tigris.gef.presentation.Fig; import org.tigris.gef.presentation.FigPoly; public class PentagonDisplayState extends BaseDisplayState implements StereotypeDisplayer, NameDisplayer { @@ -44,8 +43,8 @@ return new Dimension(w, h); } - protected Fig createBigPort(Rectangle rect, Color lineColor, Color fillColor) { - final FigPoly polyFig = new FigPoly(); + protected DiagramElement createBigPort(Rectangle rect, Color lineColor, Color fillColor) { + final Poly poly = new Poly(); final int[] xs = new int[6]; final int[] ys = new int[6]; final int x = rect.x; @@ -59,8 +58,14 @@ xs[4] = x; ys[4] = y + h; xs[5] = x; ys[5] = y; final Polygon p = new Polygon(xs, ys, 6); - polyFig.setPolygon(p); + poly.setPolygon(p); - return polyFig; + return poly; + } + + private class Poly extends FigPoly implements DiagramElement { + Poly() { + super(); + } } } 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=19249&r1=19248&r2=19249 ============================================================================== --- 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-17 10:17:45-0700 @@ -18,8 +18,8 @@ import java.awt.Rectangle; import org.argouml.uml.diagram.DiagramSettings; -import org.tigris.gef.presentation.Fig; import org.tigris.gef.presentation.FigRRect; +import org.tigris.gef.presentation.FigRect; /** * The state for displaying a node as a rounded rectangle @@ -53,8 +53,20 @@ return new Dimension(w, h); } - Fig createBigPort(Rectangle rect, Color lineColor, Color fillColor) { - return new FigRRect( + DiagramElement createBigPort(Rectangle rect, Color lineColor, Color fillColor) { + return new RRect( rect.x, rect.y, rect.width, rect.height, lineColor, fillColor); } + + private class RRect extends FigRRect implements DiagramElement { + RRect( + final int x, + final int y, + final int w, + final int h, + final Color lineColor, + final Color fillColor) { + super(x, y, w, h, lineColor, fillColor); + } + } } Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java?view=diff&pathrev=19249&r1=19248&r2=19249 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java 2011-04-17 10:17:45-0700 @@ -17,7 +17,7 @@ import java.awt.Rectangle; import org.argouml.uml.diagram.DiagramSettings; -import org.tigris.gef.presentation.Fig; +import org.tigris.gef.presentation.FigPoly; import org.tigris.gef.presentation.FigRect; public class RectDisplayState extends BaseDisplayState implements StereotypeDisplayer, NameDisplayer { @@ -45,8 +45,23 @@ return new Dimension(w, h); } - Fig createBigPort(Rectangle rect, Color lineColor, Color fillColor) { - return new FigRect( + + + DiagramElement createBigPort(Rectangle rect, Color lineColor, Color fillColor) { + return new Rect( rect.x, rect.y, rect.width, rect.height, lineColor, fillColor); } + + + private class Rect extends FigRect implements DiagramElement { + Rect( + final int x, + final int y, + final int w, + final int h, + final Color lineColor, + final Color fillColor) { + super(x, y, w, h, lineColor, fillColor); + } + } } Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/StereotypeDisplayer.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/StereotypeDisplayer.java?view=diff&pathrev=19249&r1=19248&r2=19249 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/StereotypeDisplayer.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/StereotypeDisplayer.java 2011-04-17 10:17:45-0700 @@ -12,9 +12,8 @@ */ package org.argouml.activity2.diagram; -import org.tigris.gef.presentation.Fig; interface StereotypeDisplayer { - Fig getStereotypeDisplay(); + DiagramElement getStereotypeDisplay(); } Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java?view=diff&pathrev=19249&r1=19248&r2=19249 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java 2011-04-17 10:17:45-0700 @@ -18,12 +18,12 @@ import org.argouml.i18n.Translator; import org.argouml.model.ActivityDiagram; import org.argouml.model.Model; -import org.argouml.uml.diagram.DiagramElement; import org.argouml.uml.diagram.DiagramSettings; import org.argouml.uml.diagram.UMLMutableGraphSupport; import org.argouml.uml.diagram.UmlDiagramRenderer; import org.argouml.uml.diagram.static_structure.ui.FigComment; import org.argouml.uml.diagram.ui.FigNodeModelElement; +import org.tigris.gef.presentation.FigNode; /** * Diagram class for UML2 Activity Diagram @@ -31,6 +31,10 @@ */ public class UMLActivityDiagram extends BaseDiagram implements ActivityDiagram { + /** + * A UML2 activity diagram is owned by an activity + * @param activity + */ UMLActivityDiagram(Object activity) { super(activity); } @@ -75,7 +79,7 @@ final Object modelElement, final Rectangle bounds) { - FigNodeModelElement figNode = null; + DiagramElement figNode = null; DiagramSettings settings = getDiagramSettings(); @@ -92,10 +96,15 @@ style="rrect"; } DiagramElementBuilder.buildDiagramElement((FigBaseNode) figNode, style, modelElement, settings); - } else if (Model.getFacade().isAComment(modelElement)) { - figNode = new FigComment(modelElement, bounds, settings); } return figNode; } + + @Override + public void encloserChanged(FigNode enclosed, FigNode oldEncloser, + FigNode newEncloser) { + // TODO Auto-generated method stub + + } } ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2720800 To unsubscribe from this discussion, e-mail: [[email protected]].
