Fix TUP-38743 Dark Mode: Job editor color is still using light theme in (#6130)

Fix TUP-38743 Dark Mode: Job editor color is still using light theme in Remote Project
https://jira.talendforge.org/browse/TUP-38743

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/colorstyledtext/ColorManager.java

@@ -18,7 +18,6 @@ import java.util.Iterator;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.jface.resource.StringConverter;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
@@ -94,8 +93,6 @@ public class ColorManager {
     public static final String BOLD_SUFFIX = "Bold"; //$NON-NLS-1$
 
     private Map<String, Color> colorMap;
-    
-    private static Map<String, Color> THEME_COLOR_MAP = new HashMap<String, Color>();
 
     private IPreferenceStore store;
 
@@ -119,12 +116,9 @@ public class ColorManager {
     }
 
     private static Color getThemeColor(String colorName) {
-        if (!THEME_COLOR_MAP.containsKey(colorName)) {
-            Color c = ITalendThemeService.getColor(colorName)
-                    .orElse(Display.getDefault().getSystemColor(SWT.COLOR_INFO_FOREGROUND));
-            THEME_COLOR_MAP.put(colorName, c);
-        }
-        return THEME_COLOR_MAP.get(colorName);
+        Color c = ITalendThemeService.getColor(colorName)
+                .orElse(Display.getDefault().getSystemColor(SWT.COLOR_INFO_FOREGROUND));
+        return c;
     }
 
     public void dispose() {
@@ -135,7 +129,6 @@ public class ColorManager {
             color.dispose();
         }
         colorMap = null;
-        THEME_COLOR_MAP.clear();
     }
 
     /**

main/plugins/org.talend.rcp/src/main/java/org/talend/rcp/intro/ApplicationWorkbenchAdvisor.java

@@ -38,7 +38,9 @@ import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindowElement;
 import org.eclipse.jface.dialogs.TrayDialog;
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceManager;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IPerspectiveDescriptor;
 import org.eclipse.ui.IPerspectiveRegistry;
 import org.eclipse.ui.IWorkbench;
@@ -53,6 +55,8 @@ import org.eclipse.ui.views.IViewRegistry;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.LoginException;
 import org.talend.commons.exception.PersistenceException;
+import org.talend.commons.ui.runtime.CommonUIPlugin;
+import org.talend.commons.ui.swt.colorstyledtext.ColorManager;
 import org.talend.commons.utils.system.EclipseCommandLine;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.repository.model.ProxyRepositoryFactory;
@@ -63,6 +67,8 @@ import org.talend.core.ui.branding.IBrandingConfiguration;
 import org.talend.core.ui.branding.IBrandingService;
 import org.talend.core.ui.services.IGitUIProviderService;
 import org.talend.designer.codegen.CodeGeneratorActivator;
+import org.talend.designer.core.DesignerPlugin;
+import org.talend.designer.core.utils.DesignerColorUtils;
 import org.talend.designer.runprocess.RunProcessPlugin;
 import org.talend.login.ILoginTask;
 import org.talend.rcp.TalendSplashHandler;
@@ -294,6 +300,27 @@ public class ApplicationWorkbenchAdvisor extends IDEWorkbenchAdvisor {
             pm.remove("org.talend.core.prefs" + WorkbenchPlugin.PREFERENCE_PAGE_CATEGORY_SEPARATOR + "org.talend.repository.gitprovider.settings.GitPreferencePage");
         }
         pm.remove("org.eclipse.equinox.internal.p2.ui.sdk.ProvisioningPreferencePage"); //$NON-NLS-1$
+        
+        // Re-set 
+        if (!CommonUIPlugin.isFullyHeadless()) {
+            Display display = Display.getDefault();
+            if (display == null) {
+                display = Display.getCurrent();
+            }
+            if (display != null) {
+                display.syncExec(new Runnable() {
+
+                    @Override
+                    public void run() {
+                        IPreferenceStore store = DesignerPlugin.getDefault().getPreferenceStore();
+                        // designer color
+                        DesignerColorUtils.initPreferenceDefault(store);
+                        // default colors for the ColorStyledText.
+                        ColorManager.initDefaultColors(store);
+                    }
+                });
+            }
+        }
     }
 
     @Override

main/plugins/org.talend.themes.css.talend/themes/dark/dark/e4-dark_preferencestyle.css

@@ -18,9 +18,6 @@
 
 IEclipsePreferences#org-talend-designer-core:org-talend-themes-css-talend-base { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
 	preferences:
-		'jobDesignerBackgroundColor=122,122,122'
-		'subjobColor=70,70,70'
-		'subjobTitleColor=102,191,230'
 		'forbiddenSubjobColor=207,226,236'
 		'forbiddenSubjobTitleColor=92,131,150'
 }
@@ -80,8 +77,8 @@ IEclipsePreferences#org-eclipse-ui-workbench:org-talend-themes-css-talend-base {
 		'org.eclipse.ui.editors.rangeIndicatorColor=27,118,153'
 		'org.eclipse.jface.REVISION_NEWEST_COLOR=75,44,3'
 		'org.eclipse.jface.REVISION_OLDEST_COLOR=154,113,61'
-		'org.talend.designer.core.lightColor=212,212,212'
-		'org.talend.designer.core.darkColor=0,0,0'
+		'org.talend.designer.core.lightColor=47,47,47'
+		'org.talend.designer.core.darkColor=20,20,20'
 		'org.talend.designer.core.alpha=95'
 		'org.talend.commons.ui.BgColorForEmptyArea=#org-eclipse-ui-workbench-DARK_BACKGROUND'
 		'org.talend.core.repository.REPO_STABLE_SECONDARY_ENTRY_COLOR=175,175,175'
@@ -138,6 +135,19 @@ IEclipsePreferences#org-eclipse-ui-workbench:org-talend-themes-css-talend-base {
 		'digitColor=160,32,0'
 		'invalidColor=178,0,34'
 		
+		/*Designer color preference page default color */
+		'jobDesignerBackgroundColor=47,47,47'
+		'subjobColor=0,0,0'
+		'subjobTitleColor=255,255,255'
+		'jobletColor=0,0,0'
+		'readOnlyBackgroundColor=181,180,180'
+		/*Joblet figure*/
+		'JOBLET_NORMAL_BG=0,0,0'
+		'JOBLET_HIDDEN_BG=255,255,255'
+		'JOBLET_PROBLEM_BG=250,72,80'
+		'SUBJOB_BORDER_FG=145,209,237'
+		'JOBLET_BORDER_FG=145,209,237'
+		
 		/*GEF Job Editor*/
 		'NODE_FIGURE_LABEL_FORCEGROUND=255,255,255'
 		/*Context Table*/

main/plugins/org.talend.themes.css.talend/themes/default/css/preferencestyle.css

@@ -18,11 +18,8 @@
 
 IEclipsePreferences#org-talend-designer-core:org-talend-themes-css-talend-base { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
 	preferences:
-		'jobDesignerBackgroundColor=250,250,250'
-		'subjobColor=207,226,236'
-		'subjobTitleColor=92,131,150'
-		'forbiddenSubjobColor=70,70,70'
-		'forbiddenSubjobTitleColor=102,191,230'
+		'forbiddenSubjobColor=0,0,0'
+		'forbiddenSubjobTitleColor=255,255,255'
 }
 
 IEclipsePreferences#org-eclipse-ui-workbench:org-talend-themes-css-talend-base { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
@@ -75,6 +72,18 @@ IEclipsePreferences#org-eclipse-ui-workbench:org-talend-themes-css-talend-base {
 		'operatorColor=178,34,0'
 		'digitColor=160,32,0'
 		'invalidColor=178,0,34'
+		
+		/*Designer color preference page default color */
+		'jobDesignerBackgroundColor=250,250,250'
+		'subjobColor=207,226,236'
+		'subjobTitleColor=92,131,150'
+		'jobletColor=130,240,100'
+		'readOnlyBackgroundColor=231,231,231'
+		'JOBLET_NORMAL_BG=130,240,100'
+		'JOBLET_HIDDEN_BG=255,255,255'
+		'JOBLET_PROBLEM_BG=250,72,80'
+		'SUBJOB_BORDER_FG=224,233,238'
+		'JOBLET_BORDER_FG=135,243,146'
 }