Merge pull request #1053 from eclipse-passage/1049-2

#1049

bundles/org.eclipse.passage.loc.workbench/OSGI-INF/l10n/bundle.properties

@@ -1,6 +1,6 @@
 #Properties file for org.eclipse.passage.loc.workbench
 ###############################################################################
-# Copyright (c) 2018, 2021 ArSysOp and others
+# Copyright (c) 2018, 2022 ArSysOp and others
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -14,7 +14,7 @@
 
 Bundle-Name = Passage LOC Workbench
 Bundle-Vendor = Eclipse Passage
-Bundle-Copyright = Copyright (c) 2018, 2021 ArSysOp and others.\n\
+Bundle-Copyright = Copyright (c) 2018, 2022 ArSysOp and others.\n\
 \n\
 This program and the accompanying materials are made\n\
 available under the terms of the Eclipse Public License 2.0\n\

bundles/org.eclipse.passage.loc.workbench/src/org/eclipse/passage/loc/workbench/LocWokbench.java

@@ -109,16 +109,22 @@ public static void loadDomainResource(IEclipseContext eclipseContext, String dom
 		}
 	}
 
-	public static void switchPerspective(IEclipseContext eclipseContext, String perspectiveId) {
-		EPartService partService = eclipseContext.get(EPartService.class);
+	public static void switchPerspective(IEclipseContext context, String perspectiveId) {
+		EPartService partService = context.get(EPartService.class);
+		if (partService == null) {
+			return;
+		}
 		Optional<MPerspective> switched = partService.switchPerspective(perspectiveId);
 		if (switched.isPresent()) {
 			MPerspective perspective = switched.get();
 			String label = perspective.getLocalizedLabel();
-			IApplicationContext applicationContext = eclipseContext.get(IApplicationContext.class);
-			String brandingName = applicationContext.getBrandingName();
-			String title = brandingName + ' ' + '-' + ' ' + label;
-			MWindow window = eclipseContext.get(MWindow.class);
+			IApplicationContext application = context.get(IApplicationContext.class);
+			if (application == null) {
+				return;
+			}
+			String branding = application.getBrandingName();
+			String title = branding + ' ' + '-' + ' ' + label;
+			MWindow window = context.get(MWindow.class);
 			window.setLabel(title);
 		}
 	}