[527109] Make hide action in tabbar usable for visible element

- The hide action in tabbar is now usable when visibility is active and
the selected diagram element is not hidden.

Bug: 527109
Change-Id: Id03eeda5a701300599acd4e848c61cbae5f6b71b
Signed-off-by: Pierre Guilet <pierre.guilet@obeo.fr>

1 files changed, 3 insertions, 1 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/visibility/HideDDiagramElementAction.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/visibility/HideDDiagramElementAction.java
index 020ccabf95..8f8f361d06 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/visibility/HideDDiagramElementAction.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/visibility/HideDDiagramElementAction.java
@@ -40,6 +40,7 @@ import org.eclipse.sirius.diagram.DDiagramElementContainer;
 import org.eclipse.sirius.diagram.business.api.diagramtype.DiagramTypeDescriptorRegistry;
 import org.eclipse.sirius.diagram.business.api.diagramtype.IDiagramDescriptionProvider;
 import org.eclipse.sirius.diagram.business.api.diagramtype.IDiagramTypeDescriptor;
+import org.eclipse.sirius.diagram.business.api.query.DDiagramElementQuery;
 import org.eclipse.sirius.diagram.business.internal.query.DDiagramElementContainerExperimentalQuery;
 import org.eclipse.sirius.diagram.tools.api.command.IDiagramCommandFactory;
 import org.eclipse.sirius.diagram.tools.api.command.IDiagramCommandFactoryProvider;
@@ -153,7 +154,8 @@ public class HideDDiagramElementAction extends Action implements IObjectActionDe
             if (!ddes.isEmpty()) {
                 DDiagram parentDiagram = ddes.iterator().next().getParentDiagram();
                 Predicate<DDiagramElement> allowsHideReveal = allowsHideReveal(parentDiagram);
-                return Iterables.all(ddes, allowsHideReveal) && !parentDiagram.isIsInShowingMode();
+                Predicate<DDiagramElement> notDirectlyHidden = dde -> !new DDiagramElementQuery(dde).isHidden();
+                return Iterables.all(ddes, Predicates.and(allowsHideReveal, notDirectlyHidden));
             }
 
         }