diff options
| author | Florian Barbin | 2017-09-14 14:46:58 +0000 |
|---|---|---|
| committer | Florian Barbin | 2017-09-15 13:17:40 +0000 |
| commit | 2248d76f6c4fcc92457765c1274a436ce1adb1b6 (patch) | |
| tree | 379b7141ed364fdd6dc77d3e6d2c343d1ba79453 | |
| parent | e65a98deb661e81239613231cbab291d76e21736 (diff) | |
| download | org.eclipse.sirius-2248d76f6c4fcc92457765c1274a436ce1adb1b6.tar.gz org.eclipse.sirius-2248d76f6c4fcc92457765c1274a436ce1adb1b6.tar.xz org.eclipse.sirius-2248d76f6c4fcc92457765c1274a436ce1adb1b6.zip | |
[519635] Fixes wrong property id test
Bug: 519635
Change-Id: Ic44fec03b092443e7829ef85d50ae0cba344fe88
Signed-off-by: Florian Barbin <florian.barbin@obeo.fr>
| -rw-r--r-- | plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/filter/SiriusTabDescriptorFilter.java | 10 |
1 files changed, 5 insertions, 5 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 17d6cc2b65..cb936cd92e 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 @@ -28,13 +28,13 @@ public class SiriusTabDescriptorFilter implements IEEFTabDescriptorFilter { * 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 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$ + private static final String DEFAULT_TAB_IDS = "org.eclipse.sirius.ui.tools.views.model.explorer.tab"; //$NON-NLS-1$ /** * Id of the semantic tab. */ - private static final String SEMANTIC_TAB_ID = "property.tab.semantic"; //$NON-NLS-1$ + private static final Collection<String> SEMANTIC_TAB_ID = Arrays.asList("property.tab.semantic", //$NON-NLS-1$ + "org.eclipse.sirius.table.ui.tab.semantic", "org.eclipse.sirius.tree.ui.tab.semantic"); //$NON-NLS-1$ //$NON-NLS-2$ @Override public boolean filter(IEEFTabDescriptor tabDescriptor) { @@ -42,9 +42,9 @@ public class SiriusTabDescriptorFilter implements IEEFTabDescriptorFilter { // Filter the default tab existing in the properties view when an // element is selected from the model explorer and the semantic tab when // an element is selected from a Sirius editor - if (SEMANTIC_TAB_ID.equals(tabDescriptor.getId())) { + if (SEMANTIC_TAB_ID.contains(tabDescriptor.getId())) { result = SiriusPropertiesCorePreferences.INSTANCE.isSemanticTabFiltered(); - } else if (DEFAULT_TAB_IDS.contains(tabDescriptor.getId())) { + } else if (DEFAULT_TAB_IDS.equals(tabDescriptor.getId())) { result = SiriusPropertiesCorePreferences.INSTANCE.isDefaultTabFiltered(); } |
