Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2017-08-10 09:06:56 +0000
committervincent lorenzo2017-08-11 13:46:24 +0000
commit01f17b31d3a87ffe54a6389961988267e53dbdc5 (patch)
tree6c5e3e479c0f762bddd1e977dce3c7ebc69f6703 /plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu
parentbb7c759deebb545b8196db122d1d9edd5880a4c4 (diff)
downloadorg.eclipse.papyrus-01f17b31d3a87ffe54a6389961988267e53dbdc5.tar.gz
org.eclipse.papyrus-01f17b31d3a87ffe54a6389961988267e53dbdc5.tar.xz
org.eclipse.papyrus-01f17b31d3a87ffe54a6389961988267e53dbdc5.zip
Bug 520807: [All Diagrams] The dialog for Manage Connector Labels shows line without label role
Change-Id: Id3ea4d64ca83a8dd5ae1ae790b5064dc4e003e29 Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu')
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/ShowHideLabelsAction.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/ShowHideLabelsAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/ShowHideLabelsAction.java
index f5e486a924b..2f9adc30aa1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/ShowHideLabelsAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/ShowHideLabelsAction.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2011, 2014 CEA LIST and others.
+ * Copyright (c) 2011, 2014, 2017 CEA LIST and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -10,7 +10,7 @@
* Contributors:
* Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
* Sebastien Gabel (Esterel Technologies) - Fix access to the diagram edit part when called outside of the diagram
- *
+ * Vincent Lorenzo (CEA LIST) - Bug 520807
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.menu.actions;
@@ -198,7 +198,10 @@ public class ShowHideLabelsAction extends AbstractGraphicalParametricAction {
if (!isCompartment(node) && (nodeType != null && nodeType.length() > 0)) {
LayoutConstraint lContraint = node.getLayoutConstraint();
if (lContraint instanceof Location) {
- return true;
+ EditPart ep1 = EditPartService.getInstance().createGraphicEditPart(node);
+
+ return ep1 instanceof ILabelRoleProvider; // see Bug 520807 : we only show view which the editpart implements ILabelRoleProvider
+ // return true;
}
}
}

Back to the top