aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens ├╝bler2013-09-25 09:56:51 (EDT)
committerPaul Webster2013-11-19 13:11:15 (EST)
commit0aa6fcb3c3bd2c13d15a96d964d0f0df44f954c7 (patch)
tree9be59411ef78461e8f8f876fa8e53bc7c701a7b6
parentc2c6d962e852f5161395a0712161bbafa4e9fd78 (diff)
downloadeclipse.platform.ui-0aa6fcb3c3bd2c13d15a96d964d0f0df44f954c7.zip
eclipse.platform.ui-0aa6fcb3c3bd2c13d15a96d964d0f0df44f954c7.tar.gz
eclipse.platform.ui-0aa6fcb3c3bd2c13d15a96d964d0f0df44f954c7.tar.bz2
Bug 411577 - [Contributions] Customize Perspective has hiding conflictsrefs/changes/79/18579/1
for toolbars and menus Add the prefix to the contains check. Change-Id: I1f132119a1d05669647be6f4ceda17f9fa896b26 Signed-off-by: Jens ├╝bler <kuebler@aquintos.com>
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java
index ad0f5b1..81bf243 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java
@@ -3350,7 +3350,7 @@ public class CustomizePerspectiveDialog extends TrayDialog {
// Remove explicitly 'visible' elements from the current list
for (Iterator<String> iterator = changedAndVisible.iterator(); iterator.hasNext();) {
String id = iterator.next();
- if (id != null && currentHidden.contains(id)) {
+ if (id != null && currentHidden.contains(prefix + id)) {
hasChanges = true;
((WorkbenchPage) window.getActivePage()).removeHiddenItems(prefix + id);
}
@@ -3359,7 +3359,7 @@ public class CustomizePerspectiveDialog extends TrayDialog {
// Add explicitly 'hidden' elements to the current list
for (Iterator<String> iterator = changedAndInvisible.iterator(); iterator.hasNext();) {
String id = iterator.next();
- if (id != null && !currentHidden.contains(id)) {
+ if (id != null && !currentHidden.contains(prefix + id)) {
hasChanges = true;
((WorkbenchPage) window.getActivePage()).addHiddenItems(prefix + id);
}