svn commit: r18561 - trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigActivityNode.java

Author: bobtarling
Date: 2010-07-24 14:54:27-0700
New Revision: 18561

Added:
   trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigActivityNode.java
      - copied, changed from r18559, /trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigAction.java

Log:
Rename FigAction to FigActivityNode as it will be used for other activity types as well.

Copied: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigActivityNode.java (from r18559, /trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigAction.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=18561&r1=18559&r2=18561
==============================================================================
--- /trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigAction.java	(original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigActivityNode.java	2010-07-24 14:54:27-0700
@@ -23,8 +23,9 @@
 import org.tigris.gef.presentation.Fig;
 import org.tigris.gef.presentation.FigPoly;
 import org.tigris.gef.presentation.FigRRect;
+import org.tigris.gef.presentation.FigRect;
 
-public class FigAction extends FigNodeModelElement {
+public class FigActivityNode extends FigNodeModelElement {
 
     private static final int PADDING = 8;
     private static final int WIDTH = 90;
@@ -37,7 +38,7 @@
      * @param bounds rectangle describing bounds
      * @param settings rendering settings
      */
-    public FigAction(final Object owner, final Rectangle bounds,
+    public FigActivityNode(final Object owner, final Rectangle bounds,
             final DiagramSettings settings) {
         super(owner, bounds, settings);
         addFig(getBigPort());
@@ -72,9 +73,9 @@
             xs[5] = X0;              ys[5] = Y0;
             final Polygon p = new Polygon(xs, ys, 6);
             final FigGravityPoly polyFig = new FigAcceptEventPoly(X0, Y0, WIDTH, HEIGHT, LINE_COLOR, FILL_COLOR);
-//            final FigPoly polyFig = new FigPoly();
-//            polyFig.setPolygon(p);
             return polyFig;
+        } else if (Model.getFacade().isAObjectNode(getOwner())) {
+            return new FigRect(X0, Y0, WIDTH, HEIGHT, LINE_COLOR, FILL_COLOR);
         } else {
             return new FigRRect(X0, Y0, WIDTH, HEIGHT, LINE_COLOR, FILL_COLOR);
         }

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2637753

To unsubscribe from this discussion, e-mail: [[email protected]].