Author: bobtarling Date: 2011-04-17 10:56:07-0700 New Revision: 19251 Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigActivityEdge.java trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseEdge.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/UMLActivityDiagram.java
Log: Remove any knowledge of FigEdgeModelElement Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigActivityEdge.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigActivityEdge.java?view=diff&pathrev=19251&r1=19250&r2=19251 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigActivityEdge.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigActivityEdge.java 2011-04-17 10:56:07-0700 @@ -14,7 +14,6 @@ package org.argouml.activity2.diagram; import org.argouml.uml.diagram.DiagramSettings; -import org.argouml.uml.diagram.ui.FigEdgeModelElement; import org.argouml.uml.diagram.ui.PathItemPlacement; import org.tigris.gef.presentation.ArrowHeadGreater; @@ -25,9 +24,6 @@ FigActivityEdge(Object owner, DiagramSettings settings) { super(owner, settings); - addPathItem(getNameFig(), - new PathItemPlacement(this, getNameFig(), 50, 10)); - getFig().setLineColor(LINE_COLOR); setDestArrowHead(endArrow); } } Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseEdge.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseEdge.java?view=diff&pathrev=19251&r1=19250&r2=19251 ============================================================================== --- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseEdge.java (original) +++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseEdge.java 2011-04-17 10:56:07-0700 @@ -13,17 +13,38 @@ package org.argouml.activity2.diagram; +import java.awt.Color; + import org.argouml.uml.diagram.DiagramSettings; -import org.argouml.uml.diagram.ui.FigEdgeModelElement; +import org.argouml.uml.diagram.ui.PathItemPlacement; +import org.tigris.gef.presentation.Fig; +import org.tigris.gef.presentation.FigEdgePoly; /** * The Fig for all edge diagram elements. All specialist edge diagram elements * decorate this to get specialist behaviour * @author Bob Tarling */ -class FigBaseEdge extends FigEdgeModelElement { +class FigBaseEdge extends FigEdgePoly { + private final DiagramSettings settings; + private DiagramElement nameDiagramElement; + FigBaseEdge(Object owner, DiagramSettings settings) { - super(owner, settings); + super(); + _useNearest = true; + setOwner(owner); + this.settings = settings; + if (nameDiagramElement != null) { + addPathItem((Fig) nameDiagramElement, + new PathItemPlacement(this, (Fig) nameDiagramElement, 50, 10)); + } + getFig().setLineColor(Color.black); + } + + + public DiagramElement getNameDiagramElement() { + return nameDiagramElement; } + } 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=19251&r1=19250&r2=19251 ============================================================================== --- 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:56:07-0700 @@ -62,7 +62,5 @@ } public void setNameDiagramElement(DiagramElement name) { - // TODO Auto-generated method stub - } } 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=19251&r1=19250&r2=19251 ============================================================================== --- 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:56:07-0700 @@ -21,8 +21,6 @@ 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; /** ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2720810 To unsubscribe from this discussion, e-mail: [[email protected]].
