Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Maggi2017-01-11 16:20:21 +0000
committerGerrit Code Review @ Eclipse.org2017-01-12 17:08:54 +0000
commitd66f1398d16037f2a11607705d175c660d8be1ac (patch)
treea948622fb1cdbb9022285f746f58f513c8f8b4e5
parenta99caef7ea5306947c2f08f36c5fdb73b6f41e9f (diff)
downloadorg.eclipse.papyrus-d66f1398d16037f2a11607705d175c660d8be1ac.tar.gz
org.eclipse.papyrus-d66f1398d16037f2a11607705d175c660d8be1ac.tar.xz
org.eclipse.papyrus-d66f1398d16037f2a11607705d175c660d8be1ac.zip
Bug 510282 - [BPMN] Remove dependency to GMF-T
- remove unused dependencies - org.eclipse.gmf.tooling.runtime - org.eclipse.gmf.runtime.diagram.core - remove unused class LaneFigure Change-Id: I0c2e2fd2051e9d809d2fce87cbdf05ab9b1aa39b Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
-rw-r--r--extraplugins/EFFBD/org.eclipse.papyrus.effbd/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/src/org/eclipse/papyrus/bpmn/diagram/common/figures/LaneFigure.java124
-rw-r--r--extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/META-INF/MANIFEST.MF1
4 files changed, 0 insertions, 129 deletions
diff --git a/extraplugins/EFFBD/org.eclipse.papyrus.effbd/META-INF/MANIFEST.MF b/extraplugins/EFFBD/org.eclipse.papyrus.effbd/META-INF/MANIFEST.MF
index 3369582e04b..28ea296cb59 100644
--- a/extraplugins/EFFBD/org.eclipse.papyrus.effbd/META-INF/MANIFEST.MF
+++ b/extraplugins/EFFBD/org.eclipse.papyrus.effbd/META-INF/MANIFEST.MF
@@ -11,12 +11,10 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",
org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
org.eclipse.papyrus.infra.types.core;bundle-version="1.1.0",
- org.eclipse.gmf.runtime.diagram.core;bundle-version="1.7.0",
org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.1.0",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
org.eclipse.gef,
- org.eclipse.gmf.tooling.runtime;bundle-version="3.3.0",
org.eclipse.papyrus.infra.gmfdiag.commands,
org.eclipse.papyrus.infra.core;bundle-version="1.1.3",
org.eclipse.papyrus.infra.newchild;bundle-version="1.1.3",
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/META-INF/MANIFEST.MF b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/META-INF/MANIFEST.MF
index dec2ded14c3..5fc43152c06 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/META-INF/MANIFEST.MF
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/META-INF/MANIFEST.MF
@@ -10,9 +10,7 @@ Require-Bundle: org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.2.0",
org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",
org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.2.0",
- org.eclipse.gmf.tooling.runtime;bundle-version="3.2.0",
org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.core,
org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
Export-Package: org.eclipse.papyrus.bpmn.diagram.common,
org.eclipse.papyrus.bpmn.diagram.common.commands,
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/src/org/eclipse/papyrus/bpmn/diagram/common/figures/LaneFigure.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/src/org/eclipse/papyrus/bpmn/diagram/common/figures/LaneFigure.java
deleted file mode 100644
index a4db7c562e8..00000000000
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/src/org/eclipse/papyrus/bpmn/diagram/common/figures/LaneFigure.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST and others.
- *
- * 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:
- * CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.bpmn.diagram.common.figures;
-
-import java.util.List;
-
-import org.eclipse.draw2d.AbstractLayout;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Graphics;
-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.gmf.tooling.runtime.draw2d.labels.VerticalLabel;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure;
-
-/**
- * @author Juan Cadavid
- *
- */
-public class LaneFigure extends PapyrusNodeFigure {
- private VerticalLabel nameLabel;
- private Figure nameLabelContainerFigure;
- private Figure laneContentContainerFigure;
- protected final int LABEL_WIDTH = 30;
- private boolean selected;
-
- public LaneFigure() {
- 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.equals(nameLabelContainerFigure)) {
- child.setBounds(new Rectangle(clientArea.x, clientArea.y, LABEL_WIDTH, clientArea.height));
- } else if (child.equals(laneContentContainerFigure)) {
- child.setBounds(new Rectangle(clientArea.x + LABEL_WIDTH, clientArea.y, clientArea.width - LABEL_WIDTH, clientArea.height));
- }
- }
- }
-
- @Override
- protected Dimension calculatePreferredSize(final IFigure container, final int wHint, final int hHint) {
- return new Dimension(-1, -1);
- }
- });
- }
-
- private void createContents() {
- // TODO Auto-generated method stub
- this.nameLabelContainerFigure = new RectangleFigure();
- add(this.nameLabelContainerFigure);
-
- this.nameLabel = new VerticalLabel();
- this.nameLabelContainerFigure.add(this.nameLabel);
- this.nameLabelContainerFigure.setLayoutManager(new CenterLayout());
-
- laneContentContainerFigure = new RectangleFigure();
-// laneContentContainerFigure.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(laneContentContainerFigure);
- }
-
- @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();
- }
- }
-}
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/META-INF/MANIFEST.MF b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/META-INF/MANIFEST.MF
index 71f82f78278..2015d4aae88 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/META-INF/MANIFEST.MF
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/META-INF/MANIFEST.MF
@@ -17,7 +17,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.2.0",
org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",
org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.2.0",
- org.eclipse.gmf.tooling.runtime;bundle-version="3.2.0",
org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
org.eclipse.gmf.runtime.diagram.core,
org.eclipse.papyrus.infra.gmfdiag.css

Back to the top