Show product/application info in Manage Default Theme dialog

The dialog now displays which product or application the default theme
applies to, making it transparent that theme defaults are scoped.

Examples:
- With product: 'Current default theme for Eclipse SDK (org.eclipse.sdk.ide): Dark'
- Without product: 'Current default theme for org.eclipse.ui.ide.workbench (org.eclipse.ui.ide.workbench): Dark'
- Without either: falls back to unscoped messages

Author: vogella

bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/E4Application.java

@@ -317,19 +317,20 @@ private void setCSSContextVariables(IApplicationContext applicationContext, IEcl
 				: getArgValue(E4Application.THEME_ID, applicationContext, false);
 
 		if (!themeId.isPresent() && !cssURI.isPresent()) {
-			IEclipsePreferences themeNode = UserScope.INSTANCE
-					.getNode("org.eclipse.e4.ui.css.swt.theme");
-			String productOrAppId = getProductOrApplicationId();
-			String defaultThemeId = null;
-			if (productOrAppId != null) {
-				defaultThemeId = themeNode.node(productOrAppId).get("themeid", null);
-			}
-			if (defaultThemeId == null) {
-				defaultThemeId = DEFAULT_THEME_ID;
+			String defaultThemeId = getProductScopedThemeId();
+			if (defaultThemeId != null) {
+				context.set(E4Application.THEME_ID, defaultThemeId);
+			} else {
+				context.set(E4Application.THEME_ID, DEFAULT_THEME_ID);
 			}
-			context.set(E4Application.THEME_ID, defaultThemeId);
 		} else {
-			context.set(E4Application.THEME_ID, themeId.orElseGet(() -> null));
+			// Check if user has overridden the branding/command-line theme
+			String userThemeId = getProductScopedThemeId();
+			if (userThemeId != null) {
+				context.set(E4Application.THEME_ID, userThemeId);
+			} else {
+				context.set(E4Application.THEME_ID, themeId.orElseGet(() -> null));
+			}
 		}
 
 
@@ -423,6 +424,20 @@ private static String getProductOrApplicationId() {
 		return System.getProperty("eclipse.application"); //$NON-NLS-1$
 	}
 
+	/**
+	 * Returns the user's product-scoped theme preference, or {@code null} if
+	 * none is set.
+	 */
+	private static String getProductScopedThemeId() {
+		String productOrAppId = getProductOrApplicationId();
+		if (productOrAppId != null) {
+			IEclipsePreferences themeNode = UserScope.INSTANCE
+					.getNode("org.eclipse.e4.ui.css.swt.theme");
+			return themeNode.node(productOrAppId).get("themeid", null);
+		}
+		return null;
+	}
+
 	/**
 	 * Finds an argument's value in the app's command line arguments, branding,
 	 * and system properties

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/WorkbenchMessages.java

@@ -55,7 +55,9 @@ public class WorkbenchMessages extends NLS {
 	public static String ThemeDefault_dialogTitle;
 	public static String ThemeDefault_description;
 	public static String ThemeDefault_currentDefault;
+	public static String ThemeDefault_currentDefaultUnscoped;
 	public static String ThemeDefault_noDefault;
+	public static String ThemeDefault_noDefaultUnscoped;
 	public static String ThemeDefault_setDefault;
 	public static String ThemeDefault_removeDefault;
 

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/dialogs/ViewsPreferencePage.java

@@ -359,11 +359,24 @@ private void openManageDefaultThemeDialog() {
 			}
 		}
 
+		String productDisplayName = getProductDisplayName();
+
 		String message;
 		if (currentDefaultLabel != null) {
-			message = NLS.bind(WorkbenchMessages.ThemeDefault_currentDefault, currentDefaultLabel);
+			if (productOrAppId != null) {
+				String displayName = productDisplayName != null ? productDisplayName : productOrAppId;
+				message = NLS.bind(WorkbenchMessages.ThemeDefault_currentDefault, new Object[] { currentDefaultLabel,
+						displayName, productOrAppId });
+			} else {
+				message = NLS.bind(WorkbenchMessages.ThemeDefault_currentDefaultUnscoped, currentDefaultLabel);
+			}
 		} else {
-			message = WorkbenchMessages.ThemeDefault_noDefault;
+			if (productOrAppId != null) {
+				String displayName = productDisplayName != null ? productDisplayName : productOrAppId;
+				message = NLS.bind(WorkbenchMessages.ThemeDefault_noDefault, displayName, productOrAppId);
+			} else {
+				message = WorkbenchMessages.ThemeDefault_noDefaultUnscoped;
+			}
 		}
 		message = WorkbenchMessages.ThemeDefault_description + "\n\n" + message; //$NON-NLS-1$
 
@@ -411,6 +424,18 @@ private static String getProductOrApplicationId() {
 		return System.getProperty("eclipse.application"); //$NON-NLS-1$
 	}
 
+	/**
+	 * Returns the product name if a product is configured, or {@code null}
+	 * otherwise.
+	 */
+	private static String getProductDisplayName() {
+		IProduct product = Platform.getProduct();
+		if (product != null) {
+			return product.getName();
+		}
+		return null;
+	}
+
 	@Override
 	public void init(IWorkbench workbench) {
 		MApplication application = workbench.getService(MApplication.class);

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/messages.properties

@@ -503,8 +503,10 @@ ThemeChangeWarningTitle = Theme Changed
 ThemeDefault_manageButton = Manage &default...
 ThemeDefault_dialogTitle = Manage Default Theme
 ThemeDefault_description = The default theme is used for new workspaces and workspaces in which no explicit theme has been set.
-ThemeDefault_currentDefault = Current default theme: {0}
-ThemeDefault_noDefault = No default theme configured. The product default will be used.
+ThemeDefault_currentDefault = Current default theme for {1} ({2}): {0}
+ThemeDefault_currentDefaultUnscoped = Current default theme: {0}
+ThemeDefault_noDefault = No default theme configured for {0} ({1}). The product default will be used.
+ThemeDefault_noDefaultUnscoped = No default theme configured. The product default will be used.
 ThemeDefault_setDefault = &Set current theme as default
 ThemeDefault_removeDefault = &Remove default
 RescaleAtRuntimeSettingChangeWarningTitle = DPI Setting Changed