Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpguilet2017-06-19 15:07:47 +0000
committerpguilet2017-06-21 15:51:52 +0000
commit966ba9683d6c921b5f521349b7299bf49bdc1b16 (patch)
treedadcd78b17b9a423106307ca81085f41aa161e2f
parenta837990614a796bb02fa29924ff2a083aec5898e (diff)
downloadorg.eclipse.sirius-966ba9683d6c921b5f521349b7299bf49bdc1b16.tar.gz
org.eclipse.sirius-966ba9683d6c921b5f521349b7299bf49bdc1b16.tar.xz
org.eclipse.sirius-966ba9683d6c921b5f521349b7299bf49bdc1b16.zip
[518009] Viewpoint items in representations bloc are grayed out
The viewpoint items and their sub items are now grayed out when the viewpoint is deactivated. Bug: 518009 Change-Id: I38951776da31035f83d8604ce847fc1fc0b6037b Signed-off-by: pguilet <pierre.guilet@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SiriusRepresentationWithInactiveStatusLabelProvider.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SiriusRepresentationWithInactiveStatusLabelProvider.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SiriusRepresentationWithInactiveStatusLabelProvider.java
index 6e616411b1..10bffcc53c 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SiriusRepresentationWithInactiveStatusLabelProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SiriusRepresentationWithInactiveStatusLabelProvider.java
@@ -15,6 +15,7 @@ import java.text.MessageFormat;
import org.eclipse.sirius.ui.tools.api.color.VisualBindingManager;
import org.eclipse.sirius.ui.tools.internal.viewpoint.ViewpointHelper;
import org.eclipse.sirius.ui.tools.internal.views.common.item.RepresentationDescriptionItemImpl;
+import org.eclipse.sirius.ui.tools.internal.views.common.item.RepresentationItemImpl;
import org.eclipse.sirius.ui.tools.internal.views.common.item.ViewpointItemImpl;
import org.eclipse.sirius.viewpoint.provider.Messages;
import org.eclipse.swt.graphics.Color;
@@ -33,12 +34,14 @@ public class SiriusRepresentationWithInactiveStatusLabelProvider extends SiriusR
// the session of the current opened editor.
Color result = null;
if (element instanceof ViewpointItemImpl) {
-
ViewpointItemImpl viewpointItem = (ViewpointItemImpl) element;
-
if (!ViewpointHelper.isViewpointEnabledInSession(viewpointItem.getSession().get(), viewpointItem.getViewpoint())) {
result = VisualBindingManager.getDefault().getColorFromName("gray"); //$NON-NLS-1$
}
+ } else if (element instanceof RepresentationDescriptionItemImpl) {
+ result = getForeground(((RepresentationDescriptionItemImpl) element).getParent());
+ } else if (element instanceof RepresentationItemImpl) {
+ result = getForeground(((RepresentationItemImpl) element).getParent());
}
if (result == null) {
result = super.getForeground(element);

Back to the top