diff options
| author | Céline Janssens | 2014-09-24 12:56:03 +0000 |
|---|---|---|
| committer | Camille Letavernier | 2014-09-25 15:01:11 +0000 |
| commit | e6eb6f57f909639a895b6059ac3ca8c8cb5d4de6 (patch) | |
| tree | abfbb066fecdda2b6aefffd73167e28ae17c2b5a | |
| parent | b7711519e701eff820eb3826adde16d805c2fd7b (diff) | |
| download | org.eclipse.papyrus-e6eb6f57f909639a895b6059ac3ca8c8cb5d4de6.tar.gz org.eclipse.papyrus-e6eb6f57f909639a895b6059ac3ca8c8cb5d4de6.tar.xz org.eclipse.papyrus-e6eb6f57f909639a895b6059ac3ca8c8cb5d4de6.zip | |
440230: [All Diagrams] Add Margins to the Labels
https://bugs.eclipse.org/bugs/show_bug.cgi?id=440230
-ActivityAsInteractionFigure refers to a PapyrusWrappingLabel
-InteractionUseFigure refers to a PapyrusWrappingLabel
Change-Id: I31779de0f9f9cfcdf2befb5c8bf66dba40236a98
Signed-off-by: Céline Janssens <Celine.Janssens@all4tec.net>
2 files changed, 12 insertions, 7 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/ActivityAsInteractionFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/ActivityAsInteractionFigure.java index ed63df3e3a1..3c6efdf59e5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/ActivityAsInteractionFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/ActivityAsInteractionFigure.java @@ -6,6 +6,8 @@ * 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
+ *
+ * Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 440230 : Label Margin
*
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.interactionoverview.figures;
@@ -22,13 +24,14 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gmf.runtime.diagram.ui.figures.ShapeCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
import org.eclipse.papyrus.uml.diagram.activity.figures.ActivityFigure;
import org.eclipse.papyrus.uml.diagram.common.draw2d.InteractionFigure;
import org.eclipse.papyrus.uml.diagram.common.draw2d.LeftToolbarLayout;
public class ActivityAsInteractionFigure extends ActivityFigure {
- private WrappingLabel interactionHeader;
+ private PapyrusWrappingLabel interactionHeader;
private RectangleFigure interactionLabelContainer;
@@ -56,9 +59,8 @@ public class ActivityAsInteractionFigure extends ActivityFigure { }
protected RectangleFigure createInteractionFigureHeader() {
- this.interactionHeader = new WrappingLabel() {
+ this.interactionHeader = new PapyrusWrappingLabel() {
- @Override
public Dimension getPreferredSize(final int wHint, final int hHint) {
final Dimension preferredSize = super.getPreferredSize(wHint, hHint);
if (preferredSize.width == 0) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/InteractionUseFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/InteractionUseFigure.java index abd32e5e68d..81cbabb9f60 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/InteractionUseFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/figures/InteractionUseFigure.java @@ -6,6 +6,8 @@ * 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
+ *
+ * Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 440230 : Label Margin
*
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.interactionoverview.figures;
@@ -22,6 +24,7 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gmf.runtime.diagram.ui.figures.ShapeCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
import org.eclipse.papyrus.uml.diagram.activity.figures.CallBehaviorActionFigure;
import org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout;
import org.eclipse.papyrus.uml.diagram.common.draw2d.InteractionFigure;
@@ -31,7 +34,7 @@ public class InteractionUseFigure extends CallBehaviorActionFigure { protected static String HEADER_NAME = "Ref";
- protected WrappingLabel interactionHeader;
+ protected PapyrusWrappingLabel interactionHeader;
protected RectangleFigure interactionLabelContainer;
@@ -80,7 +83,7 @@ public class InteractionUseFigure extends CallBehaviorActionFigure { protected RectangleFigure createContentPane() {
- interactionNameLabel = new WrappingLabel();
+ interactionNameLabel = new PapyrusWrappingLabel();
interactionContentPane = new RectangleFigure();
// Margin allow to add message easily
interactionContentPane.setBorder(new MarginBorder(5, 5, 5, 5));
@@ -92,9 +95,9 @@ public class InteractionUseFigure extends CallBehaviorActionFigure { }
protected RectangleFigure createInteractionFigureHeader() {
- this.interactionHeader = new WrappingLabel() {
+ this.interactionHeader = new PapyrusWrappingLabel() {
- @Override
+
public Dimension getPreferredSize(final int wHint, final int hHint) {
final Dimension preferredSize = super.getPreferredSize(wHint, hHint);
if (preferredSize.width == 0) {
|