[519635] Support filtering the semantic tab in tables & trees

Bug: 519635
Change-Id: I84c3c4961f07e473ead9c0802c5b91f901088aff
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

1 files changed, 8 insertions, 3 deletions

diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/filter/SiriusTabDescriptorFilter.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/filter/SiriusTabDescriptorFilter.java
index 96a91b42c0..17d6cc2b65 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/filter/SiriusTabDescriptorFilter.java
+++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/filter/SiriusTabDescriptorFilter.java
@@ -10,6 +10,9 @@
  *******************************************************************************/
 package org.eclipse.sirius.ui.properties.internal.filter;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 import org.eclipse.eef.properties.ui.api.IEEFTabDescriptor;
 import org.eclipse.eef.properties.ui.api.IEEFTabDescriptorFilter;
 import org.eclipse.sirius.properties.core.api.preferences.SiriusPropertiesCorePreferences;
@@ -22,9 +25,11 @@ import org.eclipse.sirius.properties.core.api.preferences.SiriusPropertiesCorePr
 public class SiriusTabDescriptorFilter implements IEEFTabDescriptorFilter {
 
     /**
-     * Id of the default tab.
+     * Ids of the default tab. For historical reasons the ids used by the different dialects (diagrams, tables & trees)
+     * are not the same, so we must consider all of them.
      */
-    private static final String DEFAULT_TAB_ID = "org.eclipse.sirius.ui.tools.views.model.explorer.tab"; //$NON-NLS-1$
+    private static final Collection<String> DEFAULT_TAB_IDS = Arrays.asList("org.eclipse.sirius.ui.tools.views.model.explorer.tab", //$NON-NLS-1$
+            "org.eclipse.sirius.table.ui.tab.semantic", "org.eclipse.sirius.tree.ui.tab.semantic"); //$NON-NLS-1$ //$NON-NLS-2$
 
     /**
      * Id of the semantic tab.
@@ -39,7 +44,7 @@ public class SiriusTabDescriptorFilter implements IEEFTabDescriptorFilter {
         // an element is selected from a Sirius editor
         if (SEMANTIC_TAB_ID.equals(tabDescriptor.getId())) {
             result = SiriusPropertiesCorePreferences.INSTANCE.isSemanticTabFiltered();
-        } else if (DEFAULT_TAB_ID.equals(tabDescriptor.getId())) {
+        } else if (DEFAULT_TAB_IDS.contains(tabDescriptor.getId())) {
             result = SiriusPropertiesCorePreferences.INSTANCE.isDefaultTabFiltered();
         }