Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures')
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/AbstractMessageFigure.java94
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/CompactLifelineFigure.java96
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/CompactStateFigure.java177
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/CrossFigure.java66
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/CustomInteractionRectangleFigure.java71
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/DimensioningArrowFigure.java67
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/EllipseDecoration.java56
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/FullLifelineFigure.java135
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/FullStateFigure.java62
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/FullStateInvariantVerticalLineFigure.java35
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/GateFigure.java51
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/GeneralOrderingHorizontalFigure.java59
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/InvisibleRectangleFigure.java40
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/LifelineFigure.java145
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/LifelineVerticalLabel.java78
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageAsyncFigure.java31
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageCreateFigure.java37
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageDeleteFigure.java41
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageFoundFigure.java39
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageLostFigure.java40
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageReplyFigure.java40
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageSyncFigure.java40
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/SmallSquareFigure.java52
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/StateDefinitionFigure.java65
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/TimeRulerFigure.java23
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/TimingRulerFigure.java39
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/VerticalLabel.java169
-rw-r--r--incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/VerticalMarkFigure.java48
28 files changed, 0 insertions, 1896 deletions
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/AbstractMessageFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/AbstractMessageFigure.java
deleted file mode 100644
index ef5c18bc1f7..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/AbstractMessageFigure.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.RotatableDecoration;
-import org.eclipse.draw2d.Shape;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeTypes;
-import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.widgets.Display;
-
-public abstract class AbstractMessageFigure extends UMLEdgeFigure {
-
- protected static final Font LABEL_FONT = new Font(Display.getCurrent(), "SANS", 9, SWT.NORMAL); //$NON-NLS-1$
-
- private WrappingLabel messageLabel;
-
- @Override
- public void paint(final Graphics graphics) {
- graphics.setAntialias(SWT.ON);
- super.paint(graphics);
- }
-
- public AbstractMessageFigure() {
- // setForegroundColor(ColorConstants.black);
- setForegroundColor(getForegroundColor());
- setSourceDecoration(createSourceDecoration());
- setTargetDecoration(createTargetDecoration());
- }
-
- // meant to be overridden
- @SuppressWarnings("static-method")
- protected RotatableDecoration createSourceDecoration() {
- return null;
- }
-
- // meant to be overridden
- @SuppressWarnings("static-method")
- protected RotatableDecoration createTargetDecoration() {
- return null;
- }
-
- @Override
- protected void createContents() {
- super.createContents();
- this.messageLabel = new WrappingLabel();
- this.messageLabel.setText(""); //$NON-NLS-1$
- this.messageLabel.setFont(LABEL_FONT);
- add(this.messageLabel);
- }
-
- public WrappingLabel getMessageLabel() {
- return this.messageLabel;
- }
-
- @Override
- public void setLineWidth(final int w) {
- super.setLineWidth(w);
- if(getSourceDecoration() instanceof Shape) {
- ((Shape)getSourceDecoration()).setLineWidth(w);
- }
- if(getTargetDecoration() instanceof Shape) {
- ((Shape)getTargetDecoration()).setLineWidth(w);
- }
- }
-
- @Override
- public void setForegroundColor(final Color c) {
- super.setForegroundColor(c);
- if(getSourceDecoration() instanceof Shape) {
- ((Shape)getSourceDecoration()).setForegroundColor(c);
- ((Shape)getSourceDecoration()).setBackgroundColor(c);
- }
- if(getTargetDecoration() instanceof Shape) {
- ((Shape)getTargetDecoration()).setForegroundColor(c);
- ((Shape)getTargetDecoration()).setBackgroundColor(c);
- }
- }
-
- protected static IMapMode getMapMode() {
- return MapModeTypes.IDENTITY_MM;
- }
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/CompactLifelineFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/CompactLifelineFigure.java
deleted file mode 100644
index bf953e8ecd5..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/CompactLifelineFigure.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import java.util.List;
-
-import org.eclipse.draw2d.AbstractLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.tooling.runtime.draw2d.CenterLayout;
-import org.eclipse.papyrus.uml.diagram.timing.custom.utils.Constants;
-
-/**
- * @author vgillet
- *
- */
-public class CompactLifelineFigure extends LifelineFigure {
-
- /**
- * Get the rectangle which contains all labels
- *
- * @see org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure#getDefaultLabelsContainer()
- * @return lifeline labels rectangle
- */
- protected IFigure getDefaultLabelsContainer() {
- return getNameLabelContainerFigure();
- }
-
- @Override
- protected void createContents() {
- this.nameLabelContainerFigure = new InvisibleRectangleFigure() {
-
- @SuppressWarnings("unused")
- String DEBUG_ID = "CompactLifelineFigure_nameLabelContainerFigure"; //$NON-NLS-1$
- };
- this.add(this.nameLabelContainerFigure);
-
- this.nameLabel = new LifelineVerticalLabel();
- this.nameLabelContainerFigure.add(this.nameLabel);
- this.nameLabelContainerFigure.setLayoutManager(new CenterLayout());
-
- this.lifelineDataContainerFigure = new InvisibleRectangleFigure() {
-
- @SuppressWarnings("unused")
- String DEBUG_ID = "CompactLifelineFigure_lifelineDataContainerFigure"; //$NON-NLS-1$
- };
- this.lifelineDataContainerFigure.setLayoutManager(new AbstractLayout() {
-
- public void layout(final IFigure container) {
- final Rectangle clientArea = container.getClientArea();
- final List<?> children = container.getChildren();
- for(int i = 0; i < children.size(); i++) {
- final IFigure child = (IFigure)children.get(i);
- if(child == getTimelineContainerFigure()) {
- child.setBounds(new Rectangle(clientArea.x, clientArea.y, clientArea.width, clientArea.height - Constants.TIME_RULER_HEIGHT));
- } else if(child == getTimeRulerContainerFigure()) {
- child.setBounds(new Rectangle(clientArea.x, clientArea.y + clientArea.height - Constants.TIME_RULER_HEIGHT, clientArea.width, Constants.TIME_RULER_HEIGHT));
- }
- }
- }
-
- @Override
- protected Dimension calculatePreferredSize(final IFigure container, final int wHint, final int hHint) {
- return new Dimension(-1, -1);
- }
- });
- add(this.lifelineDataContainerFigure);
-
- createDataContainerContents();
- }
-
- private void createDataContainerContents() {
- this.timelineContainerFigure = new InvisibleRectangleFigure() {
-
- @SuppressWarnings("unused")
- String DEBUG_ID = "CompactLifelineFigure_compactTimelineContainerFigure"; //$NON-NLS-1$
- };
- this.lifelineDataContainerFigure.add(this.timelineContainerFigure);
-
- this.timeRulerContainerFigure = new TimeRulerFigure() {
-
- @SuppressWarnings("unused")
- String DEBUG_ID = "CompactLifelineFigure_timeRulerContainerFigure"; //$NON-NLS-1$
- };
- this.lifelineDataContainerFigure.add(this.timeRulerContainerFigure);
- }
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/CompactStateFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/CompactStateFigure.java
deleted file mode 100644
index d0e6c45e69d..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/CompactStateFigure.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.notation.GradientStyle;
-import org.eclipse.gmf.tooling.runtime.draw2d.CenterLayout;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusUMLElementFigure;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Pattern;
-import org.eclipse.swt.widgets.Display;
-
-public class CompactStateFigure extends PapyrusNodeFigure implements IPapyrusUMLElementFigure {
-
- public static final int PREFERRED_HEIGHT = 32;
-
- private final WrappingLabel label;
-
- private boolean infinite;
-
- /**
- * @param infinite
- * Whether the state has an end cap (the last state doesn't end)
- */
- public void setInfinite(final boolean infinite) {
- this.infinite = infinite;
- }
-
- public boolean isInfinite() {
- return this.infinite;
- }
-
- public CompactStateFigure() {
- super();
- setLayoutManager(new CenterLayout());
- this.label = new WrappingLabel();
- this.label.setAlignment(PositionConstants.CENTER);
- add(this.label);
- }
-
- @Override
- public void paintFigure(final Graphics g) {
- // super.paintFigure(g);
-
- g.pushState();
- final int height = Math.min(PREFERRED_HEIGHT, this.bounds.height);
- final int middleY = this.bounds.y + this.bounds.height / 2;
- final int x = this.bounds.x;
- final int w = this.bounds.width - 1;
- final int y = middleY - height / 2;
- final int h = height - 1;
-
- g.setLineWidth(1);
-
- final int cornerSize = Math.min(h / 3, w / 3);
-
- final int[] polygon;
- if(this.infinite) {
- polygon = new int[]{ x, middleY, x + cornerSize, y, x + w + 1, y, x + w + 1, y + h, x + cornerSize, y + h };
- } else {
- polygon = new int[]{ x, middleY, x + cornerSize, y, x + w - cornerSize, y, x + w, middleY, x + w - cornerSize, y + h, x + cornerSize, y + h };
- }
- g.setAntialias(SWT.ON);
- if(isUsingGradient()) {
- applyTransparency(g);
- final Pattern pattern;
- // apparently, patterns are not scaled automatically, so we need to scale the pattern so that it fits the
- // current zoom level
- final double scale = g.getAbsoluteScale();
- final int xScaled = (int)(this.bounds.x * scale);
- final int yScaled = (int)(this.bounds.y * scale);
- final int widthScaled = (int)(this.bounds.width * scale);
- final int heightScaled = (int)(height * scale);
- if(getGradientStyle() == GradientStyle.VERTICAL) {
- pattern = new Pattern(Display.getCurrent(), xScaled, yScaled, xScaled, yScaled + heightScaled, FigureUtilities.integerToColor(Integer.valueOf(getGradientColor2())), FigureUtilities.integerToColor(Integer.valueOf(getGradientColor1())));
- } else {
- pattern = new Pattern(Display.getCurrent(), xScaled, yScaled, xScaled + widthScaled, this.bounds.y, FigureUtilities.integerToColor(Integer.valueOf(getGradientColor2())), FigureUtilities.integerToColor(Integer.valueOf(getGradientColor1())));
- }
- g.setBackgroundPattern(pattern);
- g.fillPolygon(polygon);
- g.drawPolygon(polygon);
- pattern.dispose();
- } else {
- g.setBackgroundColor(getBackgroundColor());
- g.setForegroundColor(getForegroundColor());
- // FIXME: the figure is not filled because the default fill color is black
- // g.fillPolygon(polygon);
- g.drawPolygon(polygon);
- }
- g.popState();
- // displayDebugFigure(g);
- }
-
- // private void displayDebugFigure(final Graphics g) {
- // g.pushState();
- // g.setForegroundColor(ColorConstants.red);
- // for (int x = 0; x < this.bounds.width - 1; x++) {
- // final int y = computeHalfHeightAtAbscissa(x, this.bounds.width, this.bounds.height, this.infinite);
- // g.drawRectangle(this.bounds.x + x, this.bounds.y + this.bounds.height / 2 - y, 1, 1);
- // g.drawRectangle(this.bounds.x + x, this.bounds.y + this.bounds.height / 2 + y - 1, 1, 1);
- // }
- // g.popState();
- // }
-
- /**
- * Compute the half height of a CompactStateFigure with the given width and height, at the given abscissa.
- * <p>
- * This function is useful in order to place an OccurrenceSpecification along the border of a StateInvariant.
- *
- * @param x
- * the x coordinate at which to compute the height
- * @param figureWidth
- * the width of the CompactStateFigure
- * @param figureHeight
- * the height of the CompactStateFigure
- * @param infinite
- * whether the figure ends with a cap (not infinite) or not (infinite)
- * @return the half height at the given position
- */
- public static int computeHalfHeightAtAbscissa(final int x, final int figureWidth, final int figureHeight, final boolean infinite) {
- final int height = Math.min(PREFERRED_HEIGHT, figureHeight);
- final int width = figureWidth;
- final int halfHeight = figureHeight / 2;
- final int cornerSize = Math.min(height / 3, width / 3);
-
- final int resultY;
- if(x < cornerSize) {
- // on the left corner
- final double slope = (height / 2.0) / cornerSize;
- resultY = (int)(x * slope);
- } else if(infinite) {
- // on the straight border
- resultY = halfHeight;
- } else if(x < width - cornerSize) {
- // on the straight border
- resultY = halfHeight;
- } else {
- // on the right corner
- final double slope = (double)halfHeight / cornerSize;
- resultY = (int)(halfHeight - ((x - width + cornerSize) * slope));
- }
- return resultY;
- }
-
- public WrappingLabel getCompactStateInvariantLabel() {
- return this.label;
- }
-
- @Override
- public Dimension getPreferredSize(final int wHint, final int hHint) {
- return new Dimension(-1, PREFERRED_HEIGHT);
- }
-
- @Override
- protected void paintBorder(final Graphics graphics) {
- // no border
- }
-
- public void setStereotypeDisplay(final String stereotypes, final Image image) {
- // TODO Auto-generated method stub
-
- }
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/CrossFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/CrossFigure.java
deleted file mode 100644
index 6ba498d597f..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/CrossFigure.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusUMLElementFigure;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-
-public class CrossFigure extends PapyrusNodeFigure implements IPapyrusUMLElementFigure {
-
- public static final int CROSS_SIZE = 8;
-
- public CrossFigure() {
- super();
- setShadow(false);
- setBorder(null);
- }
-
- @Override
- public void paintFigure(final Graphics graphics) {
- super.paintFigure(graphics);
- graphics.pushState();
- graphics.setAntialias(SWT.ON);
- final Rectangle clipRect = graphics.getClip(new Rectangle());
- final int additionalSizeForCross = 10;
- // draw the cross outside its bounds so that the StateInvariant lines touch the base of the cross
- // instead of its invisible border
- graphics.setClip(new Rectangle(getBounds()).expand(additionalSizeForCross, additionalSizeForCross));
-
- final int x = this.bounds.x - additionalSizeForCross + 1;
- final int y = this.bounds.y - additionalSizeForCross + 1;
- final int w = this.bounds.width + additionalSizeForCross * 2;
- final int h = this.bounds.height + additionalSizeForCross * 2;
- final int z = Math.max(w / 8, 1);
-
- graphics.setLineWidth(z);
- graphics.setLineCap(SWT.CAP_ROUND);
- graphics.drawLine(x + z, y + z, x + w - z * 2, y + h - z * 2);
- graphics.drawLine(x + w - z * 2, y + z, x + z, y + h - z * 2);
- graphics.setClip(clipRect);
- graphics.popState();
- }
-
- @Override
- public Dimension getPreferredSize(final int wHint, final int hHint) {
- return new Dimension(CROSS_SIZE, CROSS_SIZE);
- }
-
- public void setStereotypeDisplay(final String stereotypes, final Image image) {
- // TODO Auto-generated method stub
-
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/CustomInteractionRectangleFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/CustomInteractionRectangleFigure.java
deleted file mode 100644
index ec8e8a1d965..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/CustomInteractionRectangleFigure.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.papyrus.uml.diagram.common.draw2d.InteractionFigure;
-import org.eclipse.papyrus.uml.diagram.common.draw2d.LeftToolbarLayout;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.InteractionRectangleFigure;
-
-public class CustomInteractionRectangleFigure extends InteractionRectangleFigure {
-
- private RectangleFigure timeRulerCompartment;
-
- public CustomInteractionRectangleFigure() {
- setLayoutManager(new ToolbarLayout());
- createContents();
- }
-
- @Override
- protected void createContents() {
- add(createInteractionFigureHeader());
- add(createContentPane());
- final int childrenSize = getChildren().size();
- add(createTimeRulerCompartment(), childrenSize);
- }
-
- protected IFigure createTimeRulerCompartment() {
- return this.timeRulerCompartment = new TimeRulerFigure();
- }
-
- protected InteractionFigure createInteractionFigureHeader() {
- this.interactionLabel = new WrappingLabel() {
-
- @Override
- public Dimension getPreferredSize(final int wHint, final int hHint) {
- final Dimension preferredSize = super.getPreferredSize(wHint, hHint);
- if(preferredSize.width == 0) {
- return preferredSize;
- }
- return new Dimension(preferredSize.width + 2, preferredSize.height + 2);
- }
- };
-
- this.interactionLabelContainer = new InteractionFigure();
- this.interactionLabelContainer.setBorder(new MarginBorder(3, 3, 0, 0));
- this.interactionLabelContainer.setLayoutManager(new LeftToolbarLayout());
-
- this.interactionLabelContainer.add(this.interactionLabel);
- return this.interactionLabelContainer;
- }
-
- public InteractionFigure getHeaderLabelContainer() {
- return this.interactionLabelContainer;
- }
-
- public RectangleFigure getTimeRulerContainerFigure() {
- return this.timeRulerCompartment;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/DimensioningArrowFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/DimensioningArrowFigure.java
deleted file mode 100644
index e27e495f6e0..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/DimensioningArrowFigure.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure;
-import org.eclipse.swt.SWT;
-
-public class DimensioningArrowFigure extends PapyrusNodeFigure {
-
- private static final int PREFERRED_HEIGHT = 11;
-
- public DimensioningArrowFigure() {
- super();
- setShadow(false);
- setBorder(null);
- }
-
- @Override
- public void paintFigure(final Graphics g) {
- g.pushState();
-
- final int middleX = this.bounds.x + this.bounds.width / 2;
- final int middleY = this.bounds.y + this.bounds.height / 2;
- final int x = this.bounds.x;
- final int w = this.bounds.width - 1;
- final int horizontalGap = w / 3;
- final int arrowSize = Math.max(Math.min(w / 5, 7), 3);
- final int verticalLineSize = arrowSize * 3;
-
- g.setLineWidth(1);
-
- // horizontal line (left part)
- g.drawLine(x, middleY, middleX - horizontalGap / 2, middleY);
- // horizontal line (right part)
- g.drawLine(middleX + horizontalGap / 2, middleY, x + w, middleY);
- // left vertical line
- g.drawLine(x, middleY - verticalLineSize / 2, x, middleY + verticalLineSize / 2);
- // right vertical line
- g.drawLine(x + w, middleY - verticalLineSize / 2, x + w, middleY + verticalLineSize / 2);
-
- g.setAntialias(SWT.ON);
- // left arrow
- g.drawLine(x, middleY, x + arrowSize, middleY - arrowSize);
- g.drawLine(x, middleY, x + arrowSize, middleY + arrowSize);
- // right arrow
- g.drawLine(x + w, middleY, x + w - arrowSize, middleY - arrowSize);
- g.drawLine(x + w, middleY, x + w - arrowSize, middleY + arrowSize);
-
- g.popState();
- }
-
- @Override
- public Dimension getPreferredSize(final int wHint, final int hHint) {
- return new Dimension(-1, PREFERRED_HEIGHT);
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/EllipseDecoration.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/EllipseDecoration.java
deleted file mode 100644
index 8bd8febf7b2..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/EllipseDecoration.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.Ellipse;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.RotatableDecoration;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.graphics.Color;
-
-public class EllipseDecoration extends Ellipse implements RotatableDecoration {
-
- public EllipseDecoration() {
- setPreferredSize(new Dimension(5, 5));
- }
-
- @Override
- public void setLocation(final Point p) {
- final Dimension delta = getPreferredSize().getScaled(0.5).getNegated();
- super.setLocation(p.getTranslated(delta));
- }
-
- public void setReferencePoint(final Point p) {
- // nothing
- }
-
- @Override
- protected void fillShape(final Graphics graphics) {
- final Color oldBack = graphics.getBackgroundColor();
- graphics.setBackgroundColor(graphics.getForegroundColor());
- graphics.fillOval(getOptimizedBounds());
- graphics.setBackgroundColor(oldBack);
- }
-
- private Rectangle getOptimizedBounds() {
- final float lineInset = Math.max(1.0f, getLineWidthFloat()) / 2.0f;
- final int inset = (int)Math.floor(lineInset);
- final Rectangle r = Rectangle.SINGLETON.setBounds(getBounds());
- r.x += inset;
- r.y += inset;
- return r;
- }
-
- @Override
- protected void outlineShape(final Graphics graphics) {
- // no outline
- }
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/FullLifelineFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/FullLifelineFigure.java
deleted file mode 100644
index cb8518510dc..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/FullLifelineFigure.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import java.util.List;
-
-import org.eclipse.draw2d.AbstractLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.tooling.runtime.draw2d.CenterLayout;
-import org.eclipse.papyrus.uml.diagram.timing.custom.utils.Constants;
-
-public class FullLifelineFigure extends LifelineFigure {
-
- private RectangleFigure stateDefinitionContainerFigure;
-
- // Chronogram contains statedefinition and timeline
- private RectangleFigure chronogramContainerFigure;
-
- @Override
- protected void createContents() {
- this.nameLabelContainerFigure = new InvisibleRectangleFigure() {
-
- @SuppressWarnings("unused")
- String DEBUG_ID = "FullLifelineFigure_nameLabelContainerFigure"; //$NON-NLS-1$
- };
- add(this.nameLabelContainerFigure);
-
- this.nameLabel = new LifelineVerticalLabel();
- this.nameLabelContainerFigure.add(this.nameLabel);
- this.nameLabelContainerFigure.setLayoutManager(new CenterLayout());
-
- this.lifelineDataContainerFigure = new InvisibleRectangleFigure() {
-
- @SuppressWarnings("unused")
- String DEBUG_ID = "FullLifelineFigure_lifelineDataContainerFigure"; //$NON-NLS-1$
- };
- this.lifelineDataContainerFigure.setLayoutManager(new AbstractLayout() {
-
- public void layout(final IFigure container) {
- final Rectangle clientArea = container.getClientArea();
- final List<?> children = container.getChildren();
- for(int i = 0; i < children.size(); i++) {
- final IFigure child = (IFigure)children.get(i);
- if(child == getChronogramContainerFigure()) {
- child.setBounds(new Rectangle(clientArea.x, clientArea.y, clientArea.width, clientArea.height - Constants.TIME_RULER_HEIGHT));
- } else if(child == getTimeRulerContainerFigure()) {
- child.setBounds(new Rectangle(clientArea.x, clientArea.y + clientArea.height - Constants.TIME_RULER_HEIGHT, clientArea.width, Constants.TIME_RULER_HEIGHT));
- }
- }
- }
-
- @Override
- protected Dimension calculatePreferredSize(final IFigure container, final int wHint, final int hHint) {
- return new Dimension(-1, -1);
- }
- });
-
- add(this.lifelineDataContainerFigure);
- createDataContainerContents();
-
- }
-
- private void createDataContainerContents() {
- this.chronogramContainerFigure = new InvisibleRectangleFigure() {
-
- @SuppressWarnings("unused")
- String DEBUG_ID = "FullLifelineFigure_chronogramContainerFigure"; //$NON-NLS-1$
- };
- this.lifelineDataContainerFigure.add(this.chronogramContainerFigure);
- this.chronogramContainerFigure.setLayoutManager(new AbstractLayout() {
-
- public void layout(final IFigure container) {
- final Rectangle clientArea = container.getClientArea();
- final List<?> children = container.getChildren();
- for(int i = 0; i < children.size(); i++) {
- final IFigure child = (IFigure)children.get(i);
- if(child == getStateDefinitionContainerFigure()) {
- child.setBounds(new Rectangle(clientArea.x, clientArea.y, Constants.STATE_DEFINITIONS_WIDTH, clientArea.height));
- } else if(child == getTimelineContainerFigure()) {
- child.setBounds(new Rectangle(clientArea.x + Constants.STATE_DEFINITIONS_WIDTH, clientArea.y, clientArea.width - Constants.STATE_DEFINITIONS_WIDTH, clientArea.height));
- }
- }
- }
-
- @Override
- protected Dimension calculatePreferredSize(final IFigure container, final int wHint, final int hHint) {
- return new Dimension(-1, -1);
- }
- });
- createChronogramContainerContents();
-
- this.timeRulerContainerFigure = new TimeRulerFigure() {
-
- @SuppressWarnings("unused")
- String DEBUG_ID = "FullLifelineFigure_timeRulerContainerFigure"; //$NON-NLS-1$
- };
- this.lifelineDataContainerFigure.add(this.timeRulerContainerFigure);
- }
-
- private void createChronogramContainerContents() {
-
- this.stateDefinitionContainerFigure = new InvisibleRectangleFigure() {
-
- @SuppressWarnings("unused")
- String DEBUG_ID = "FullLifelineFigure_stateDefinitionContainerFigure"; //$NON-NLS-1$
- };
- this.chronogramContainerFigure.add(this.stateDefinitionContainerFigure);
-
- this.timelineContainerFigure = new InvisibleRectangleFigure() {
-
- @SuppressWarnings("unused")
- String DEBUG_ID = "FullLifelineFigure_timelineContainerFigure"; //$NON-NLS-1$
- };
- this.chronogramContainerFigure.add(this.timelineContainerFigure);
- }
-
- public RectangleFigure getStateDefinitionContainerFigure() {
- return this.stateDefinitionContainerFigure;
- }
-
- public RectangleFigure getChronogramContainerFigure() {
- return this.chronogramContainerFigure;
- }
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/FullStateFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/FullStateFigure.java
deleted file mode 100644
index 8e2b5e59883..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/FullStateFigure.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusUMLElementFigure;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure;
-import org.eclipse.swt.graphics.Image;
-
-public class FullStateFigure extends PapyrusNodeFigure implements IPapyrusUMLElementFigure {
-
- private int posY;
-
- public FullStateFigure() {
- super();
- setBorder(null);
- }
-
- @Override
- public void paintFigure(final Graphics g) {
- // super.paintFigure(g);
- g.pushState();
-
- // DEBUG
- // g.setLineDash(new int[] { 1, 5 });
- // g.drawRectangle(this.bounds.x, this.bounds.y, this.bounds.width - 1, this.bounds.height - 1);
- // g.setLineDash(new int[] {});
- // END DEBUG
-
- // final int y = this.bounds.y;
- final int x = this.bounds.x;
- final int w = this.bounds.width;
- final int y = this.posY;
-
- g.setLineWidth(1);
- g.drawLine(x, y, x + w, y);
-
- g.popState();
- }
-
- public void setPosY(final int endY) {
- this.posY = endY;
- }
-
- @Override
- protected void paintBorder(final Graphics graphics) {
- // no border
- }
-
- public void setStereotypeDisplay(final String stereotypes, final Image image) {
- // TODO Auto-generated method stub
-
- }
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/FullStateInvariantVerticalLineFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/FullStateInvariantVerticalLineFigure.java
deleted file mode 100644
index 9b1b047efed..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/FullStateInvariantVerticalLineFigure.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure;
-
-public class FullStateInvariantVerticalLineFigure extends PapyrusNodeFigure {
-
- public FullStateInvariantVerticalLineFigure() {
- super();
- setBorder(null);
- }
-
- @Override
- public void paintFigure(final Graphics g) {
- // super.paintFigure(g);
- g.setLineWidth(1);
- final int middleX = this.bounds.x + this.bounds.width / 2;
- g.drawLine(middleX, this.bounds.y, middleX, this.bounds.y + this.bounds.height);
- }
-
- @Override
- protected void paintBorder(final Graphics graphics) {
- // no border
- }
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/GateFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/GateFigure.java
deleted file mode 100644
index f397f2a31ae..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/GateFigure.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusUMLElementFigure;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure;
-import org.eclipse.swt.graphics.Image;
-
-public class GateFigure extends PapyrusNodeFigure implements IPapyrusUMLElementFigure {
-
- public static final int SQUARE_SIZE = 5;
-
- public GateFigure() {
- super();
- setShadow(false);
- setBorder(null);
- }
-
- @Override
- public void paintFigure(final Graphics g) {
- g.pushState();
-
- final int middleX = this.bounds.x + this.bounds.width / 2;
- final int middleY = this.bounds.y + this.bounds.height / 2;
-
- g.setLineWidth(1);
-
- g.fillRectangle(middleX - SQUARE_SIZE / 2, middleY - SQUARE_SIZE / 2, SQUARE_SIZE, SQUARE_SIZE);
- g.popState();
- }
-
- @Override
- public Dimension getPreferredSize(final int wHint, final int hHint) {
- return new Dimension(SQUARE_SIZE, SQUARE_SIZE);
- }
-
- public void setStereotypeDisplay(final String stereotypes, final Image image) {
- // nothing
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/GeneralOrderingHorizontalFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/GeneralOrderingHorizontalFigure.java
deleted file mode 100644
index 1e2ba26aecc..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/GeneralOrderingHorizontalFigure.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure;
-import org.eclipse.swt.SWT;
-
-public class GeneralOrderingHorizontalFigure extends PapyrusNodeFigure {
-
- private static final int PREFERRED_HEIGHT = 11;
-
- public GeneralOrderingHorizontalFigure() {
- super();
- setShadow(false);
- setBorder(null);
- }
-
- @Override
- public void paintFigure(final Graphics g) {
- g.pushState();
-
- final int middleX = this.bounds.x + this.bounds.width / 2;
- final int middleY = this.bounds.y + this.bounds.height / 2;
- final int x = this.bounds.x;
- final int w = this.bounds.width - 1;
- final int arrowSize = Math.max(Math.min(w / 3, 12), 6);
- final int a = arrowSize / 2;
-
- g.setLineWidth(1);
-
- // horizontal line
- g.setLineDash(new int[]{ 4, 4 });
- g.drawLine(x, middleY, x + w, middleY);
- g.setLineDash(new int[]{});
-
- // arrow
- g.setAntialias(SWT.ON);
- g.setBackgroundColor(getForegroundColor());
- g.fillPolygon(new int[]{ middleX - a, this.bounds.y, middleX + a, middleY, middleX - a, this.bounds.y + this.bounds.height });
-
- g.popState();
- }
-
- @Override
- public Dimension getPreferredSize(final int wHint, final int hHint) {
- return new Dimension(-1, PREFERRED_HEIGHT);
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/InvisibleRectangleFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/InvisibleRectangleFigure.java
deleted file mode 100644
index 4ee68b24b97..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/InvisibleRectangleFigure.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.RectangleFigure;
-
-/** A rectangle that is not painted: useful for simplifying layouts */
-public class InvisibleRectangleFigure extends RectangleFigure {
-
- /**
- * Creates a RectangleFigure.
- */
- public InvisibleRectangleFigure() {
- }
-
- /**
- * @see Shape#fillShape(Graphics)
- */
- @Override
- protected void fillShape(final Graphics graphics) {
- // don't fill
- }
-
- /**
- * @see Shape#outlineShape(Graphics)
- */
- @Override
- protected void outlineShape(final Graphics graphics) {
- // don't draw an outline
- }
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/LifelineFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/LifelineFigure.java
deleted file mode 100644
index e979c65d193..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/LifelineFigure.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import java.util.List;
-
-import org.eclipse.draw2d.AbstractLayout;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure;
-import org.eclipse.swt.graphics.Image;
-
-public class LifelineFigure extends PapyrusNodeFigure implements IPapyrusNodeUMLElementFigure {
-
- protected final int LABEL_WIDTH = 30;
-
- protected RectangleFigure nameLabelContainerFigure;
-
- protected LifelineVerticalLabel nameLabel;
-
- protected RectangleFigure timeRulerContainerFigure;
-
- protected RectangleFigure lifelineDataContainerFigure;
-
- protected RectangleFigure timelineContainerFigure;
-
- private boolean selected;
-
- private boolean displayTimeRuler;
-
- public LifelineFigure() {
- setShadow(false);
- createContents();
- setLayoutManager(new AbstractLayout() {
-
- public void layout(final IFigure container) {
- final Rectangle clientArea = container.getClientArea();
- final List<?> children = container.getChildren();
- for(int i = 0; i < children.size(); i++) {
- final IFigure child = (IFigure)children.get(i);
- if(child == getNameLabelContainerFigure()) {
- child.setBounds(new Rectangle(clientArea.x, clientArea.y, LifelineFigure.this.LABEL_WIDTH, clientArea.height));
- } else if(child == getLifelineDataContainerFigure()) {
- child.setBounds(new Rectangle(clientArea.x + LifelineFigure.this.LABEL_WIDTH, clientArea.y, clientArea.width - LifelineFigure.this.LABEL_WIDTH, clientArea.height));
- }
- }
- }
-
- @Override
- protected Dimension calculatePreferredSize(final IFigure container, final int wHint, final int hHint) {
- return new Dimension(-1, -1);
- }
- });
- }
-
- protected void createContents() {
- // meant to be overridden
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.Figure#setPreferredSize(org.eclipse.draw2d.geometry.Dimension)
- */
- @Override
- public void setPreferredSize(final Dimension size) {
- final IFigure container = getParent();
- final int childrenSize = container.getChildren().size();
- final Rectangle containerRectangle = container.getBounds();
- final Rectangle resultBounds = new Rectangle(0, 0, containerRectangle.width(), containerRectangle.height() / childrenSize);
- this.prefSize = resultBounds.getSize();
- }
-
- public void setSelected(final boolean selected) {
- this.selected = selected;
- }
-
- @Override
- public void paintFigure(final Graphics graphics) {
- super.paintFigure(graphics);
- if(this.selected) {
- graphics.pushState();
- graphics.setForegroundColor(ColorConstants.black);
- graphics.setLineWidth(1);
- graphics.drawRectangle(getBounds().getShrinked(1, 1).resize(-1, -1));
- graphics.popState();
- }
- }
-
- public boolean isDisplayTimeRuler() {
- return this.displayTimeRuler;
- }
-
- public void setDisplayTimeRuler(final boolean visible) {
- this.displayTimeRuler = visible;
- }
-
- public LifelineVerticalLabel getLifelineLabelFigure() {
- return this.nameLabel;
- }
-
- public RectangleFigure getNameLabelContainerFigure() {
- return this.nameLabelContainerFigure;
- }
-
- public RectangleFigure getTimelineContainerFigure() {
- return this.timelineContainerFigure;
- }
-
- public RectangleFigure getTimeRulerContainerFigure() {
- return this.timeRulerContainerFigure;
- }
-
- public RectangleFigure getLifelineDataContainerFigure() {
- return this.lifelineDataContainerFigure;
- }
-
- public void setStereotypeDisplay(final String stereotypes, final Image image) {
- // TODO implement LifelineFigure#setStereotypeDisplay
- }
-
- public void setStereotypePropertiesInBrace(final String stereotypeProperties) {
- // TODO implement LifelineFigure#setStereotypePropertiesInBrace
- }
-
- public void setStereotypePropertiesInCompartment(final String stereotypeProperties) {
- // TODO implement LifelineFigure#setStereotypePropertiesInCompartment
- }
-
- public Label getStereotypesLabel() {
- return null;
- }
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/LifelineVerticalLabel.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/LifelineVerticalLabel.java
deleted file mode 100644
index 9db8f3be301..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/LifelineVerticalLabel.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
-public class LifelineVerticalLabel extends VerticalLabel implements ILabelFigure {
-
- private boolean selected;
-
- private boolean focus;
-
- @Override
- public Color getBackgroundColor() {
- if(this.selected) {
- return Display.getDefault().getSystemColor(SWT.COLOR_LIST_SELECTION);
- }
- // the transparency color for the label
- return ColorConstants.white;
- }
-
- @Override
- public Color getForegroundColor() {
- if(this.selected) {
- return Display.getDefault().getSystemColor(SWT.COLOR_LIST_SELECTION_TEXT);
- }
- return super.getForegroundColor();
- }
-
- @Override
- public String getText() {
- final String text = super.getText();
- // vertical label triggers IllegalArgumentException if text is empty
- return text == null || "".equals(text) ? " " : text; //$NON-NLS-1$//$NON-NLS-2$
- }
-
- public void setIcon(final Image icon) {
- // no icon
- }
-
- public Image getIcon() {
- return null;
- }
-
- public void setSelected(final boolean value) {
- this.selected = value;
- // display the blue background when the figure is selected
- setOpaque(value);
- updateImage();
- }
-
- public void setFocus(final boolean value) {
- this.focus = value;
- repaint();
- }
-
- @Override
- protected void paintFigure(final Graphics graphics) {
- super.paintFigure(graphics);
- if(this.focus) {
- graphics.drawFocus(getBounds().getResized(-1, -1));
- }
- }
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageAsyncFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageAsyncFigure.java
deleted file mode 100644
index 5a5cbb4eeab..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageAsyncFigure.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.PolylineDecoration;
-import org.eclipse.draw2d.RotatableDecoration;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-
-public class MessageAsyncFigure extends AbstractMessageFigure {
-
- @Override
- protected RotatableDecoration createTargetDecoration() {
- final PolylineDecoration df = new PolylineDecoration();
- df.setForegroundColor(getForegroundColor());
- final PointList pl = new PointList();
- final IMapMode mapMode = getMapMode();
- pl.addPoint(mapMode.DPtoLP(-2), mapMode.DPtoLP(2));
- pl.addPoint(mapMode.DPtoLP(0), mapMode.DPtoLP(0));
- pl.addPoint(mapMode.DPtoLP(-2), mapMode.DPtoLP(-2));
- df.setTemplate(pl);
- return df;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageCreateFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageCreateFigure.java
deleted file mode 100644
index f61206b6961..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageCreateFigure.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.PolylineDecoration;
-import org.eclipse.draw2d.RotatableDecoration;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-
-public class MessageCreateFigure extends AbstractMessageFigure {
-
- public MessageCreateFigure() {
- super();
- setLineStyle(Graphics.LINE_DASH);
- }
-
- @Override
- protected RotatableDecoration createTargetDecoration() {
- final PolylineDecoration df = new PolylineDecoration();
- df.setForegroundColor(getForegroundColor());
- final PointList pl = new PointList();
- final IMapMode mapMode = getMapMode();
- pl.addPoint(mapMode.DPtoLP(-2), mapMode.DPtoLP(2));
- pl.addPoint(mapMode.DPtoLP(0), mapMode.DPtoLP(0));
- pl.addPoint(mapMode.DPtoLP(-2), mapMode.DPtoLP(-2));
- df.setTemplate(pl);
- return df;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageDeleteFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageDeleteFigure.java
deleted file mode 100644
index 10499a9fd3e..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageDeleteFigure.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.PolygonDecoration;
-import org.eclipse.draw2d.RotatableDecoration;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-
-public class MessageDeleteFigure extends AbstractMessageFigure {
-
- @Override
- protected RotatableDecoration createTargetDecoration() {
- final PolygonDecoration df = new PolygonDecoration() {
-
- @Override
- protected void outlineShape(final Graphics g) {
- // no outline: this is a filled arrow
- }
- };
- df.setFill(true);
- df.setForegroundColor(getForegroundColor());
- df.setBackgroundColor(getForegroundColor());
- final PointList pl = new PointList();
- final IMapMode mapMode = getMapMode();
- pl.addPoint(mapMode.DPtoLP(-2), mapMode.DPtoLP(2));
- pl.addPoint(mapMode.DPtoLP(0), mapMode.DPtoLP(0));
- pl.addPoint(mapMode.DPtoLP(-2), mapMode.DPtoLP(-2));
- pl.addPoint(mapMode.DPtoLP(-2), mapMode.DPtoLP(2));
- df.setTemplate(pl);
- return df;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageFoundFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageFoundFigure.java
deleted file mode 100644
index 9b1219efc44..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageFoundFigure.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.PolylineDecoration;
-import org.eclipse.draw2d.RotatableDecoration;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-
-public class MessageFoundFigure extends AbstractMessageFigure {
-
- @Override
- protected RotatableDecoration createSourceDecoration() {
- final EllipseDecoration df = new EllipseDecoration();
- df.setPreferredSize(new Dimension(10, 10));
- return df;
- }
-
- @Override
- protected RotatableDecoration createTargetDecoration() {
- final PolylineDecoration df = new PolylineDecoration();
- df.setForegroundColor(getForegroundColor());
- final PointList pl = new PointList();
- final IMapMode mapMode = getMapMode();
- pl.addPoint(mapMode.DPtoLP(-2), mapMode.DPtoLP(2));
- pl.addPoint(mapMode.DPtoLP(0), mapMode.DPtoLP(0));
- pl.addPoint(mapMode.DPtoLP(-2), mapMode.DPtoLP(-2));
- df.setTemplate(pl);
- return df;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageLostFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageLostFigure.java
deleted file mode 100644
index 1d081643a43..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageLostFigure.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.ArrowLocator;
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.PolylineDecoration;
-import org.eclipse.draw2d.RotatableDecoration;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-
-public class MessageLostFigure extends AbstractMessageFigure {
-
- @Override
- protected RotatableDecoration createTargetDecoration() {
- final EllipseDecoration df = new EllipseDecoration();
- df.setPreferredSize(new Dimension(10, 10));
- // add the ellipse as a child figure
- add(df, new ArrowLocator(this, ConnectionLocator.TARGET));
-
- final PolylineDecoration arrow = new PolylineDecoration();
- arrow.setForegroundColor(getForegroundColor());
- final PointList pl = new PointList();
- final IMapMode mapMode = getMapMode();
- pl.addPoint(mapMode.DPtoLP(-2), mapMode.DPtoLP(2));
- pl.addPoint(mapMode.DPtoLP(0), mapMode.DPtoLP(0));
- pl.addPoint(mapMode.DPtoLP(-2), mapMode.DPtoLP(-2));
- arrow.setTemplate(pl);
-
- return arrow;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageReplyFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageReplyFigure.java
deleted file mode 100644
index dea5be003a8..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageReplyFigure.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.PolygonDecoration;
-import org.eclipse.draw2d.RotatableDecoration;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-
-public class MessageReplyFigure extends AbstractMessageFigure {
-
- public MessageReplyFigure() {
- super();
- setLineStyle(Graphics.LINE_DASH);
- }
-
- @Override
- protected RotatableDecoration createTargetDecoration() {
- final PolygonDecoration df = new PolygonDecoration();
- df.setFill(true);
- df.setForegroundColor(getForegroundColor());
- df.setBackgroundColor(getForegroundColor());
- final PointList pl = new PointList();
- final IMapMode mapMode = getMapMode();
- pl.addPoint(mapMode.DPtoLP(-2), mapMode.DPtoLP(2));
- pl.addPoint(mapMode.DPtoLP(0), mapMode.DPtoLP(0));
- pl.addPoint(mapMode.DPtoLP(-2), mapMode.DPtoLP(-2));
- pl.addPoint(mapMode.DPtoLP(-2), mapMode.DPtoLP(2));
- df.setTemplate(pl);
- return df;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageSyncFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageSyncFigure.java
deleted file mode 100644
index 7e50f113df1..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/MessageSyncFigure.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.PolygonDecoration;
-import org.eclipse.draw2d.RotatableDecoration;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-
-public class MessageSyncFigure extends AbstractMessageFigure {
-
- @Override
- protected RotatableDecoration createTargetDecoration() {
- final PolygonDecoration df = new PolygonDecoration() {
-
- @Override
- protected void outlineShape(final Graphics g) {
- // no outline: this is a filled arrow
- }
- };
- df.setFill(true);
- df.setForegroundColor(getForegroundColor());
- df.setBackgroundColor(getForegroundColor());
- final PointList pl = new PointList();
- final IMapMode mapMode = getMapMode();
- pl.addPoint(mapMode.DPtoLP(-2), mapMode.DPtoLP(2));
- pl.addPoint(mapMode.DPtoLP(0), mapMode.DPtoLP(0));
- pl.addPoint(mapMode.DPtoLP(-2), mapMode.DPtoLP(-2));
- pl.addPoint(mapMode.DPtoLP(-2), mapMode.DPtoLP(2));
- df.setTemplate(pl);
- return df;
- }
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/SmallSquareFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/SmallSquareFigure.java
deleted file mode 100644
index b837dd49b4e..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/SmallSquareFigure.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusUMLElementFigure;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure;
-import org.eclipse.swt.graphics.Image;
-
-public class SmallSquareFigure extends PapyrusNodeFigure implements IPapyrusUMLElementFigure {
-
- public static final int SQUARE_SIZE = 5;
-
- /** How many pixels the Figure must be moved upwards and leftwards in order to center it */
- public static final int RADIUS = SQUARE_SIZE / 2;
-
- public SmallSquareFigure() {
- super();
- }
-
- @Override
- public void paintFigure(final Graphics g) {
- g.pushState();
-
- final int middleX = this.bounds.x + this.bounds.width / 2;
- final int middleY = this.bounds.y + this.bounds.height / 2;
-
- g.setLineWidth(1);
-
- g.fillRectangle(middleX - SQUARE_SIZE / 2, middleY - SQUARE_SIZE / 2, SQUARE_SIZE, SQUARE_SIZE);
- g.popState();
- }
-
- @Override
- public Dimension getPreferredSize(final int wHint, final int hHint) {
- return new Dimension(SQUARE_SIZE, SQUARE_SIZE);
- }
-
- public void setStereotypeDisplay(final String stereotypes, final Image image) {
- // nothing
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/StateDefinitionFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/StateDefinitionFigure.java
deleted file mode 100644
index 502914419b3..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/StateDefinitionFigure.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-
-public class StateDefinitionFigure extends NodeNamedElementFigure {
-
- private boolean selected;
-
- public StateDefinitionFigure() {
- super();
- setShadow(false);
- setBorder(null);
- }
-
- public void setSelected(final boolean selected) {
- this.selected = selected;
- }
-
- public boolean isSelected() {
- return this.selected;
- }
-
- @Override
- public void paintFigure(final Graphics graphics) {
- paintClientArea(graphics);
- paintFocusRectangle(graphics);
- }
-
- @Override
- protected void paintClientArea(final Graphics graphics) {
- super.paintClientArea(graphics);
- }
-
- private void paintFocusRectangle(final Graphics g) {
- if(isSelected()) {
- g.pushState();
- g.setXORMode(true);
- g.setForegroundColor(ColorConstants.menuBackgroundSelected);
- g.setBackgroundColor(ColorConstants.menuForegroundSelected);
- final Rectangle b = getBounds();
- final Rectangle focusRect = new Rectangle(b.x, b.y, b.width - 1, b.height - 1);
- g.setLineWidth(1);
- g.drawFocus(focusRect);
- g.popState();
- }
- }
-
- @Override
- protected void paintBorder(final Graphics graphics) {
- // no border
- }
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/TimeRulerFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/TimeRulerFigure.java
deleted file mode 100644
index 9bd2d289b2d..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/TimeRulerFigure.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-public class TimeRulerFigure extends InvisibleRectangleFigure {
-
- @Override
- protected void outlineShape(final Graphics graphics) {
- final Rectangle bounds = getBounds();
- graphics.setForegroundColor(ColorConstants.gray);
- graphics.drawLine(bounds.getTopLeft(), bounds.getTopRight());
- }
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/TimingRulerFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/TimingRulerFigure.java
deleted file mode 100644
index 13ad551db62..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/TimingRulerFigure.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.papyrus.uml.diagram.timing.custom.layouts.FillLayout;
-
-public class TimingRulerFigure extends InvisibleRectangleFigure {
-
- private final InvisibleRectangleFigure tickContainer;
-
- public TimingRulerFigure() {
- super();
- this.tickContainer = new InvisibleRectangleFigure();
- this.tickContainer.setLayoutManager(new FillLayout());
- add(this.tickContainer);
- }
-
- public IFigure getTickContainerFigure() {
- return this.tickContainer;
- }
-
- public IFigure getFreeTimeRulerContainerFigure() {
- return this.tickContainer;
- }
-
- public IFigure getLinearTimeRulerContainerFigure() {
- return this.tickContainer;
- }
-
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/VerticalLabel.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/VerticalLabel.java
deleted file mode 100644
index 53d5565cd91..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/VerticalLabel.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- * 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
- *******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.AbstractImageFigure;
-import org.eclipse.draw2d.FigureUtilities;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.PaletteData;
-import org.eclipse.swt.graphics.Transform;
-import org.eclipse.swt.widgets.Display;
-
-public class VerticalLabel extends AbstractImageFigure {
-
- private Image img;
-
- private String myText;
-
- private Font myImageFont;
-
- private Color myForegroundColor;
-
- private Color myBackgroundColor;
-
- @Override
- protected void paintFigure(final Graphics g) {
- final Image image = getImage();
- if(image != null) {
- g.drawImage(image, this.bounds.x, this.bounds.y);
- }
- }
-
- /** {@inheritDoc} */
- @Override
- public void addNotify() {
- updateImage();
- super.addNotify();
- }
-
- /** {@inheritDoc} */
- @Override
- public void removeNotify() {
- if(this.img != null) {
- this.img.dispose();
- this.img = null;
- }
- super.removeNotify();
- }
-
- /** {@inheritDoc} */
- public Image getImage() {
- boolean update = false;
- if(this.myImageFont != getFont()) {
- this.myImageFont = getFont();
- update = true;
- }
- if(needsUpdate(this.myForegroundColor, getForegroundColor())) {
- this.myForegroundColor = getForegroundColor();
- update = true;
- }
- if(needsUpdate(this.myBackgroundColor, getBackgroundColor())) {
- this.myBackgroundColor = getBackgroundColor();
- update = true;
- }
-
- if(update) {
- updateImage();
- }
- return this.img;
- }
-
- /**
- * Updates the image with the string provided.
- *
- * @param text
- * to display
- */
- public void setText(final String text) {
- this.myText = text;
- updateImage();
- }
-
- public String getText() {
- return this.myText;
- }
-
- /**
- * Redraws / creates the image of the rotated String.
- *
- * @return image created
- */
- public void updateImage() {
- if(this.img != null) {
- this.img.dispose();
- this.img = null;
- }
- if(getText() == null || getFont() == null) {
- return;
- }
- setImage(createRotatedImageOfString(getText(), getFont(), getForegroundColor(), getBackgroundColor(), isOpaque()));
- }
-
- private void setImage(final Image image) {
- if(this.img == image) {
- return;
- }
- this.img = image;
- revalidate();
- notifyImageChanged();
- repaint();
- }
-
- public static Image createRotatedImageOfString(final String string, final Font font, final Color foreground, final Color background, final boolean opaque) {
- final Display display = Display.getDefault();
-
- final FontMetrics metrics = FigureUtilities.getFontMetrics(font);
- final Dimension strSize = FigureUtilities.getStringExtents(string, font);
-
- final int height = strSize.width;
- final int width = metrics.getAscent() + metrics.getDescent() + metrics.getLeading();
-
- final ImageData data = new ImageData(width, height, 32, new PaletteData(0x0000ff00, 0x00ff0000, 0xff000000));
- if(!opaque) {
- data.transparentPixel = data.palette.getPixel(background.getRGB());
- }
-
- final Image image = new Image(display, data);
- final GC gc = new GC(image);
- gc.setFont(font);
- gc.setBackground(background);
- gc.fillRectangle(image.getBounds());
- gc.setForeground(foreground);
- final Transform transform = new Transform(Display.getCurrent());
- transform.translate(0, height);
- transform.rotate(-90);
- gc.setTransform(transform);
- gc.drawString(string, 0, 0, true);
- gc.dispose();
- return image;
- }
-
- private static final boolean needsUpdate(final Color cachedColor, final Color actualColor) {
- if(cachedColor == null && actualColor == null) {
- return false;
- }
- return cachedColor == null || !cachedColor.equals(actualColor);
- }
-
- @Override
- public Dimension getPreferredSize(final int wHint, final int hHint) {
- if(this.img != null) {
- return new Rectangle(this.img.getBounds()).getSize();
- }
- return super.getPreferredSize(wHint, hHint);
- }
-}
diff --git a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/VerticalMarkFigure.java b/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/VerticalMarkFigure.java
deleted file mode 100644
index 29859a226a6..00000000000
--- a/incoming/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/VerticalMarkFigure.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.timing.custom.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusUMLElementFigure;
-import org.eclipse.swt.graphics.Image;
-
-public class VerticalMarkFigure extends org.eclipse.draw2d.Figure implements IPapyrusUMLElementFigure {
-
- public static final int PREFERRED_WIDTH = 5;
-
- public static final int PREFERRED_HEIGHT = 12;
-
- public VerticalMarkFigure() {
- super();
- }
-
- @Override
- protected void paintFigure(final Graphics g) {
- super.paintFigure(g);
- g.pushState();
- final int middleX = this.bounds.x + this.bounds.width / 2;
- g.setLineWidth(3);
- g.drawLine(middleX, this.bounds.y, middleX, this.bounds.y + this.bounds.height);
- g.popState();
- }
-
- @Override
- public Dimension getPreferredSize(final int wHint, final int hHint) {
- return new Dimension(PREFERRED_WIDTH, PREFERRED_HEIGHT);
- }
-
- public void setStereotypeDisplay(final String stereotypes, final Image image) {
- // TODO Auto-generated method stub
-
- }
-
-}

Back to the top