commit 2e5e6ec2b3792fa46634cf16f3bf614a008e3eca
author Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com> Fri Apr 23 11:57:21 2021 +0530
committer Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com> Fri Apr 23 03:24:36 2021 -0400
tree 99445a9a4cde5cba29efa5fa2bdd3b3330a64939
parent cee2d22874006002044449d06dcc8602a68c7547

Bug 573098 - Switching perspective gives ClassCastException

Change-Id: I8b68872ecdafa1ed5046aeb2f6869b9070eabd02
Signed-off-by: Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui/+/179713
Tested-by: Platform Bot <platform-bot@eclipse.org>

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java

diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java
index e97ba74..b318217 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2017 IBM Corporation and others.
+ * Copyright (c) 2011, 2021 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -156,7 +156,8 @@
 				return;
 			}
 
-			MToolBar toolBar = (MToolBar) modelService.find(item.getId(), window);
+			List<MToolBar> toolbars = modelService.findElements(window, item.getId(), MToolBar.class);
+			MToolBar toolBar = toolbars.isEmpty() ? null : toolbars.get(0);
 			boolean tbFound = toolBar != null;
 			if (!tbFound) {
 				toolBar = modelService.createModelElement(MToolBar.class);