Author: bobtarling
Date: 2011-05-21 03:52:00-0700
New Revision: 19476
Added:
trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/FigCircleState.java
trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/FigEntryPoint.java
trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/FigExitPoint.java
Modified:
trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/UMLStateDiagram.java
Log:
Begin implementation of entry point and exit point
Added: trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/FigCircleState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/FigCircleState.java?view=markup&pathrev=19476
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/FigCircleState.java 2011-05-21 03:52:00-0700
@@ -0,0 +1,62 @@
+/* $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.state2.diagram;
+
+import java.awt.Point;
+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.FigCircle;
+
+public class FigCircleState extends FigNodeModelElement {
+
+ private static final int WIDTH = 16;
+ private static final int HEIGHT = 16;
+
+ public FigCircleState(Object owner, Rectangle bounds,
+ DiagramSettings settings) {
+ super(owner, bounds, settings);
+ initialize();
+ }
+
+ @Override
+ protected Fig createBigPortFig() {
+ FigCircle fc = new FigCircle(0, 0, WIDTH, HEIGHT);
+ fc.setLineWidth(1);
+ return fc;
+ }
+
+ private void initialize() {
+ setEditable(false);
+ addFig(getBigPort());
+ }
+
+ @Override
+ public boolean isResizable() {
+ return false;
+ }
+
+ @Override
+ public Point connectionPoint(Point anotherPt) {
+ return getBigPort().connectionPoint(anotherPt);
+ }
+
+ @Override
+ protected void setStandardBounds(int x, int y, int w, int h) {
+ getBigPort().setBounds(x, y, w, h);
+ calcBounds();
+ updateEdges();
+ }
+}
Added: trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/FigEntryPoint.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/FigEntryPoint.java?view=markup&pathrev=19476
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/FigEntryPoint.java 2011-05-21 03:52:00-0700
@@ -0,0 +1,25 @@
+/* $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.state2.diagram;
+
+import java.awt.Rectangle;
+import org.argouml.uml.diagram.DiagramSettings;
+
+public class FigEntryPoint extends FigCircleState {
+
+ public FigEntryPoint(Object owner, Rectangle bounds,
+ DiagramSettings settings) {
+ super(owner, bounds, settings);
+ }
+}
Added: trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/FigExitPoint.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/FigExitPoint.java?view=markup&pathrev=19476
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/FigExitPoint.java 2011-05-21 03:52:00-0700
@@ -0,0 +1,25 @@
+/* $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.state2.diagram;
+
+import java.awt.Rectangle;
+import org.argouml.uml.diagram.DiagramSettings;
+
+public class FigExitPoint extends FigCircleState {
+
+ public FigExitPoint(Object owner, Rectangle bounds,
+ DiagramSettings settings) {
+ super(owner, bounds, settings);
+ }
+}
Modified: trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/UMLStateDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/UMLStateDiagram.java?view=diff&pathrev=19476&r1=19475&r2=19476
==============================================================================
--- trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/UMLStateDiagram.java (original)
+++ trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/UMLStateDiagram.java 2011-05-21 03:52:00-0700
@@ -216,6 +216,13 @@
if (kind.equals(Model.getPseudostateKind().getInitial())) {
figNode = new FigInitialState(modelElement, bounds, settings);
} else if (kind.equals(
+ Model.getPseudostateKind().getEntryPoint())) {
+ figNode =
+ new FigEntryPoint(modelElement, bounds, settings);
+ } else if (kind.equals(
+ Model.getPseudostateKind().getExitPoint())) {
+ figNode = new FigExitPoint(modelElement, bounds, settings);
+ } else if (kind.equals(
Model.getPseudostateKind().getChoice())) {
figNode = new FigBranchState(modelElement, bounds, settings);
} else if (kind.equals(
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2743261
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.