commit acf4620e8f89b4c112e57233d4e23c626e87c63d
author Alexander Zakusylo <zakgof@gmail.com> Fri Nov 16 14:48:09 2018 +0200
committer Andrey Loskutov <loskutov@gmx.de> Mon Nov 19 08:04:12 2018 -0500
tree da1ac075c6b50cdb7686d8ffe0325f3040bca11d
parent 177d800acd913c62eb4c5f0143a8a9e0aea55c7f

Bug 541204: Closing a custom perspective removes minimized views from
its child perspectives

Change-Id: Idb22b58f9d6ed9e83cbbdae8fb85e35d318825d1
Signed-off-by: Alexander Zakusylo <zakgof@gmail.com>

bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ModelServiceImpl.java

diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ModelServiceImpl.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ModelServiceImpl.java
index aa1ccd4..84ee395 100644
--- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ModelServiceImpl.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ModelServiceImpl.java
@@ -929,6 +929,7 @@
 		}
 
 		// Remove any minimized stacks for this perspective
+		String perspectiveSuffix = "(" + persp.getElementId() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
 		List<MTrimBar> bars = findElements(window, null, MTrimBar.class, null);
 		List<MToolControl> toRemove = new ArrayList<>();
 		for (MTrimBar bar : bars) {
@@ -937,7 +938,7 @@
 					continue;
 				}
 				String id = barKid.getElementId();
-				if (id != null && id.contains(persp.getElementId())) {
+				if (id != null && id.contains(perspectiveSuffix)) {
 					toRemove.add((MToolControl) barKid);
 				}
 			}