Author: bobtarling
Date: 2010-11-19 17:08:22-0800
New Revision: 18848
Added:
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
Modified:
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramGraphModel.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDiagram.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigAcceptEventPoly.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigActivityEdge.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigActivityNode.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigGravityPoly.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java
Log:
Introduce FigBaseNode and FigEdgeNode and improve encapsulation
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramGraphModel.java?view=diff&pathrev=18848&r1=18847&r2=18848
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramGraphModel.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramGraphModel.java 2010-11-19 17:08:22-0800
@@ -30,7 +30,7 @@
private static final Logger LOG = Logger
.getLogger(ActivityDiagramGraphModel.class);
- public ActivityDiagramGraphModel() {
+ ActivityDiagramGraphModel() {
super();
}
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=18848&r1=18847&r2=18848
==============================================================================
--- 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 2010-11-19 17:08:22-0800
@@ -38,7 +38,7 @@
private static final Logger LOG = Logger
.getLogger(BaseDiagram.class);
- public BaseDiagram(Object owner) {
+ BaseDiagram(Object owner) {
super();
MutableGraphModel gm = createGraphModel();
setGraphModel(gm);
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigAcceptEventPoly.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigAcceptEventPoly.java?view=diff&pathrev=18848&r1=18847&r2=18848
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigAcceptEventPoly.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigAcceptEventPoly.java 2010-11-19 17:08:22-0800
@@ -26,7 +26,7 @@
* @author Bob Tarling
*
*/
-public class FigAcceptEventPoly extends FigGravityPoly {
+class FigAcceptEventPoly extends FigGravityPoly {
FigAcceptEventPoly(int x, int y, int w, int h, Color lineColor, Color fillColor) {
super();
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=18848&r1=18847&r2=18848
==============================================================================
--- 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 2010-11-19 17:08:22-0800
@@ -18,11 +18,11 @@
import org.argouml.uml.diagram.ui.PathItemPlacement;
import org.tigris.gef.presentation.ArrowHeadGreater;
-public class FigActivityEdge extends FigEdgeModelElement {
+class FigActivityEdge extends FigBaseEdge {
private ArrowHeadGreater endArrow = new ArrowHeadGreater();
- public FigActivityEdge(Object owner, DiagramSettings settings) {
+ FigActivityEdge(Object owner, DiagramSettings settings) {
super(owner, settings);
addPathItem(getNameFig(),
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigActivityNode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigActivityNode.java?view=diff&pathrev=18848&r1=18847&r2=18848
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigActivityNode.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigActivityNode.java 2010-11-19 17:08:22-0800
@@ -25,7 +25,12 @@
import org.tigris.gef.presentation.FigRRect;
import org.tigris.gef.presentation.FigRect;
-public class FigActivityNode extends FigNodeModelElement {
+/**
+ * TODO: This class should not inherit FigBaseNode, instead FigBaseNode
+ * should be decorated according to the instructions in diagram.xml
+ * @author Bob Tarling
+ */
+public class FigActivityNode extends FigBaseNode {
private static final int PADDING = 8;
private static final int WIDTH = 90;
Added: 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=markup&pathrev=18848
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseEdge.java 2010-11-19 17:08:22-0800
@@ -0,0 +1,29 @@
+/* $Id: $
+ *****************************************************************************
+ * Copyright (c) 2010 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 org.argouml.uml.diagram.DiagramSettings;
+import org.argouml.uml.diagram.ui.FigEdgeModelElement;
+
+/**
+ * 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 {
+
+ FigBaseEdge(Object owner, DiagramSettings settings) {
+ super(owner, settings);
+ }
+}
Added: 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=markup&pathrev=18848
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseNode.java 2010-11-19 17:08:22-0800
@@ -0,0 +1,40 @@
+/* $Id: $
+ *****************************************************************************
+ * Copyright (c) 2010 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;
+
+import org.argouml.uml.diagram.DiagramSettings;
+import org.argouml.uml.diagram.ui.FigNodeModelElement;
+
+/**
+ * The Fig for all node diagram elements. All specialist diagram elements
+ * decorate this to get specialist behaviour
+ * @author Bob Tarling
+ */
+class FigBaseNode extends FigNodeModelElement {
+
+ /**
+ * Constructor a new FigBaseNode
+ *
+ * @param owner the owning UML element
+ * @param bounds rectangle describing bounds
+ * @param settings rendering settings
+ */
+ FigBaseNode(final Object owner, final Rectangle bounds,
+ final DiagramSettings settings) {
+ super(owner, bounds, settings);
+ addFig(getBigPort());
+ }
+}
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigGravityPoly.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigGravityPoly.java?view=diff&pathrev=18848&r1=18847&r2=18848
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigGravityPoly.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigGravityPoly.java 2010-11-19 17:08:22-0800
@@ -25,7 +25,7 @@
* @author Bob Tarling
*
*/
-public class FigGravityPoly extends FigPoly {
+class FigGravityPoly extends FigPoly {
FigGravityPoly() {
super();
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=18848&r1=18847&r2=18848
==============================================================================
--- 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 2010-11-19 17:08:22-0800
@@ -31,7 +31,7 @@
private static final Logger LOG = Logger
.getLogger(UMLActivityDiagram.class);
- public UMLActivityDiagram(Object activity) {
+ UMLActivityDiagram(Object activity) {
super(activity);
}
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2683744
To unsubscribe from this discussion, e-mail: [[email protected]].
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.