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/features/org.talend.utils.feature/feature.xml

@@ -5,7 +5,6 @@
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license url="http://www.example.com/license">[Enter License Description here.]</license>  
   <requires>
-    <import plugin="org.bouncycastle.bcprov" version="1.70.0" match="greaterOrEqual"/>
     <import plugin="com.cedarsoftware.json-io" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="com.fasterxml.jackson.core.jackson-annotations" version="2.9.0" match="greaterOrEqual"/>
     <import plugin="com.fasterxml.jackson.core.jackson-core" version="2.9.8" match="greaterOrEqual"/>

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/ColorConstants.java

@@ -57,12 +57,17 @@ public interface ColorConstants {
 
     static Color getTableBackgroundColor() {
         return ITalendThemeService.getColor(ColorConstants.BUNDLE_ID_COMMON_UI_RUNTIME, ColorConstants.KEY_TABLE_BACKGROUND)
-                .orElse(WHITE_COLOR);
+                .orElse(Display.getDefault().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
     }
 
     static Color getTableForegroundColor() {
         return ITalendThemeService.getColor(ColorConstants.BUNDLE_ID_COMMON_UI_RUNTIME, ColorConstants.KEY_TABLE_FOREGROUND)
-                .orElse(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
+                .orElse(Display.getDefault().getSystemColor(SWT.COLOR_LIST_FOREGROUND));
+    }
+    
+    static Color getTableReadOnlyForegroundColor() {
+        return ITalendThemeService.getColor("CONTEXT_TABLE_READONLY_FOREGROUND")
+                .orElse(Display.getDefault().getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW));
     }
 
 }

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/ITalendThemeService.java

@@ -15,6 +15,7 @@ package org.talend.commons.ui.runtime;
 import java.util.Optional;
 
 import org.apache.commons.lang.StringUtils;
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.swt.graphics.Color;
 import org.osgi.framework.BundleContext;
@@ -29,6 +30,8 @@ public interface ITalendThemeService {
 
     public static String DEFAULT_PREFERENCE_ID = "org.eclipse.ui.workbench";
 
+    public static String THEME_PREFERENCE_ID = "org.eclipse.e4.ui.css.swt.theme";
+
     /**
      * Get color from instance scope preference of default bundleId, which managed by theme; the standard way eclipse
      * uses
@@ -132,6 +135,8 @@ public interface ITalendThemeService {
 
     void removePropertyChangeListenerFor(String bundleId, IPropertyChangeListener listener);
 
+    IPreferenceStore getThemePreferenceStore();
+
     static ITalendThemeService get() {
         try {
             BundleContext bc = FrameworkUtil.getBundle(ITalendThemeService.class).getBundleContext();

main/plugins/org.talend.commons.runtime/src/org/talend/commons/exception/CommonExceptionHandler.java

@@ -36,6 +36,11 @@ public final class CommonExceptionHandler {
         Priority priority = getPriority(ex);
         process(ex, priority);
     }
+    
+    public static void process(Throwable ex, String msg) {
+        Priority priority = getPriority(ex);
+        process(ex, msg, priority);
+    }
 
     public static void process(Throwable ex, Priority priority) {
         String message = ex.getMessage();
@@ -43,6 +48,13 @@ public final class CommonExceptionHandler {
         log.log(priority, message, ex);
 
     }
+    
+    public static void process(Throwable ex, String msg, Priority priority) {
+        String message = ex.getMessage() + ": " + msg;
+        
+        log.log(priority, message, ex);
+        
+    }
 
     public static void log(String message) {
         log.log(Level.INFO, message);

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/network/NetworkUtil.java

@@ -33,6 +33,7 @@ import java.util.regex.Pattern;
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.talend.commons.exception.CommonExceptionHandler;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.runtime.utils.io.FileCopyUtils;
 
@@ -108,6 +109,7 @@ public class NetworkUtil {
                 return true;
             }
         } catch (Exception e) {
+            CommonExceptionHandler.process(e, getCheckUrl());
             return false;
         } finally {
             conn.disconnect();
@@ -144,6 +146,7 @@ public class NetworkUtil {
             conn.setRequestMethod("HEAD"); //$NON-NLS-1$
             conn.getResponseMessage();
         } catch (Exception e) {
+            CommonExceptionHandler.process(e, urlString);
             // if not reachable , will throw exception(time out/unknown host) .So if catched exception, make it a
             // invalid server
             return false;

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

@@ -18,12 +18,12 @@ 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;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Display;
+import org.talend.commons.ui.runtime.ITalendThemeService;
 import org.talend.commons.ui.swt.colorstyledtext.scanner.ColoringScanner;
 
 /**
@@ -33,7 +33,7 @@ import org.talend.commons.ui.swt.colorstyledtext.scanner.ColoringScanner;
  *
  */
 public class ColorManager {
-
+    
     public static final RGB DEFAULT_STRING_COLOR = new RGB(0, 0, 0);
 
     public static final RGB DEFAULT_KEYWORD1_COLOR = new RGB(50, 32, 160);
@@ -106,15 +106,19 @@ public class ColorManager {
     }
 
     public Color getColor(String colorName) {
-        RGB prefColor = PreferenceConverter.getColor(store, colorName);
-        Color color = null;
-        if (colorMap.containsKey(colorName) && (colorMap.get(colorName)).getRGB().equals(prefColor)) {
-            color = (Color) colorMap.get(colorName);
+        Color prefColor = getThemeColor(colorName);
+        if (colorMap.containsKey(colorName) && (colorMap.get(colorName)).equals(prefColor)) {
+            return colorMap.get(colorName);
         } else {
-            color = new Color(Display.getDefault(), prefColor);
-            colorMap.put(colorName, color);
+            colorMap.put(colorName, prefColor);
         }
-        return color;
+        return prefColor;
+    }
+
+    private static Color getThemeColor(String colorName) {
+        Color c = ITalendThemeService.getColor(colorName)
+                .orElse(Display.getDefault().getSystemColor(SWT.COLOR_INFO_FOREGROUND));
+        return c;
     }
 
     public void dispose() {
@@ -164,20 +168,20 @@ public class ColorManager {
     }
 
     public static void initDefaultColors(IPreferenceStore store) {
-        store.setDefault(NULL_COLOR, StringConverter.asString(DEFAULT_STRING_COLOR));
-        store.setDefault(COMMENT1_COLOR, StringConverter.asString(DEFAULT_COMMENT1_COLOR));
-        store.setDefault(COMMENT2_COLOR, StringConverter.asString(DEFAULT_COMMENT2_COLOR));
-        store.setDefault(LITERAL1_COLOR, StringConverter.asString(DEFAULT_LITERAL1_COLOR));
-        store.setDefault(LITERAL2_COLOR, StringConverter.asString(DEFAULT_LITERAL2_COLOR));
-        store.setDefault(LABEL_COLOR, StringConverter.asString(DEFAULT_LABEL_COLOR));
-        store.setDefault(KEYWORD1_COLOR, StringConverter.asString(DEFAULT_KEYWORD1_COLOR));
-        store.setDefault(KEYWORD2_COLOR, StringConverter.asString(DEFAULT_KEYWORD2_COLOR));
-        store.setDefault(KEYWORD3_COLOR, StringConverter.asString(DEFAULT_KEYWORD3_COLOR));
-        store.setDefault(FUNCTION_COLOR, StringConverter.asString(DEFAULT_FUNCTION_COLOR));
-        store.setDefault(MARKUP_COLOR, StringConverter.asString(DEFAULT_MARKUP_COLOR));
-        store.setDefault(OPERATOR_COLOR, StringConverter.asString(DEFAULT_OPERATOR_COLOR));
-        store.setDefault(DIGIT_COLOR, StringConverter.asString(DEFAULT_DIGIT_COLOR));
-        store.setDefault(INVALID_COLOR, StringConverter.asString(DEFAULT_INVALID_COLOR));
+        store.setDefault(NULL_COLOR, StringConverter.asString(getThemeColor(NULL_COLOR).getRGB()));
+        store.setDefault(COMMENT1_COLOR, StringConverter.asString(getThemeColor(COMMENT1_COLOR).getRGB()));
+        store.setDefault(COMMENT2_COLOR, StringConverter.asString(getThemeColor(COMMENT2_COLOR).getRGB()));
+        store.setDefault(LITERAL1_COLOR, StringConverter.asString(getThemeColor(LITERAL1_COLOR).getRGB()));
+        store.setDefault(LITERAL2_COLOR, StringConverter.asString(getThemeColor(LITERAL2_COLOR).getRGB()));
+        store.setDefault(LABEL_COLOR, StringConverter.asString(getThemeColor(LABEL_COLOR).getRGB()));
+        store.setDefault(KEYWORD1_COLOR, StringConverter.asString(getThemeColor(KEYWORD1_COLOR).getRGB()));
+        store.setDefault(KEYWORD2_COLOR, StringConverter.asString(getThemeColor(KEYWORD2_COLOR).getRGB()));
+        store.setDefault(KEYWORD3_COLOR, StringConverter.asString(getThemeColor(KEYWORD3_COLOR).getRGB()));
+        store.setDefault(FUNCTION_COLOR, StringConverter.asString(getThemeColor(FUNCTION_COLOR).getRGB()));
+        store.setDefault(MARKUP_COLOR, StringConverter.asString(getThemeColor(MARKUP_COLOR).getRGB()));
+        store.setDefault(OPERATOR_COLOR, StringConverter.asString(getThemeColor(OPERATOR_COLOR).getRGB()));
+        store.setDefault(DIGIT_COLOR, StringConverter.asString(getThemeColor(DIGIT_COLOR).getRGB()));
+        store.setDefault(INVALID_COLOR, StringConverter.asString(getThemeColor(INVALID_COLOR).getRGB()));
 
         String bold = BOLD_SUFFIX;
         store.setDefault(COMMENT1_COLOR + bold, false);

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

@@ -1,368 +1,384 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.commons.ui.swt.colorstyledtext;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ExtendedModifyEvent;
-import org.eclipse.swt.custom.ExtendedModifyListener;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.talend.commons.runtime.xml.XmlUtil;
-import org.talend.commons.ui.runtime.i18n.Messages;
-import org.talend.commons.ui.runtime.image.ImageProvider;
-import org.talend.commons.ui.swt.colorstyledtext.jedit.Mode;
-import org.talend.commons.ui.swt.colorstyledtext.jedit.Modes;
-import org.talend.commons.ui.swt.colorstyledtext.rules.CToken;
-import org.talend.commons.ui.swt.colorstyledtext.scanner.ColoringScanner;
-import org.talend.commons.utils.threading.ExecutionLimiter;
-
-/**
- * This component is an adaptation of a Color Editor for a StyledText.
- *
- * The original editor can be found on http://www.gstaff.org/colorEditor/ <br/>
- *
- * <b>How to use it, example :</b> <br/>
- * ColorStyledText text = new ColorStyledText(parent, SWT.H_SCROLL | SWT.V_SCROLL,
- * CorePlugin.getDefault().getPreferenceStore(), ECodeLanguage.PERL.getName());</i> <br/>
- * <br/>
- *
- * $Id: ColorStyledText.java 7183 2007-11-23 11:03:36Z amaumont $
- *
- */
-public class ColorStyledText extends StyledText {
-
-    private final static int MAXIMUM_CHARACTERS_BEFORE_USE_TIMER = 1000;
-
-    private final ColorManager colorManager;
-
-    private final ColoringScanner scanner;
-
-    private final String languageMode;
-
-    private final MenuItem pasteItem;
-
-    private boolean coloring = true;
-
-    private UndoRedoManager undoRedoManager;
-
-    public ColorStyledText(Composite parent, int style, IPreferenceStore store, String languageMode) {
-        super(parent, style);
-        this.languageMode = languageMode;
-        this.colorManager = new ColorManager(store);
-
-        /*
-         * set the Shortcuts of the undo/redo
-         */
-        this.setKeyBinding('Z' | SWT.CTRL, ActionCode.UNDO);
-        this.setKeyBinding('Y' | SWT.CTRL, ActionCode.REDO);
-        UndoRedoManager undoManager = new UndoRedoManager(50);
-        undoManager.connect(this);
-        this.setUndoManager(undoManager);
-
-        ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
-        Menu popupMenu = new Menu(this);
-
-        MenuItem redoItem = new MenuItem(popupMenu, SWT.PUSH);
-        redoItem.setText(Messages.getString("ColorStyledText.RedoItem.Text")); //$NON-NLS-1$
-        redoItem.addListener(SWT.Selection, new Listener() {
-
-            public void handleEvent(Event event) {
-                redo();
-            }
-        });
-
-        MenuItem undoItem = new MenuItem(popupMenu, SWT.PUSH);
-        undoItem.setText(Messages.getString("ColorStyledText.UndoItem.Text")); //$NON-NLS-1$
-        undoItem.addListener(SWT.Selection, new Listener() {
-
-            public void handleEvent(Event event) {
-                undo();
-            }
-        });
-
-        Image image = ImageProvider.getImage(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_COPY));
-        MenuItem copyItem = new MenuItem(popupMenu, SWT.PUSH);
-        copyItem.setText(Messages.getString("ColorStyledText.CopyItem.Text")); //$NON-NLS-1$
-        copyItem.setImage(image);
-        copyItem.addListener(SWT.Selection, new Listener() {
-
-            public void handleEvent(Event event) {
-                copy();
-            }
-        });
-
-        image = ImageProvider.getImage(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE));
-        pasteItem = new MenuItem(popupMenu, SWT.PUSH);
-        pasteItem.setText(Messages.getString("ColorStyledText.PasteItem.Text")); //$NON-NLS-1$
-        pasteItem.setData(this);
-        pasteItem.setImage(image);
-        pasteItem.addListener(SWT.Selection, new Listener() {
-
-            public void handleEvent(Event event) {
-                paste();
-            }
-        });
-        pasteItem.setEnabled(getEditable());
-
-        this.setMenu(popupMenu);
-        MenuItem selectAllItem = new MenuItem(popupMenu, SWT.PUSH);
-        selectAllItem.setText(Messages.getString("ColorStyledText.SelectAllItem.Text")); //$NON-NLS-1$
-        selectAllItem.addListener(SWT.Selection, new Listener() {
-
-            public void handleEvent(Event event) {
-                selectAll();
-            }
-        });
-        this.setMenu(popupMenu);
-
-        Listener selectAllListener = new Listener() {
-
-            public void handleEvent(Event event) {
-                if (event.character == '\u0001') { // CTRL + A
-                    selectAll();
-                }
-            }
-        };
-
-        addListener(SWT.KeyDown, selectAllListener);
-
-        Mode mode = Modes.getMode(languageMode + XmlUtil.FILE_XML_SUFFIX);
-        scanner = new ColoringScanner(mode, colorManager);
-
-        addExtendedModifyListener(modifyListener);
-    }
-
-    /**
-     * DOC qli Comment method "invokeAction".
-     *
-     * @param action
-     *
-     * */
-    public void invokeAction(int action) {
-        super.invokeAction(action);
-
-        switch (action) {
-        case ActionCode.UNDO:
-            undo(); // ctrl+Z
-            break;
-        case ActionCode.REDO:
-            redo(); // ctrl+Y
-            break;
-        }
-    }
-
-    /**
-     * Getter for undoRedoManager.
-     *
-     * @return the undoRedoManager
-     */
-    public UndoRedoManager getUndoManager() {
-        return this.undoRedoManager;
-    }
-
-    /**
-     * Sets the undoRedoManager.
-     *
-     * @param undoRedoManager the undoRedoManager to set
-     */
-    public void setUndoManager(UndoRedoManager undoRedoManager) {
-        this.undoRedoManager = undoRedoManager;
-    }
-
-    public static class ActionCode {
-
-        public static final int UNDO = Integer.MAX_VALUE;
-
-        public static final int REDO = UNDO - 1;
-
-    }
-
-    private void undo() {
-        if (undoRedoManager != null) {
-            undoRedoManager.undo();
-        }
-    }
-
-    private void redo() {
-        if (undoRedoManager != null) {
-            undoRedoManager.redo();
-        }
-    }
-
-    protected void colorize(final ColoringScanner scanner) {
-        final ArrayList<StyleRange> styles = new ArrayList<StyleRange>();
-        if (this.coloring) {
-            IToken token;
-            if (this.isDisposed()) {
-                return;
-            }
-
-            scanner.parse(this.getText().replaceAll("\"", " ").replaceAll("'", " ")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-
-            do {
-                token = scanner.nextToken();
-                if (!token.isEOF()) {
-                    if (token instanceof CToken) {
-                        CToken ctoken = (CToken) token;
-                        StyleRange styleRange;
-                        styleRange = new StyleRange();
-                        styleRange.start = scanner.getTokenOffset();
-                        styleRange.length = scanner.getTokenLength();
-                        if (ctoken.getType() == null) {
-                            styleRange.fontStyle = colorManager.getStyleFor(ctoken.getColor());
-                            styleRange.foreground = colorManager.getColor(ctoken.getColor());
-                        } else {
-                            styleRange.fontStyle = colorManager.getStyleForType(ctoken.getColor());
-                            styleRange.foreground = colorManager.getColorForType(ctoken.getColor());
-                        }
-                        styles.add(styleRange);
-                    }
-                }
-            } while (!token.isEOF());
-            setStyles(styles);
-        } else {
-            StyleRange styleRange = new StyleRange();
-            styles.add(styleRange);
-            styleRange.start = 0;
-            styleRange.length = this.getText().getBytes().length;
-            styleRange.foreground = null;
-            setStyles(styles);
-        }
-    }
-
-    public void setStyles(final ArrayList<StyleRange> styles) {
-        if (ColorStyledText.this.isDisposed()) {
-            return;
-        }
-        int countChars = getCharCount();
-
-        for (int i = 0; i < styles.size(); i++) {
-            StyleRange styleRange = styles.get(i);
-            // System.out.println("styleRange.start=" + styleRange.start);
-            // System.out.println("styleRange.length=" + styleRange.length);
-            if (!(0 <= styleRange.start && styleRange.start + styleRange.length <= countChars)) {
-                continue;
-            }
-            setStyleRange(styleRange);
-        }
-    }
-
-    ExtendedModifyListener modifyListener = new ExtendedModifyListener() {
-
-        public void modifyText(ExtendedModifyEvent event) {
-            if (ColorStyledText.this.getCharCount() > MAXIMUM_CHARACTERS_BEFORE_USE_TIMER) {
-                colorizeLimiter.resetTimer();
-                colorizeLimiter.startIfExecutable(true, null);
-            } else {
-                getDisplay().asyncExec(new Runnable() {
-
-                    public void run() {
-                        colorize(scanner);
-                    }
-
-                });
-            }
-        }
-    };
-
-    public ColorManager getColorManager() {
-        return this.colorManager;
-    }
-
-    public String getLanguageMode() {
-        return this.languageMode;
-    }
-
-    public ColoringScanner getScanner() {
-        return this.scanner;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.swt.custom.StyledText#setEditable(boolean)
-     */
-    @Override
-    public void setEditable(boolean editable) {
-        super.setEditable(editable);
-        if (pasteItem != null) {
-            pasteItem.setEnabled(editable);
-        }
-    }
-
-    /**
-     * Getter for coloring.
-     *
-     * @return the coloring
-     */
-    public boolean isColoring() {
-        return this.coloring;
-    }
-
-    /**
-     * Sets the coloring.
-     *
-     * @param coloring the coloring to set
-     */
-    public void setColoring(boolean coloring) {
-        boolean wasDifferent = this.coloring != coloring;
-        this.coloring = coloring;
-        if (!coloring) {
-            removeExtendedModifyListener(modifyListener);
-        } else if (wasDifferent) {
-            colorizeLimiter.resetTimer();
-            colorizeLimiter.startIfExecutable(true, null);
-            addExtendedModifyListener(modifyListener);
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.swt.widgets.Widget#dispose()
-     */
-    @Override
-    public void dispose() {
-        super.dispose();
-        colorManager.dispose();
-    }
-
-    private final ExecutionLimiter colorizeLimiter = new ExecutionLimiter(1000, true) {
-
-        @Override
-        public void execute(final boolean isFinalExecution, Object data) {
-            if (!isDisposed()) {
-                getDisplay().asyncExec(new Runnable() {
-
-                    public void run() {
-                        colorize(scanner);
-                    }
-
-                });
-            }
-        }
-    };
-
-}
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.commons.ui.swt.colorstyledtext;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ExtendedModifyEvent;
+import org.eclipse.swt.custom.ExtendedModifyListener;
+import org.eclipse.swt.custom.StyleRange;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+import org.talend.commons.runtime.xml.XmlUtil;
+import org.talend.commons.ui.runtime.ITalendThemeService;
+import org.talend.commons.ui.runtime.i18n.Messages;
+import org.talend.commons.ui.runtime.image.ImageProvider;
+import org.talend.commons.ui.swt.colorstyledtext.jedit.Mode;
+import org.talend.commons.ui.swt.colorstyledtext.jedit.Modes;
+import org.talend.commons.ui.swt.colorstyledtext.rules.CToken;
+import org.talend.commons.ui.swt.colorstyledtext.scanner.ColoringScanner;
+import org.talend.commons.utils.threading.ExecutionLimiter;
+
+/**
+ * This component is an adaptation of a Color Editor for a StyledText.
+ *
+ * The original editor can be found on http://www.gstaff.org/colorEditor/ <br/>
+ *
+ * <b>How to use it, example :</b> <br/>
+ * ColorStyledText text = new ColorStyledText(parent, SWT.H_SCROLL | SWT.V_SCROLL,
+ * CorePlugin.getDefault().getPreferenceStore(), ECodeLanguage.PERL.getName());</i> <br/>
+ * <br/>
+ *
+ * $Id: ColorStyledText.java 7183 2007-11-23 11:03:36Z amaumont $
+ *
+ */
+public class ColorStyledText extends StyledText {
+    
+
+    public static final String PREFERENCE_COLOR_FOREGROUND= "ColorStyledText.Color.Foreground"; //$NON-NLS-1$
+    public static final String PREFERENCE_COLOR_BACKGROUND= "ColorStyledText.Color.Background"; //$NON-NLS-1$
+    public static final String PREFERENCE_COLOR_SELECTION_FOREGROUND= "ColorStyledText.Color.SelectionForeground"; //$NON-NLS-1$
+    public static final String PREFERENCE_COLOR_SELECTION_BACKGROUND= "ColorStyledText.Color.SelectionBackground"; //$NON-NLS-1$
+
+    private final static int MAXIMUM_CHARACTERS_BEFORE_USE_TIMER = 1000;
+
+    private final ColorManager colorManager;
+
+    private final ColoringScanner scanner;
+
+    private final String languageMode;
+
+    private final MenuItem pasteItem;
+
+    private boolean coloring = true;
+
+    private UndoRedoManager undoRedoManager;
+
+    public ColorStyledText(Composite parent, int style, IPreferenceStore store, String languageMode) {
+        super(parent, style);
+        this.languageMode = languageMode;
+        this.colorManager = new ColorManager(store);
+
+        /*
+         * set the Shortcuts of the undo/redo
+         */
+        this.setKeyBinding('Z' | SWT.CTRL, ActionCode.UNDO);
+        this.setKeyBinding('Y' | SWT.CTRL, ActionCode.REDO);
+        UndoRedoManager undoManager = new UndoRedoManager(50);
+        undoManager.connect(this);
+        this.setUndoManager(undoManager);
+
+        ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
+        Menu popupMenu = new Menu(this);
+
+        MenuItem redoItem = new MenuItem(popupMenu, SWT.PUSH);
+        redoItem.setText(Messages.getString("ColorStyledText.RedoItem.Text")); //$NON-NLS-1$
+        redoItem.addListener(SWT.Selection, new Listener() {
+
+            public void handleEvent(Event event) {
+                redo();
+            }
+        });
+
+        MenuItem undoItem = new MenuItem(popupMenu, SWT.PUSH);
+        undoItem.setText(Messages.getString("ColorStyledText.UndoItem.Text")); //$NON-NLS-1$
+        undoItem.addListener(SWT.Selection, new Listener() {
+
+            public void handleEvent(Event event) {
+                undo();
+            }
+        });
+
+        Image image = ImageProvider.getImage(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_COPY));
+        MenuItem copyItem = new MenuItem(popupMenu, SWT.PUSH);
+        copyItem.setText(Messages.getString("ColorStyledText.CopyItem.Text")); //$NON-NLS-1$
+        copyItem.setImage(image);
+        copyItem.addListener(SWT.Selection, new Listener() {
+
+            public void handleEvent(Event event) {
+                copy();
+            }
+        });
+
+        image = ImageProvider.getImage(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE));
+        pasteItem = new MenuItem(popupMenu, SWT.PUSH);
+        pasteItem.setText(Messages.getString("ColorStyledText.PasteItem.Text")); //$NON-NLS-1$
+        pasteItem.setData(this);
+        pasteItem.setImage(image);
+        pasteItem.addListener(SWT.Selection, new Listener() {
+
+            public void handleEvent(Event event) {
+                paste();
+            }
+        });
+        pasteItem.setEnabled(getEditable());
+
+        this.setMenu(popupMenu);
+        MenuItem selectAllItem = new MenuItem(popupMenu, SWT.PUSH);
+        selectAllItem.setText(Messages.getString("ColorStyledText.SelectAllItem.Text")); //$NON-NLS-1$
+        selectAllItem.addListener(SWT.Selection, new Listener() {
+
+            public void handleEvent(Event event) {
+                selectAll();
+            }
+        });
+        this.setMenu(popupMenu);
+
+        Listener selectAllListener = new Listener() {
+
+            public void handleEvent(Event event) {
+                if (event.character == '\u0001') { // CTRL + A
+                    selectAll();
+                }
+            }
+        };
+
+        addListener(SWT.KeyDown, selectAllListener);
+
+        Mode mode = Modes.getMode(languageMode + XmlUtil.FILE_XML_SUFFIX);
+        scanner = new ColoringScanner(mode, colorManager);
+
+        addExtendedModifyListener(modifyListener);
+        initColorSetting();
+    }
+    
+
+    protected void initColorSetting() {       
+        this.setForeground(ITalendThemeService.getColor(PREFERENCE_COLOR_FOREGROUND).orElse(null));
+        this.setBackground(ITalendThemeService.getColor(PREFERENCE_COLOR_BACKGROUND).orElse(null));
+        this.setSelectionBackground(ITalendThemeService.getColor(PREFERENCE_COLOR_SELECTION_BACKGROUND).orElse(null));
+        this.setSelectionForeground(ITalendThemeService.getColor(PREFERENCE_COLOR_SELECTION_FOREGROUND).orElse(null));
+    }
+
+    /**
+     * DOC qli Comment method "invokeAction".
+     *
+     * @param action
+     *
+     * */
+    public void invokeAction(int action) {
+        super.invokeAction(action);
+
+        switch (action) {
+        case ActionCode.UNDO:
+            undo(); // ctrl+Z
+            break;
+        case ActionCode.REDO:
+            redo(); // ctrl+Y
+            break;
+        }
+    }
+
+    /**
+     * Getter for undoRedoManager.
+     *
+     * @return the undoRedoManager
+     */
+    public UndoRedoManager getUndoManager() {
+        return this.undoRedoManager;
+    }
+
+    /**
+     * Sets the undoRedoManager.
+     *
+     * @param undoRedoManager the undoRedoManager to set
+     */
+    public void setUndoManager(UndoRedoManager undoRedoManager) {
+        this.undoRedoManager = undoRedoManager;
+    }
+
+    public static class ActionCode {
+
+        public static final int UNDO = Integer.MAX_VALUE;
+
+        public static final int REDO = UNDO - 1;
+
+    }
+
+    private void undo() {
+        if (undoRedoManager != null) {
+            undoRedoManager.undo();
+        }
+    }
+
+    private void redo() {
+        if (undoRedoManager != null) {
+            undoRedoManager.redo();
+        }
+    }
+
+    protected void colorize(final ColoringScanner scanner) {
+        final ArrayList<StyleRange> styles = new ArrayList<StyleRange>();
+        if (this.coloring) {
+            IToken token;
+            if (this.isDisposed()) {
+                return;
+            }
+
+            scanner.parse(this.getText().replaceAll("\"", " ").replaceAll("'", " ")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+
+            do {
+                token = scanner.nextToken();
+                if (!token.isEOF()) {
+                    if (token instanceof CToken) {
+                        CToken ctoken = (CToken) token;
+                        StyleRange styleRange;
+                        styleRange = new StyleRange();
+                        styleRange.start = scanner.getTokenOffset();
+                        styleRange.length = scanner.getTokenLength();
+                        if (ctoken.getType() == null) {
+                            styleRange.fontStyle = colorManager.getStyleFor(ctoken.getColor());
+                            styleRange.foreground = colorManager.getColor(ctoken.getColor());
+                        } else {
+                            styleRange.fontStyle = colorManager.getStyleForType(ctoken.getColor());
+                            styleRange.foreground = colorManager.getColorForType(ctoken.getColor());
+                        }
+                        styles.add(styleRange);
+                    }
+                }
+            } while (!token.isEOF());
+            setStyles(styles);
+        } else {
+            StyleRange styleRange = new StyleRange();
+            styles.add(styleRange);
+            styleRange.start = 0;
+            styleRange.length = this.getText().getBytes().length;
+            styleRange.foreground = null;
+            setStyles(styles);
+        }
+    }
+
+    public void setStyles(final ArrayList<StyleRange> styles) {
+        if (ColorStyledText.this.isDisposed()) {
+            return;
+        }
+        int countChars = getCharCount();
+
+        for (int i = 0; i < styles.size(); i++) {
+            StyleRange styleRange = styles.get(i);
+            // System.out.println("styleRange.start=" + styleRange.start);
+            // System.out.println("styleRange.length=" + styleRange.length);
+            if (!(0 <= styleRange.start && styleRange.start + styleRange.length <= countChars)) {
+                continue;
+            }
+            setStyleRange(styleRange);
+        }
+    }
+
+    ExtendedModifyListener modifyListener = new ExtendedModifyListener() {
+
+        public void modifyText(ExtendedModifyEvent event) {
+            if (ColorStyledText.this.getCharCount() > MAXIMUM_CHARACTERS_BEFORE_USE_TIMER) {
+                colorizeLimiter.resetTimer();
+                colorizeLimiter.startIfExecutable(true, null);
+            } else {
+                getDisplay().asyncExec(new Runnable() {
+
+                    public void run() {
+                        colorize(scanner);
+                    }
+
+                });
+            }
+        }
+    };
+
+    public ColorManager getColorManager() {
+        return this.colorManager;
+    }
+
+    public String getLanguageMode() {
+        return this.languageMode;
+    }
+
+    public ColoringScanner getScanner() {
+        return this.scanner;
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.eclipse.swt.custom.StyledText#setEditable(boolean)
+     */
+    @Override
+    public void setEditable(boolean editable) {
+        super.setEditable(editable);
+        if (pasteItem != null) {
+            pasteItem.setEnabled(editable);
+        }
+    }
+
+    /**
+     * Getter for coloring.
+     *
+     * @return the coloring
+     */
+    public boolean isColoring() {
+        return this.coloring;
+    }
+
+    /**
+     * Sets the coloring.
+     *
+     * @param coloring the coloring to set
+     */
+    public void setColoring(boolean coloring) {
+        boolean wasDifferent = this.coloring != coloring;
+        this.coloring = coloring;
+        if (!coloring) {
+            removeExtendedModifyListener(modifyListener);
+        } else if (wasDifferent) {
+            colorizeLimiter.resetTimer();
+            colorizeLimiter.startIfExecutable(true, null);
+            addExtendedModifyListener(modifyListener);
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.eclipse.swt.widgets.Widget#dispose()
+     */
+    @Override
+    public void dispose() {
+        super.dispose();
+        colorManager.dispose();
+    }
+
+    private final ExecutionLimiter colorizeLimiter = new ExecutionLimiter(1000, true) {
+
+        @Override
+        public void execute(final boolean isFinalExecution, Object data) {
+            if (!isDisposed()) {
+                getDisplay().asyncExec(new Runnable() {
+
+                    public void run() {
+                        colorize(scanner);
+                    }
+
+                });
+            }
+        }
+    };
+
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/tableviewer/celleditor/DialogErrorForCellEditorListener.java

@@ -16,8 +16,10 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ICellEditorListener;
 import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Text;
+import org.talend.commons.ui.runtime.ColorConstants;
 import org.talend.commons.ui.runtime.i18n.Messages;
 import org.talend.commons.ui.runtime.swt.tableviewer.data.ModifiedObjectInfo;
 import org.talend.commons.ui.runtime.thread.AsynchronousThreading;
@@ -39,6 +41,8 @@ public abstract class DialogErrorForCellEditorListener implements ICellEditorLis
     protected TableViewerCreatorColumn column;
 
     protected TableViewerCreator tableViewerCreator;
+    
+    private Color tableBackground = ColorConstants.getTableBackgroundColor();
 
     /**
      * DOC amaumont CellEditorListener constructor comment.
@@ -89,7 +93,7 @@ public abstract class DialogErrorForCellEditorListener implements ICellEditorLis
         final String errorMessage = validateValue(newValue, beanPosition);
         if (errorMessage == null) {
             newValidValueTyped(beanPosition, lastValidValue, newValue, state);
-            text.setBackground(text.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+            text.setBackground(tableBackground);
             lastValidValue = newValue;
         } else {
             text.setBackground(text.getDisplay().getSystemColor(SWT.COLOR_RED));

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/utils/workbench/gef/SimpleHtmlFigure.java

@@ -31,6 +31,7 @@ import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Display;
 import org.talend.commons.ui.gmf.util.DisplayUtils;
+import org.talend.commons.ui.runtime.ITalendThemeService;
 
 /**
  * Figure managing some simple HTML styles. <br/>
@@ -77,6 +78,8 @@ public class SimpleHtmlFigure extends Figure {
     private static Font boldFont = null;
 
     private static Font boldItalicFont = null;
+    
+    private static final Color DEFAULT_LABEL_COLOR = ITalendThemeService.getColor("NODE_FIGURE_LABEL_FORCEGROUND").orElse(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
 
     /**
      * Constructs a new SimpleHtmlFigure.
@@ -262,6 +265,8 @@ public class SimpleHtmlFigure extends Figure {
             label.setFont(fontToUse);
             if (colorStack.size() > 0) {
                 label.setForegroundColor(colorStack.get(colorStack.size() - 1));
+            } else {
+                label.setForegroundColor(DEFAULT_LABEL_COLOR); // Set label default foreground color
             }
             horizContainer.add(label);
         }

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_fr.properties

@@ -204,3 +204,4 @@ RenameFolderAction.warning.cannotFind.title=Action non disponible
 ConvertJobsUtil.warning.title=Avertissement
 ConvertJobsUtil.warning.message=Le framework cible n'est pas totalement support\u00E9 dans cette version.
 SyncLibrariesLoginTask.createStatsLogAndImplicitParamter=Cr\u00E9er des logs de stat et des param\u00E8tres implicites.
+WizardPageAPIDefinition_operationIdMissing=Des operationIds manquent dans l'API. Ces operationIds sont utilis\u00E9s pour initialiser les flux de sortie du tRESTRequest/cRest. Consultez l'aide en ligne des composants tRESTRequest/cRest.

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_ja.properties

@@ -204,3 +204,4 @@ RenameFolderAction.warning.cannotFind.title=\u4F7F\u7528\u3067\u304D\u306A\u3044
 ConvertJobsUtil.warning.title=\u8B66\u544A
 ConvertJobsUtil.warning.message=\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u306F\u3001\u30BF\u30FC\u30B2\u30C3\u30C8\u30D5\u30EC\u30FC\u30E0\u30EF\u30FC\u30AF\u304C\u5B8C\u5168\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 SyncLibrariesLoginTask.createStatsLogAndImplicitParamter=\u7D71\u8A08\u30ED\u30B0\u3068\u6697\u9ED9\u7684\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u4F5C\u6210
+WizardPageAPIDefinition_operationIdMissing=API\u3067operationIds\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002operationIds\u306F\u3001tRESTRequest/cRest\u51FA\u529B\u30D5\u30ED\u30FC\u3092\u521D\u671F\u5316\u3059\u308B\u305F\u3081\u306B\u4F7F\u308F\u308C\u307E\u3059\u3002tRESTRequest/cRest\u306E\u30AA\u30F3\u30E9\u30A4\u30F3\u30D8\u30EB\u30D7\u3092\u3054\u89A7\u304F\u3060\u3055\u3044\u3002

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_zh_CN.properties

@@ -204,3 +204,4 @@ RenameFolderAction.warning.cannotFind.title=\u64CD\u4F5C\u4E0D\u53EF\u7528
 ConvertJobsUtil.warning.title=\u8B66\u544A
 ConvertJobsUtil.warning.message=\u6B64\u7248\u672C\u4E0D\u5B8C\u5168\u652F\u6301\u76EE\u6807\u6846\u67B6.
 SyncLibrariesLoginTask.createStatsLogAndImplicitParamter=\u521B\u5EFA\u7EDF\u8BA1\u65E5\u5FD7\u548C\u9690\u5F0F\u53C2\u6570
+WizardPageAPIDefinition_operationIdMissing=API \u7F3A\u5931 operationId \u53C2\u6570\uFF0C\u8FD9\u4E9B operationId \u53C2\u6570\u7528\u6765\u521D\u59CB\u5316 tRESTRequest \u6216 cRest \u8F93\u51FA\u6D41\u3002\u8BF7\u53C2\u89C1 tRESTRequest \u6216 cRest \u5728\u7EBF\u5E2E\u52A9\u6587\u6863\u3002

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProxyRepositoryFactory.java

@@ -240,14 +240,14 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return singleton;
     }
 
-    private ICoreService getCoreService() {
+    public ICoreService getCoreService() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreService.class)) {
             return GlobalServiceRegister.getDefault().getService(ICoreService.class);
         }
         return null;
     }
 
-    private IRunProcessService getRunProcessService() {
+    public IRunProcessService getRunProcessService() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
             return GlobalServiceRegister.getDefault().getService(IRunProcessService.class);
         }
@@ -352,7 +352,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @param project
      * @throws LoginException
      */
-    private void checkProjectCompatibility(Project project) throws LoginException {
+    public void checkProjectCompatibility(Project project) throws LoginException {
         IMigrationToolService migrationToolService = GlobalServiceRegister.getDefault().getService(
                 IMigrationToolService.class);
         // update migration system.
@@ -1849,7 +1849,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @param project
      * @throws PersistenceException
      */
-    private void emptyTempFolder(Project project) throws PersistenceException {
+    public void emptyTempFolder(Project project) throws PersistenceException {
     	try {
             String str = SharedStudioUtils.getTempFolderPath().toPortableString();
             FilesUtils.deleteFolder(new File(str), false);
@@ -2528,7 +2528,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         }
     }
 
-    private void checkReferenceProjectsProblems(Project project) throws BusinessException, PersistenceException {
+    public void checkReferenceProjectsProblems(Project project) throws BusinessException, PersistenceException {
         if (ReferenceProjectProblemManager.getInstance().getAllInvalidProjectReferenceSet().size() > 0) {
             StringBuffer sb = new StringBuffer();
             for (String technicalLabel : ReferenceProjectProblemManager.getInstance().getAllInvalidProjectReferenceSet()) {
@@ -3026,4 +3026,11 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         this.repositoryFactoryFromProvider.saveProject(project);
     }
     
+    public void setCancelled(boolean cancelled) {
+        this.isCancelled = cancelled;
+    }
+
+    public boolean isCancelled() {
+        return this.isCancelled;
+    }
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/HadoopConstants.java

@@ -28,6 +28,8 @@ public class HadoopConstants {
     public static final String SPARK_MODE_YARN_CLUSTER = "YARN_CLUSTER";
     
     public static final String SPARK_MODE_DATAPROC = "DATAPROC";
+    
+    public static final String SPARK_MODE_SYNAPSE = "SYNAPSE";
 
     public static final String FRAMEWORK = "FRAMEWORK";
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/context/ContextUtils.java

@@ -984,6 +984,14 @@ public class ContextUtils {
 
         }
 
+        public boolean remove(Item item, String param) {
+            Set<String> params = map.get(item);
+            if (params != null && params.contains(param)) {
+                return params.remove(param);
+            }
+            return false;
+        }
+
         public boolean isEmpty() {
             return map.isEmpty();
         }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/ERepositoryObjectType.java

@@ -1477,12 +1477,8 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
         return allTypes;
     }
 
-    public static List<ERepositoryObjectType> getAllTypesOfJoblet() {
+    public static List<ERepositoryObjectType> getAllBigDataTypesOfJoblet(){
         List<ERepositoryObjectType> allTypes = new ArrayList<ERepositoryObjectType>();
-
-        if (ERepositoryObjectType.JOBLET != null) {
-            allTypes.add(ERepositoryObjectType.JOBLET);
-        }
         if (ERepositoryObjectType.SPARK_JOBLET != null) {
             allTypes.add(ERepositoryObjectType.SPARK_JOBLET);
         }
@@ -1492,6 +1488,15 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
         return allTypes;
     }
 
+    public static List<ERepositoryObjectType> getAllTypesOfJoblet() {
+        List<ERepositoryObjectType> allTypes = new ArrayList<ERepositoryObjectType>();
+        allTypes.addAll(getAllBigDataTypesOfJoblet());
+        if (ERepositoryObjectType.JOBLET != null) {
+            allTypes.add(ERepositoryObjectType.JOBLET);
+        }
+        return allTypes;
+    }
+
     public static List<ERepositoryObjectType> getAllTypesOfTestContainer() {
         List<ERepositoryObjectType> allTypes = new ArrayList<ERepositoryObjectType>();
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/TalendPropertiesUtil.java

@@ -79,4 +79,8 @@ public final class TalendPropertiesUtil {
     public static String getProductApp() {
         return System.getProperty(PROD_APP);
     }
+
+    public static boolean isEnabledUseShortJobletName() {
+        return isEnabled("talend.job.build.useShortJobletName"); //$NON-NLS-1$
+    }
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_fr.properties

@@ -620,7 +620,7 @@ ProgressMonitorDialogWithCancel.executeTimeout=Suspension de l'ex\u00E9cution, l
 ProgressMonitorDialogWithCancel.CheckingConnectionJob.waitingFinish=en attente de la fin de {0}...
 ProgressMonitorDialogWithCancel.CheckingConnectionJob.emptyWaitingfinish=en attente de la fin...
 OverTimePopupDialogTask.title=Ex\u00E9cution...
-OverTimePopupDialogTask.message=T\u00E2che d'ex\u00E9cution en arri\u00E8re plan, patientez...
+OverTimePopupDialogTask.message=T\u00E2che d'ex\u00E9cution en arri\u00E8re-plan, patientez...
 OverTimePopupDialogTask.executeTimeout=Suspension de l'ex\u00E9cution, le Studio a essay\u00E9 d'interrompre la v\u00E9rification en t\u00E2che de fond.
 OverTimePopupDialogTask.killed=Ex\u00E9cution arr\u00EAt\u00E9e
 OverTimePopupDialogTask.waitingFinishMessage.default=Interruption impossible de la t\u00E2che en fond,\n

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/maven/MavenConstants.java

@@ -41,6 +41,8 @@ public interface MavenConstants {
     static final String DEFAULT_VERSION = "6.0.0";
 
     static final String SNAPSHOT = "-SNAPSHOT";
+    
+    static final String DOT_SNAPSHOT = ".SNAPSHOT";
 
     static final String POM_FILTER = "POM_FILTER";
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IStudioLiteP2Service.java

@@ -279,6 +279,10 @@ public interface IStudioLiteP2Service extends IService {
                 return true;
             }
 
+            if (responseCode != HttpURLConnection.HTTP_OK) {
+                throw new Exception("status code: " + responseCode);
+            }
+            
             return false;
         }
 
@@ -322,7 +326,7 @@ public interface IStudioLiteP2Service extends IService {
             String nodeName = IRepository.PREFERENCE_NODE + '/' + nodeKey;
 
             if (securePreferences.nodeExists(nodeName)) {
-                securePreferences.remove(nodeName);
+                securePreferences.node(nodeName).removeNode();
                 securePreferences.flush();
             }
         }

main/plugins/org.talend.core.ui/src/main/java/messages_fr.properties

@@ -560,6 +560,7 @@ ContextNebulaComposite.ContextsUnAvailable=La vue Contextes n'est pas disponible
 ContextNebulaComposite.ContextGroupLabel=Environnement du contexte par d\u00E9faut
 ContextTreeTable.PromptToolTips=activer le prompt sur variable
 ContextValidator.ParameterNotValid=le nom du param\u00E8tre n'est pas valide
+ContextValidator.ParameterValueNotMatch=Mauvaise correspondance de type/valeur\u00A0: la valeur d'une variable doit correspondre \u00E0 son type
 WorkspaceMnu.switch.text=Changer de r\u00E9pertoire &Workspace
 WorkspaceMnu.switch.tooltip=Ouvrir le r\u00E9pertoire Workspace
 WorkspaceMnu.choose.text=&Choisir...

main/plugins/org.talend.core.ui/src/main/java/messages_ja.properties

@@ -560,6 +560,7 @@ ContextNebulaComposite.ContextsUnAvailable=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\
 ContextNebulaComposite.ContextGroupLabel=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u74B0\u5883
 ContextTreeTable.PromptToolTips=\u5909\u6570\u306E\u30D7\u30ED\u30F3\u30D7\u30C8\u3092\u6709\u52B9\u5316
 ContextValidator.ParameterNotValid=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u540D\u304C\u7121\u52B9\u3067\u3059\u3002
+ContextValidator.ParameterValueNotMatch=\u578B\u3068\u5024\u306E\u4E0D\u4E00\u81F4: \u5909\u6570\u306E\u5024\u306F\u305D\u306E\u578B\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 WorkspaceMnu.switch.text=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u5207\u308A\u63DB\u3048(&W)
 WorkspaceMnu.switch.tooltip=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u958B\u304F
 WorkspaceMnu.choose.text=\u9078\u629E(&C)...
@@ -579,6 +580,6 @@ I18nPreferencePage.restart=\u518D\u8D77\u52D5
 I18nPreferencePage.restartButton=\u6709\u52B9\u5316\u306B\u306F\u518D\u8D77\u52D5\u304C\u5FC5\u8981\u3067\u3059\u3002
 I18nPreferencePage.restoreDefault=\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u5FA9\u5143
 I18nPreferencePage.wait_process=\u3053\u306E\u51E6\u7406\u306B\u306F\u6570\u5206\u304B\u304B\u308A\u307E\u3059\u3002\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044...
-MetadataPreferencePage.EnableBasic.name=\u57FA\u672C\u8A8D\u8A3C\u30D8\u30C3\u30C0\u30FC\u3092\u6709\u52B9\u306B\u3059\u308B
+MetadataPreferencePage.EnableBasic.name=\u57FA\u672C\u8A8D\u8A3C\u30D8\u30C3\u30C0\u30FC\u3092\u6709\u52B9\u5316
 MetadataPreferencePage.MessageDialog.Restart=\u3053\u306E\u8A2D\u5B9A\u304C\u6709\u52B9\u306B\u306A\u308B\u3088\u3046\u3001Studio\u3092\u518D\u8D77\u52D5\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\u7D9A\u884C\u3057\u307E\u3059\u304B?
 TalendTabbedPropertyTitle.componentHelpTooltip=\u30AA\u30F3\u30E9\u30A4\u30F3\u30D8\u30EB\u30D7\u3092\u958B\u304F

main/plugins/org.talend.core.ui/src/main/java/messages_zh_CN.properties

@@ -560,6 +560,7 @@ ContextNebulaComposite.ContextsUnAvailable=\u4E0A\u4E0B\u6587\u89C6\u56FE\u4E0D\
 ContextNebulaComposite.ContextGroupLabel=\u9ED8\u8BA4\u4E0A\u4E0B\u6587\u73AF\u5883
 ContextTreeTable.PromptToolTips=\u6FC0\u6D3B\u63D0\u793A\u53D8\u91CF
 ContextValidator.ParameterNotValid=\u53C2\u6570\u540D\u65E0\u6548
+ContextValidator.ParameterValueNotMatch=\u7C7B\u578B/\u503C\u4E0D\u5339\u914D\uFF1A\u53D8\u91CF\u7684\u503C\u4E0E\u5176\u7C7B\u578B\u4E0D\u5339\u914D
 WorkspaceMnu.switch.text=\u5207\u6362\u5DE5\u4F5C\u533A(&W)
 WorkspaceMnu.switch.tooltip=\u6253\u5F00\u5DE5\u4F5C\u533A
 WorkspaceMnu.choose.text=\u9009\u62E9(&C)...

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/ContextTreeTable.java

@@ -132,7 +132,7 @@ public class ContextTreeTable {
 
     private NatTable natTable;
 
-    // for bug TDI-32821， use LinkedList to keep the original order of context parameter list.
+    // for bug TDI-32821锛<EFBFBD> use LinkedList to keep the original order of context parameter list.
     private List<ContextTreeNode> treeNodes = new LinkedList<ContextTreeNode>();
 
     private static Map<String, Boolean> expandMap = new HashMap<>();
@@ -274,7 +274,7 @@ public class ContextTreeTable {
             final GridLayer gridLayer = new GridLayer(viewportLayer, sortHeaderLayer, rowHeaderLayer, cornerLayer);
 
             // config the column edit configuration
-            ContextValueLabelAccumulator labelAccumulator = new ContextValueLabelAccumulator(bodyDataLayer, bodyDataProvider);
+            ContextValueLabelAccumulator labelAccumulator = new ContextValueLabelAccumulator(bodyDataLayer, bodyDataProvider, manager.getContextManager(), columnGroupModel);
             bodyDataLayer.setConfigLabelAccumulator(labelAccumulator);
             registerColumnLabels(labelAccumulator, ContextRowDataListFixture.getContexts(manager.getContextManager()));
 

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/model/table/ContextTableConstants.java

@@ -28,10 +28,10 @@ public class ContextTableConstants {
     public static final String COLUMN_PROMPT_PROPERTY = "Prompt label"; //$NON-NLS-1$
 
     public static final String COLUMN_CONTEXT_VALUE = "Value"; //$NON-NLS-1$
-    
-    public static final String LABEL_VALUE_NOT_MATCH_TYPE = "LABEL_VALUE_NOT_MATCH_TYPE";
-    
+    
     public static final String LABEL_CHANGED_FORCEGROUND = "LABEL_CHANGED_FORCEGROUND";
-    
+    
+    public static final String LABEL_VALUE_NOT_MATCH_TYPE = "LABEL_VALUE_NOT_MATCH_TYPE";
+
     public static final int DEFAULT_COLUMN_COUNT = 8;
 }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextNatTableConfiguration.java

@@ -137,7 +137,6 @@ public class ContextNatTableConfiguration extends AbstractRegistryConfiguration
 
         Style cellStyleSelect = new Style();
         cellStyleSelect.setAttributeValue(CellStyleAttributes.BACKGROUND_COLOR, GUIHelper.COLOR_TITLE_INACTIVE_BACKGROUND);
-        cellStyleSelect.setAttributeValue(CellStyleAttributes.FOREGROUND_COLOR, GUIHelper.COLOR_RED);
         cellStyleSelect.setAttributeValue(CellStyleAttributes.FONT, GUIHelper.DEFAULT_FONT);
         configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleSelect, DisplayMode.SELECT,
                 ContextTableConstants.COLUMN_TYPE_PROPERTY);
@@ -162,7 +161,7 @@ public class ContextNatTableConfiguration extends AbstractRegistryConfiguration
         configRegistry.registerConfigAttribute(EditConfigAttributes.DATA_VALIDATOR,
                 new EventDataValidator(dataProvider, manager), DisplayMode.EDIT, ContextTableConstants.COLUMN_NAME_PROPERTY);
         configRegistry.registerConfigAttribute(EditConfigAttributes.DATA_VALIDATOR,
-                new EventDataValueValidator(dataProvider, manager), DisplayMode.EDIT, ContextTableConstants.COLUMN_CONTEXT_VALUE);
+                new EventDataValueValidator(dataProvider, manager, columnGroupModel), DisplayMode.EDIT, ContextTableConstants.COLUMN_CONTEXT_VALUE);
     }
 
     private void registerErrorHandlingStrategies(IConfigRegistry configRegistry) {

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextNatTableStyleConfiguration.java

@@ -73,15 +73,16 @@ public class ContextNatTableStyleConfiguration extends AbstractRegistryConfigura
         cellStyle.setAttributeValue(CellStyleAttributes.VERTICAL_ALIGNMENT, vAlign);
         cellStyle.setAttributeValue(CellStyleAttributes.BORDER_STYLE, borderStyle);
         configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyle);
-        
+        
         Style cellStyleValueError = new Style();
         cellStyleValueError.setAttributeValue(CellStyleAttributes.FOREGROUND_COLOR, ColorConstants.ERROR_FONT_COLOR);
         configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleValueError, DisplayMode.NORMAL, ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE);
+        configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleValueError, DisplayMode.SELECT, ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE);
         
         Style cellStyleChangedForceGround = new Style();
-        cellStyleChangedForceGround.setAttributeValue(CellStyleAttributes.FOREGROUND_COLOR, GUIHelper.COLOR_WIDGET_DARK_SHADOW);
+        cellStyleChangedForceGround.setAttributeValue(CellStyleAttributes.FOREGROUND_COLOR, ColorConstants.getTableReadOnlyForegroundColor());
         configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleChangedForceGround, DisplayMode.NORMAL, ContextTableConstants.LABEL_CHANGED_FORCEGROUND);        
-        
+        
         configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new DefaultDisplayConverter());
 
     }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextNatTableUtils.java

@@ -203,34 +203,6 @@ public class ContextNatTableUtils {
             return ((ContextTableTabChildModel) element).getContextParameter().getName();
         }
     }
-    
-    private static IContextParameter getContextParameter(Object element, int index) {
-        if (element instanceof ContextTableTabParentModel) {
-            ContextTableTabParentModel parentMode = (ContextTableTabParentModel) element;
-            if (parentMode.getContextParameter() != null && parentMode.getContextParameter().getContext() != null) {
-                return parentMode.getContextParameter().getContext().getContextParameter(parentMode.getContextParameter().getName());
-            }
-        } else if (element instanceof ContextTableTabChildModel) {
-            return ((ContextTableTabChildModel) element).getContextParameter();
-        }
-        return null;
-    }
-    
-    public static String getCurrentContextDataType(Object element, int index) {
-        IContextParameter contextParameter = getContextParameter(element, index);
-        if (contextParameter != null) {
-            return contextParameter.getType();
-        }
-        return null;
-    }
-
-    public static String getCurrentContextValue(Object element, int index) {
-        IContextParameter contextParameter = getContextParameter(element, index);
-        if (contextParameter != null) {
-            return contextParameter.getValue();
-        }
-        return null;
-    }
 
     public static String getSpecialTypeDisplayValue(String parameterType, String parameterValue) {
         if (isResourceType(parameterType)) {

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextValueLabelAccumulator.java

@@ -14,23 +14,30 @@ package org.talend.core.ui.context.nattableTree;
 
 import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
 import org.eclipse.nebula.widgets.nattable.extension.glazedlists.GlazedListsDataProvider;
+import org.eclipse.nebula.widgets.nattable.group.ColumnGroupModel;
 import org.eclipse.nebula.widgets.nattable.layer.ILayer;
 import org.eclipse.nebula.widgets.nattable.layer.LabelStack;
 import org.eclipse.nebula.widgets.nattable.layer.cell.ColumnOverrideLabelAccumulator;
+import org.talend.core.model.process.IContextManager;
+import org.talend.core.model.process.IContextParameter;
 import org.talend.core.ui.context.ContextTreeTable.ContextTreeNode;
 import org.talend.core.ui.context.model.ContextTabChildModel;
 import org.talend.core.ui.context.model.table.ContextTableConstants;
-import org.talend.core.ui.context.model.table.ContextTableTabParentModel;
+import org.talend.core.ui.context.model.table.ContextTableTabParentModel;
 import org.talend.core.ui.utils.ContextTypeValidator;
 
 
 public class ContextValueLabelAccumulator extends ColumnOverrideLabelAccumulator {
 
     private IDataProvider dataProvider;
-    
-    public ContextValueLabelAccumulator(ILayer layer, IDataProvider dataProvider) {
+    private ColumnGroupModel columnGroupModel;
+    private IContextManager manager;
+
+    public ContextValueLabelAccumulator(ILayer layer, IDataProvider dataProvider, IContextManager manager, ColumnGroupModel columnGroupModel) {
         super(layer);
         this.dataProvider = dataProvider;
+        this.manager = manager;
+        this.columnGroupModel = columnGroupModel;
     }
 
    
@@ -40,17 +47,21 @@ public class ContextValueLabelAccumulator extends ColumnOverrideLabelAccumulator
         boolean isAddedValueNotMatchStyle = false;        
         ContextTreeNode rowNode = ((GlazedListsDataProvider<ContextTreeNode>) dataProvider).getList().get(rowPosition);
         if (configLabels.contains(ContextTableConstants.COLUMN_CONTEXT_VALUE)) {
-            String dataType = ContextNatTableUtils.getCurrentContextDataType(rowNode.getTreeData(), rowPosition);
-            String value = ContextNatTableUtils.getCurrentContextValue(rowNode.getTreeData(), rowPosition);
-            boolean isValid = ContextTypeValidator.isMatchType(dataType, value);
-            if (isValid) {
-                configLabels.remove(ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE);
-            } else {
-                configLabels.addLabel(ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE);
-                isAddedValueNotMatchStyle = true;
+            if (columnGroupModel != null && columnGroupModel.isPartOfAGroup(columnPosition)) {
+                String columnGroupName = columnGroupModel.getColumnGroupByIndex(columnPosition).getName();
+                IContextParameter realPara = ContextNatTableUtils.getRealParameter(manager, columnGroupName, rowNode.getTreeData());
+                if (realPara != null) {
+                    boolean isValid = ContextTypeValidator.isMatchType(realPara.getType(), realPara.getValue());
+                    if (isValid) {
+                        configLabels.remove(ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE);
+                    } else {
+                        configLabels.addLabel(ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE);
+                        isAddedValueNotMatchStyle = true;
+                    }
+                }
             }
         }
-        
+        
         if (!isAddedValueNotMatchStyle) {
             if (rowNode.getTreeData() instanceof ContextTableTabParentModel) {
                 ContextTableTabParentModel rowModel = (ContextTableTabParentModel) rowNode.getTreeData();

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/EventDataValueValidator.java

@@ -16,29 +16,39 @@ import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
 import org.eclipse.nebula.widgets.nattable.data.validate.DataValidator;
 import org.eclipse.nebula.widgets.nattable.data.validate.ValidationFailedException;
 import org.eclipse.nebula.widgets.nattable.extension.glazedlists.GlazedListsDataProvider;
+import org.eclipse.nebula.widgets.nattable.group.ColumnGroupModel;
 import org.talend.core.model.process.IContextManager;
+import org.talend.core.model.process.IContextParameter;
 import org.talend.core.ui.context.ContextTreeTable.ContextTreeNode;
 import org.talend.core.ui.i18n.Messages;
 import org.talend.core.ui.utils.ContextTypeValidator;
 
 public class EventDataValueValidator extends DataValidator {
 
+    private ColumnGroupModel columnGroupModel;
     private IDataProvider dataProvider;
 
     private IContextManager manager;
 
-    EventDataValueValidator(IDataProvider bodyDataProvider, IContextManager manager) {
+    EventDataValueValidator(IDataProvider bodyDataProvider, IContextManager manager, ColumnGroupModel columnGroupModel) {
         this.dataProvider = bodyDataProvider;
         this.manager = manager;
+        this.columnGroupModel = columnGroupModel;
     }
 
     @Override
     public boolean validate(int columnIndex, int rowIndex, Object newValue) {
+        boolean isValid = true;
         ContextTreeNode rowNode = ((GlazedListsDataProvider<ContextTreeNode>) dataProvider).getList().get(rowIndex);
-        String dataType = ContextNatTableUtils.getCurrentContextDataType(rowNode.getTreeData(), rowIndex);
-        boolean isValid = ContextTypeValidator.isMatchType(dataType, newValue);
-        if (!isValid) {
-            throw new ValidationFailedException(Messages.getString("ContextValidator.ParameterValueNotMatch")); //$NON-NLS-1$
+        if (columnGroupModel != null && columnGroupModel.isPartOfAGroup(columnIndex)) {
+            String columnGroupName = columnGroupModel.getColumnGroupByIndex(columnIndex).getName();
+            IContextParameter realPara = ContextNatTableUtils.getRealParameter(manager, columnGroupName, rowNode.getTreeData());
+            if (realPara != null) {
+                isValid = ContextTypeValidator.isMatchType(realPara.getType(), newValue);
+                if (!isValid) {
+                    throw new ValidationFailedException(Messages.getString("ContextValidator.ParameterValueNotMatch")); //$NON-NLS-1$
+                }   
+            }
         }
         return isValid;
     }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ExtendedContextColumnPropertyAccessor.java

@@ -425,6 +425,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
+                        modelManager.refresh();
                     }
                 }
             }
@@ -507,6 +508,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
+                        modelManager.refresh();
                     }
                 }
             }
@@ -588,6 +590,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
+                        modelManager.refresh();
                     }
                 }
             }
@@ -684,6 +687,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
+                        modelManager.refresh();
                     }
                 }
             }

main/plugins/org.talend.core/src/main/java/org/talend/core/services/IGITProviderService.java

@@ -63,6 +63,12 @@ public interface IGITProviderService extends IService {
      */
     boolean isStandardMode();
     
+    /**
+     * Whether git storage mode is set in preference or not
+     * @return
+     */
+    boolean isGitModeInPreference();
+    
     /**
      * Set git mode
      * @param standardMode

main/plugins/org.talend.designer.maven.repo.tcksdk/pom.xml

@@ -16,14 +16,14 @@
 		<jcache.version>1.0.5</jcache.version>
 		<jcache_spec.version>1.0-alpha-1</jcache_spec.version>
 		<johnzon.version>1.2.19</johnzon.version>
-		<meecrowave.version>1.2.14</meecrowave.version>
+		<meecrowave.version>1.2.15</meecrowave.version>
 		<microprofile.version>1.2.1</microprofile.version>
 		<owb.version>2.0.27</owb.version>
 		<slf4j.version>1.7.34</slf4j.version>
-		<tomcat.version>9.0.69</tomcat.version>
+		<tomcat.version>9.0.73</tomcat.version>
 		<xbean.version>4.20</xbean.version>
 		<reload4j.version>1.2.22</reload4j.version>
-		<log4j2.version>2.18.0</log4j2.version>
+		<log4j2.version>2.20.0</log4j2.version>
 		<tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
 	</properties>
 	<repositories>

main/plugins/org.talend.designer.maven.tos/resources/tcompv1/pom.xml

@@ -11,7 +11,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <tcomp.version>1.54.0</tcomp.version>
+        <tcomp.version>1.55.2</tcomp.version>
         <slf4j.version>1.7.34</slf4j.version>
         <reload4j.version>1.2.22</reload4j.version>
     </properties>

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/PomIdsHelper.java

@@ -377,8 +377,8 @@ public class PomIdsHelper {
             if (version == null) {
                 version = VersionUtils.getPublishVersion(property.getVersion());
             }
-            if (useSnapshot && version != null && !version.contains(MavenConstants.SNAPSHOT)) {
-                version += MavenConstants.SNAPSHOT;
+            if (useSnapshot && version != null && !version.contains(MavenConstants.DOT_SNAPSHOT)) {
+                version += MavenConstants.DOT_SNAPSHOT;
             }
         }
         return version;

main/plugins/org.talend.libraries.apache/.classpath

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/apache-mime4j-0.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/castor-1.0.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jakarta-oro-2.0.8.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="lib" path="lib/apache-mime4j-core-0.8.9.jar" sourcepath="lib/apache-mime4j-core-0.8.9.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/castor-1.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jakarta-oro-2.0.8.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

main/plugins/org.talend.libraries.apache/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: Apache Plug-in
 Bundle-SymbolicName: org.talend.libraries.apache
 Bundle-Version: 8.0.1.qualifier
 Bundle-ClassPath: .,
- lib/apache-mime4j-0.6.jar,
+ lib/apache-mime4j-core-0.8.9.jar,
  lib/castor-1.0.3.jar,
  lib/jakarta-oro-2.0.8.jar
 Bundle-Vendor: .Talend SA.
@@ -16,21 +16,8 @@ Require-Bundle: org.apache.log4j;resolution:=optional,
 Export-Package: 
  org.apache.james.mime4j,
  org.apache.james.mime4j.codec,
- org.apache.james.mime4j.descriptor,
- org.apache.james.mime4j.field,
- org.apache.james.mime4j.field.address,
- org.apache.james.mime4j.field.address.parser,
- org.apache.james.mime4j.field.contentdisposition.parser,
- org.apache.james.mime4j.field.contenttype.parser,
- org.apache.james.mime4j.field.datetime,
- org.apache.james.mime4j.field.datetime.parser,
- org.apache.james.mime4j.field.language.parser,
- org.apache.james.mime4j.field.mimeversion.parser,
- org.apache.james.mime4j.field.structured.parser,
  org.apache.james.mime4j.io,
- org.apache.james.mime4j.message,
  org.apache.james.mime4j.parser,
- org.apache.james.mime4j.storage,
  org.apache.james.mime4j.util,
  org.apache.oro.io,
  org.apache.oro.text,

main/plugins/org.talend.libraries.apache/pom.xml

@@ -81,6 +81,11 @@
 			<artifactId>log4j-1.2-api</artifactId>
 			<version>${log4j2.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.james</groupId>
+			<artifactId>apache-mime4j-core</artifactId>
+			<version>0.8.9</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -109,7 +114,7 @@
 							<excludeTypes>pom</excludeTypes>
 							<excludeTransitive>true</excludeTransitive>
 							<outputDirectory>${project.basedir}/lib</outputDirectory>
-							<includeGroupIds>ch.qos.reload4j,org.slf4j,org.apache.logging.log4j</includeGroupIds>
+							<includeGroupIds>ch.qos.reload4j,org.slf4j,org.apache.logging.log4j,org.apache.james</includeGroupIds>
 						</configuration>
 					</execution>
 				</executions>

main/plugins/org.talend.libraries.csv/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/talendcsv-1.0.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/talendcsv-1.1.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/csv-1.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

main/plugins/org.talend.libraries.csv/META-INF/MANIFEST.MF

@@ -5,7 +5,8 @@ Bundle-SymbolicName: org.talend.libraries.csv
 Bundle-Version: 8.0.1.qualifier
 Bundle-ClassPath: .,
  lib/csv-1.0.jar,
- lib/talendcsv-1.0.0.jar
+ lib/talendcsv-1.1.0.jar
+Require-Bundle: org.slf4j.api
 Export-Package: com.talend.csv,
  org.skife.csv
 Bundle-ActivationPolicy: lazy

main/plugins/org.talend.libraries.csv/build.properties

@@ -2,4 +2,4 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                lib/csv-1.0.jar,\
-               lib/talendcsv-1.0.0.jar
+               lib/talendcsv-1.1.0.jar

main/plugins/org.talend.libraries.csv/pom.xml

@@ -29,7 +29,7 @@
                 <artifactItem>
                   <groupId>org.talend.components</groupId>
                   <artifactId>talendcsv</artifactId>
-                  <version>1.0.0</version>
+                  <version>1.1.0</version>
                 </artifactItem>
               </artifactItems>
             </configuration>

main/plugins/org.talend.metadata.managment.ui/src/main/java/messages_ja.properties

@@ -250,7 +250,7 @@ FileStep2.fieldSeparatorNotFinishByComma=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5
 FileStep2.fieldSeparatorPositionalAlert=\u6570\u5B57\u3092\u30B3\u30F3\u30DE\u3067\u533A\u5207\u3063\u3066\u3001\u30AB\u30E9\u30E0\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 FileStep2.fieldSeparatorPositionalTip=\u5404\u30AB\u30E9\u30E0\u306E\u4F4D\u7F6E\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u4F4D\u7F6E\u306F\u6607\u9806\u3067\u8A18\u8FF0\u3057\u3066\u304F\u3060\u3055\u3044
 FileStep2.filePathIncomplete=\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
-FileStep2.firstRowsIsCaption=\u5217\u540D\u3068\u3057\u3066\u5148\u982D\u884C\u3092\u8A2D\u5B9A
+FileStep2.firstRowsIsCaption=\u30AB\u30E9\u30E0\u540D\u3068\u3057\u3066\u5148\u982D\u884C\u3092\u8A2D\u5B9A
 FileStep2.footer=\u30D5\u30C3\u30BF\u30FC
 FileStep2.footerTip=\u30D5\u30C3\u30BF\u30FC
 FileStep2.groupDelimitedFileSettings=\u30D5\u30A1\u30A4\u30EB\u8A2D\u5B9A
@@ -271,10 +271,10 @@ FileStep2.previewProgress=\u30D7\u30EC\u30D3\u30E5\u30FC\u3092\u51E6\u7406\u4E2D
 FileStep2.refreshPreview=\u30D7\u30EC\u30D3\u30E5\u30FC\u3092\u66F4\u65B0
 FileStep2.removeEmptyRow=\u7A7A\u306E\u884C\u3092\u30B9\u30AD\u30C3\u30D7
 FileStep2.rowSeparator=\u884C\u533A\u5207\u308A
-FileStep2.rowSeparatorAlert=\u6587\u5B57\u306E\u30ED\u30A6\u30BB\u30D1\u30EC\u30FC\u30BF\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
+FileStep2.rowSeparatorAlert=\u6587\u5B57\u306E\u884C\u30BB\u30D1\u30EC\u30FC\u30BF\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 FileStep2.rowSeparatorIncomplete=\u884C\u533A\u5207\u308A\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 FileStep2.rowSeparatorTip=\u884C\u533A\u5207\u308A
-FileStep2.rowsToSkipTip=\u884C\u3092\u7121\u8996\u3059\u308B\u5834\u5408\u306F\u3001\u4EE5\u4E0B\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044,
+FileStep2.rowsToSkipTip=\u884C\u3092\u7121\u8996\u3059\u308B\u5834\u5408\u306F\u3001\u4EE5\u4E0B\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 FileStep2.settingsIncomplete=\u30D7\u30EC\u30D3\u30E5\u30FC\u3092\u8868\u793A\u3059\u308B\u306B\u306F\u3001\u8A2D\u5B9A\u3092\u5B8C\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 FileStep2.splitwayRecordForJavaFID=\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u524D\u306E\u884C\u3092\u5206\u5272
 FileStep2.splitwayRecordForJavaFIDTip=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5207\u308A\u304C\u884C\u533A\u5207\u308A\u306E\u4E00\u90E8\u3067\u3042\u308B\u5834\u5408\u306B\u6709\u52B9\u3067\u3059\u3002
@@ -471,7 +471,7 @@ WSDLSchemaStep1Form.TimeOutTitle=\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u79D2)
 WSDLSchemaWizard.CreateNewWSDLSchema=\u65B0\u3057\u3044WSDL\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
 WSDLSchemaWizard.SaveAsWSDLSchema=WSDL\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
 WSDLSchemaWizard.UpdateWSDLSchema=WSDL\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-XPathProposalProvider.contentProposal=<< \u3042\u307E\u308A\u306B\u3082\u591A\u304F\u306E\u30CE\u30FC\u30C9\u3001\u5024\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093 ... >>,
+XPathProposalProvider.contentProposal=<< \u3042\u307E\u308A\u306B\u3082\u591A\u304F\u306E\u30CE\u30FC\u30C9\u3001\u5024\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093 ... >>
 XmlFileStep1.filepathXml=XML
 XmlFileStep1.groupFileViewer=\u30B9\u30AD\u30FC\u30DE\u30D3\u30E5\u30FC\u30A2\u30FC
 XmlFileStep1.groupSchemaTarget=\u30BF\u30FC\u30B2\u30C3\u30C8\u30B9\u30AD\u30FC\u30DE

main/plugins/org.talend.migrationTool/src/org/talend/migrationtool/MigrationToolService.java

@@ -23,6 +23,7 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -243,20 +244,14 @@ public class MigrationToolService implements IMigrationToolService {
         sortMigrationTasks(toExecute);
 
         final List<MigrationTask> done = new ArrayList<MigrationTask>(storedMigrations);
-        int nbMigrationsToDo = 0;
-        for (IProjectMigrationTask task : toExecute) {
-            MigrationTask mgTask = MigrationUtil.findMigrationTask(done, task);
-            if (mgTask == null && !task.isDeprecated()) {
-                nbMigrationsToDo++;
-            }
-        }
+        boolean hasTaskToExecute = toExecute.stream()
+                .anyMatch(task -> !task.isDeprecated() && MigrationUtil.findMigrationTask(done, task) == null);
 
         // force to redo the migration task for the relations only if user ask for "clean" or if relations is empty
         // or if there is at least another migration to do.
-        if (!beforeLogon
-                && (!RelationshipItemBuilder.INDEX_VERSION.equals(project.getEmfProject().getItemsRelationVersion()) || nbMigrationsToDo > 0)) {
+        if (!beforeLogon && (!RelationshipItemBuilder.INDEX_VERSION.equals(project.getEmfProject().getItemsRelationVersion())
+                || hasTaskToExecute)) {
             // force to redo this migration task, to make sure the relationship is done correctly
-            // done.remove(RELATION_TASK);
             MigrationUtil.removeMigrationTaskById(done, RELATION_TASK);
             RelationshipItemBuilder.getInstance().unloadRelations();
 
@@ -267,39 +262,35 @@ public class MigrationToolService implements IMigrationToolService {
                     RelationshipItemBuilder.JOBLET_RELATION, true);
             // reset
             RelationshipItemBuilder.getInstance().unloadRelations();
-
-            nbMigrationsToDo++;
+            hasTaskToExecute = true;
         }
-        if (nbMigrationsToDo == 0) {
+
+        boolean checkDupContext = !beforeLogon && Boolean.getBoolean("duplicate.context.reference.check");
+        if (!hasTaskToExecute && !checkDupContext) {
             return;
         }
 
-        // force execute migration in case user copy-past items with diffrent path on the file system and refresh
-        // the studio,it may cause bug TDI-19229
-        MigrationUtil.removeMigrationTaskById(done, "org.talend.repository.model.migration.FixProjectResourceLink");
-
-        if (beforeLogon) {
-            // for every migration, force reset to default maven template
-            MigrationUtil.removeMigrationTaskById(done, "org.talend.repository.model.migration.ResetMavenTemplateMigrationTask");
+        if (checkDupContext) {
+            MigrationUtil.removeMigrationTaskById(done,
+                    "org.talend.repository.model.migration.RemoveDuplicateContextReferencesMigrationTask");
         }
+        if (hasTaskToExecute) {
+            // force execute migration in case user copy-past items with diffrent path on the file system and refresh
+            // the studio,it may cause bug TDI-19229
+            MigrationUtil.removeMigrationTaskById(done, "org.talend.repository.model.migration.FixProjectResourceLink");
 
-        boolean haveAnyBinFolder = false; // to avoid some problems of migration, sometimes
-        for (ERepositoryObjectType type : (ERepositoryObjectType[]) ERepositoryObjectType.values()) {
-            if (!type.hasFolder()) {
-                continue;
+            if (beforeLogon) {
+                // for every migration, force reset to default maven template
+                MigrationUtil.removeMigrationTaskById(done,
+                        "org.talend.repository.model.migration.ResetMavenTemplateMigrationTask");
             }
-            String folderName = ERepositoryObjectType.getFolderName(type);
-            if (folderName == null || "".equals(folderName)) {
-                continue;
+            boolean hasBinFolder = Stream.of((ERepositoryObjectType[]) ERepositoryObjectType.values())
+                    .filter(type -> type.hasFolder()).map(ERepositoryObjectType::getFolderName).filter(StringUtils::isNotBlank)
+                    .map(folderName -> fsProject.getFolder(folderName))
+                    .anyMatch(folder -> folder.exists() && folder.getFolder("bin").exists());
+            if (hasBinFolder) {
+                MigrationUtil.removeMigrationTaskById(done, "org.talend.repository.model.migration.RemoveBinFolderMigrationTask");
             }
-            IFolder folder = fsProject.getFolder(folderName);
-            if (folder.exists() && folder.getFolder("bin").exists()) { //$NON-NLS-1$
-                haveAnyBinFolder = true;
-                break;
-            }
-        }
-        if (haveAnyBinFolder) {
-            MigrationUtil.removeMigrationTaskById(done, "org.talend.repository.model.migration.RemoveBinFolderMigrationTask");
         }
 
         final SubProgressMonitor subProgressMonitor = new SubProgressMonitor(monitorWrap, toExecute.size());

main/plugins/org.talend.rcp/src/main/java/messages_fr.properties

@@ -45,6 +45,7 @@ LinksToolbarItem_exchange=Lien vers Talend Exchange
 LinksToolbarItem_Learn=Talend Help Center - Doc et base de connaissances en ligne
 LinksToolbarItem_videos=Lien vers les tutoriels guid\u00E9s Talend
 RegisterWizard.windowTitle=Enregistrement de {0}
+ResourceToolbarHandler.documentationLink=https://document-link.us.cloud.talend.com/thc_studio-support-doc?version=cloud&lang=fr&env=prd
 tips.createJob=D'abord, cr\u00E9ez un Job pour votre flux de donn\u00E9es \u00E0 l'aide du <a>Job Designer</a>.
 tips.clickChoose=Cliquez-droit et s\u00E9lectionnez l'option
 tips.optionMenu=dans le menu
@@ -58,6 +59,7 @@ tips.welcome=Bienvenue dans
 tips.title=est un outil puissant et flexible qui vous permet de contr\u00F4ler vos donn\u00E9es.
 tips.getStart=Avant de commencer, voici les bases :
 tips.runJob=Ex\u00E9cuter le Job
+TalendHelpDocAction.documentationLink=https://document-link.us.cloud.talend.com/thc_studio-help-menu?version=cloud&lang=fr&env=prd
 starting.intro1=Bienvenue dans
 starting.intro2=Cet outil puissant et flexible vous permet de contr\u00F4ler vos donn\u00E9es
 starting.intro3=Avant de commencer, voici les bases

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;
@@ -90,7 +96,7 @@ public class ApplicationWorkbenchAdvisor extends IDEWorkbenchAdvisor {
 
     private void injectVariables() {
         IWorkbench workbench = PlatformUI.getWorkbench();
-        IEclipseContext activeContext = ((IEclipseContext) workbench.getService(IEclipseContext.class)).getActiveLeaf();
+        IEclipseContext activeContext = workbench.getService(IEclipseContext.class).getActiveLeaf();
         ContextInjectionFactory.inject(this, activeContext);
     }
 
@@ -227,7 +233,7 @@ public class ApplicationWorkbenchAdvisor extends IDEWorkbenchAdvisor {
 
     @Override
     public String getInitialWindowPerspectiveId() {
-        IBrandingService brandingService = (IBrandingService) GlobalServiceRegister.getDefault().getService(
+        IBrandingService brandingService = GlobalServiceRegister.getDefault().getService(
                 IBrandingService.class);
         if (brandingService != null) {
             IBrandingConfiguration brandingConfiguration = brandingService.getBrandingConfiguration();
@@ -288,12 +294,33 @@ public class ApplicationWorkbenchAdvisor extends IDEWorkbenchAdvisor {
         if (!ArrayUtils.contains(Platform.getApplicationArgs(), EclipseCommandLine.TALEND_DISABLE_LOGINDIALOG_COMMAND)) {
             RegisterManagement.getInstance().validateRegistration();
         }
-
+        PreferenceManager pm = PlatformUI.getWorkbench().getPreferenceManager();
         // not git project, do not show git settings preference page
         if (IGITProviderService.get() == null || !IGITProviderService.get().isProjectInGitMode()) {
-            PreferenceManager pm = PlatformUI.getWorkbench().getPreferenceManager();
             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.repository.mdm/src/main/java/messages_ja.properties

@@ -71,7 +71,7 @@ ExtractionFieldsWithXPathEditorView.columnTitle.xPath=\u76F8\u5BFE\u307E\u305F\u
 ExtractionFieldsWithXPathEditorView.columnTitle.columnName=\u30AB\u30E9\u30E0\u540D
 ExtractionFieldsWithXPathEditorView.columnName=\u30AB\u30E9\u30E0\u540D
 ExtractionFieldsWithXPathEditorView.exist=\u304C\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059\u3002
-XPathProposalProvider.contentProposal=<< \u3042\u307E\u308A\u306B\u3082\u591A\u304F\u306E\u30CE\u30FC\u30C9\u3001\u5024\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093 ... >>,
+XPathProposalProvider.contentProposal=<< \u3042\u307E\u308A\u306B\u3082\u591A\u304F\u306E\u30CE\u30FC\u30C9\u3001\u5024\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093 ... >>
 XmlToXPathLinker.Loop=\u30EB\u30FC\u30D7\u30EA\u30F3\u30AF\u3092\u4F5C\u6210...
 XmlToXPathLinker.beginTask.fieldLinksCreation=\u30D5\u30A3\u30FC\u30EB\u30C9\u30EA\u30F3\u30AF\u306E\u4F5C\u6210...
 XmlToXPathLinker.illegalArgumentException=currentControl\u306E\u3053\u306E\u30BF\u30A4\u30D7\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093

main/plugins/org.talend.repository.metadata/META-INF/MANIFEST.MF

@@ -36,7 +36,8 @@ Require-Bundle: org.apache.commons.lang,
  org.talend.libraries.jackson,
  org.apache.xerces,
  org.talend.hadoop.distribution,
- org.talend.repository
+ org.talend.repository,
+ org.talend.designer.mapper
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Export-Package: org.talend.repository.metadata,

main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/metadata/i18n/messages_fr.properties

@@ -159,7 +159,7 @@ DocumentationUpdateWizard.windowTitle=Mettre \u00E0 jour la documentation
 EbcdicForm.noDir=Le r\u00E9pertoire du fichier xc2j n'existe pas.
 EbcdicForm.genarateFailure=\u00C9chec lors de la g\u00E9n\u00E9ration du fichier xc2j.
 EbcdicForm.dataFile=Fichier de donn\u00E9es
-EbcdicForm.dataNotExist=Ficher de donn\u00E9es inexistant
+EbcdicForm.dataNotExist=Fichier de donn\u00E9es inexistant
 EbcdicForm.dataNull=Le chemin d'acc\u00E8s au fichier de donn\u00E9es doit \u00EAtre sp\u00E9cifi\u00E9
 EDemoProjectFileType.unknowType=Type de fichier inconnu
 EditContextAction.editContext=Modifier le groupe de contextes

main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/metadata/i18n/messages_ja.properties

@@ -239,7 +239,7 @@ FileStep2.fieldSeparatorNotFinishByComma=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5
 FileStep2.fieldSeparatorPositionalAlert=\u6570\u5B57\u3092\u30B3\u30F3\u30DE\u3067\u533A\u5207\u3063\u3066\u3001\u30AB\u30E9\u30E0\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 FileStep2.fieldSeparatorPositionalTip=\u5404\u30AB\u30E9\u30E0\u306E\u4F4D\u7F6E\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u4F4D\u7F6E\u306F\u6607\u9806\u3067\u8A18\u8FF0\u3057\u3066\u304F\u3060\u3055\u3044
 FileStep2.filePathIncomplete=\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
-FileStep2.firstRowsIsCaption=\u5217\u540D\u3068\u3057\u3066\u5148\u982D\u884C\u3092\u8A2D\u5B9A
+FileStep2.firstRowsIsCaption=\u30AB\u30E9\u30E0\u540D\u3068\u3057\u3066\u5148\u982D\u884C\u3092\u8A2D\u5B9A
 FileStep2.footer=\u30D5\u30C3\u30BF\u30FC
 FileStep2.footerTip=\u30D5\u30C3\u30BF\u30FC
 FileStep2.groupDelimitedFileSettings=\u30D5\u30A1\u30A4\u30EB\u8A2D\u5B9A
@@ -262,10 +262,10 @@ FileStep2.quoteDelimitedTip=\u30A8\u30B9\u30B1\u30FC\u30D7\u6587\u5B57\u306A\u30
 FileStep2.refreshPreview=\u30D7\u30EC\u30D3\u30E5\u30FC\u3092\u66F4\u65B0
 FileStep2.removeEmptyRow=\u7A7A\u306E\u884C\u3092\u30B9\u30AD\u30C3\u30D7
 FileStep2.rowSeparator=\u884C\u533A\u5207\u308A
-FileStep2.rowSeparatorAlert=\u6587\u5B57\u306E\u30ED\u30A6\u30BB\u30D1\u30EC\u30FC\u30BF\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
+FileStep2.rowSeparatorAlert=\u6587\u5B57\u306E\u884C\u30BB\u30D1\u30EC\u30FC\u30BF\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 FileStep2.rowSeparatorIncomplete=\u884C\u533A\u5207\u308A\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 FileStep2.rowSeparatorTip=\u884C\u533A\u5207\u308A
-FileStep2.rowsToSkipTip=\u884C\u3092\u7121\u8996\u3059\u308B\u5834\u5408\u306F\u3001\u4EE5\u4E0B\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044,
+FileStep2.rowsToSkipTip=\u884C\u3092\u7121\u8996\u3059\u308B\u5834\u5408\u306F\u3001\u4EE5\u4E0B\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 FileStep2.settingsIncomplete=\u30D7\u30EC\u30D3\u30E5\u30FC\u3092\u8868\u793A\u3059\u308B\u306B\u306F\u3001\u8A2D\u5B9A\u3092\u5B8C\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 FileStep2.splitwayRecordForJavaFID=\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u524D\u306E\u884C\u3092\u5206\u5272
 FileStep2.splitwayRecordForJavaFIDTip=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5207\u308A\u304C\u884C\u533A\u5207\u308A\u306E\u4E00\u90E8\u3067\u3042\u308B\u5834\u5408\u306B\u6709\u52B9\u3067\u3059\u3002
@@ -459,7 +459,7 @@ LoginComposite.projectTitle=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
 LoginComposite.errorTitle=\u30A8\u30E9\u30FC
 LoginComposite.errorMessages1=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093
 LoginComposite.RESTART=\u518D\u8D77\u52D5
-LoginComposite.sharedRepositoryMessage=\u5171\u6709\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304C\u5FC5\u8981\u3067\u3059\u304B\uFF1F
+LoginComposite.sharedRepositoryMessage=\u5171\u6709\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304C\u5FC5\u8981\u3067\u3059\u304B?
 LoginComposite.Workspace_inuse=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u306F\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059\u3002\u5225\u306E\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 LoginComposite.TisWorkspace_welcome={0}\u3078\u3088\u3046\u3053\u305D!
 LoginComposite.welcomeTitle=Talend Open Studio\u3078\u3088\u3046\u3053\u305D
@@ -558,7 +558,7 @@ OpenDocumentationAction.openDocAcitonTipText.openDoc=\u30C9\u30AD\u30E5\u30E1\u3
 OpenDocumentationAction.openDocAction.openDoc=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u958B\u304F
 OpenJobSelectionDialog.findJob=\u30B8\u30E7\u30D6\u3092\u691C\u7D22
 PaletteSettingPage.paletteSettings=\u30D1\u30EC\u30C3\u30C8\u8A2D\u5B9A
-PaletteSettingPage.selection1=\u975E\u8868\u793A\u9078\u629E\u3057\u305F\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3067\u4F7F\u7528\u3059\u308B\u5834\u5408\u3001\u305D\u308C\u3089\u3092\u8868\u793A\u3055\u305B\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059,,
+PaletteSettingPage.selection1=\u975E\u8868\u793A\u9078\u629E\u3057\u305F\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3067\u4F7F\u7528\u3059\u308B\u5834\u5408\u3001\u305D\u308C\u3089\u3092\u8868\u793A\u3055\u305B\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 PaletteSettingPage.selection2=\u3042\u308C\u3089\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F\u81EA\u52D5\u7684\u306B\u8868\u793A\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
 PositionalTextTest.println.fieldValue=\u30D5\u30A3\u30FC\u30EB\u30C9\u5024
 ProjectSettingDialog.Title=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u8A2D\u5B9A
@@ -659,7 +659,7 @@ VersionManagementDialog.AllDependencies=\u4F9D\u5B58\u9805\u76EE\u3092\u3059\u30
 VersionManagementDialog.Subjob=\u30B5\u30D6\u30B8\u30E7\u30D6\u3092\u3059\u3079\u3066\u9078\u629E
 VersionManagementDialog.FixVersion=\u6700\u65B0\u306E\u5834\u5408\u306FtRunJob\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u540C\u4E00\u306B\u3059\u308B
 VersionManagementDialog.FixLastVersion=\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3059\u308B\u6642\u306BtRunJob\u304C\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u3059\u3079\u3066\u6700\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u3053\u306E\u51E6\u7406\u3092\u884C\u3046\u3068\u524D\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306B\u5FA9\u5143\u3055\u308C\u307E\u3059\u3002\n\u305F\u3068\u3048\u3070\u7236\u89AA\u304C1.0 (tRunJob<child, Latest>)\u3067\u3042\u308B\u3068\u3057\u307E\u3059\u3002\n\u30D0\u30FC\u30B8\u30E7\u30F31.1\u306B\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u3059\u308B\u5834\u5408:  \n  - \u89AA\u306E\u30D0\u30FC\u30B8\u30E7\u30F31.0\u306F(tRunJob<child, 1.0>)\u3092\u542B\u307F\u307E\u3059\u3002\u5B50\u3082\u30D0\u30FC\u30B8\u30E7\u30F31.0\u3067\u5B9F\u884C\u3059\u308B\u305F\u3081\u3067\u3059\u3002\n  - \u6700\u65B0\u7248\u3092\u4F7F\u3044\u7D9A\u3051\u308B\u305F\u3081\u3001\u7236\u89AA\u30D0\u30FC\u30B8\u30E7\u30F31.1\u306B\u306F(tRunJob<child, Latest>)\u304C\u542B\u307E\u308C\u308B\u3088\u3046\u306B\u306A\u308A\u307E\u3059\u3002\n\n\u6CE8\u610F: \u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u65E2\u306B\u56FA\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u304A\u3088\u3073\u6700\u65B0\u7248\u3092\u4F7F\u7528\u3057\u306A\u3044\u5834\u5408\u306F\u4F55\u3082\u3057\u307E\u305B\u3093\u3002
-XPathProposalProvider.contentProposal=<< \u3042\u307E\u308A\u306B\u3082\u591A\u304F\u306E\u30CE\u30FC\u30C9\u3001\u5024\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093 ... >>,
+XPathProposalProvider.contentProposal=<< \u3042\u307E\u308A\u306B\u3082\u591A\u304F\u306E\u30CE\u30FC\u30C9\u3001\u5024\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093 ... >>
 XmlFileStep1.groupSchemaTarget=\u30BF\u30FC\u30B2\u30C3\u30C8\u30B9\u30AD\u30FC\u30DE
 XmlFileStep1.sourceSchema=\u30BD\u30FC\u30B9\u30B9\u30AD\u30FC\u30DE
 XmlFileStep2Form.previewNotAvailable=XSD\u30D5\u30A1\u30A4\u30EB\u306B\u5229\u7528\u53EF\u80FD\u306A\u30D7\u30EC\u30D3\u30E5\u30FC\u306F\u3042\u308A\u307E\u305B\u3093

main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/ui/wizards/metadata/connection/files/xml/XmlFileOutputStep2Form.java

@@ -77,6 +77,7 @@ import org.talend.core.prefs.ITalendCorePrefConstants;
 import org.talend.core.ui.CoreUIPlugin;
 import org.talend.cwm.helper.ConnectionHelper;
 import org.talend.datatools.xml.utils.ATreeNode;
+import org.talend.designer.mapper.ui.color.ColorInfo;
 import org.talend.metadata.managment.ui.wizard.metadata.xml.FoxNodeComboViewProvider;
 import org.talend.metadata.managment.ui.wizard.metadata.xml.node.Attribute;
 import org.talend.metadata.managment.ui.wizard.metadata.xml.node.Element;
@@ -262,7 +263,7 @@ public class XmlFileOutputStep2Form extends AbstractXmlFileStepForm {
             tree.setEnabled(false);
         }
         tree.setLinesVisible(true);
-        tree.setBackground(tree.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+        tree.setBackground(ColorInfo.EDITABLE_WIDGET_BACKGROUND());
         TreeColumn column1 = new TreeColumn(tree, SWT.LEFT);
         column1.setText("XML Tree");
         column1.setWidth(120);
@@ -1162,7 +1163,7 @@ public class XmlFileOutputStep2Form extends AbstractXmlFileStepForm {
             }
 
             if (errorMessage == null) {
-                text.setBackground(text.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+                text.setBackground(ColorInfo.EDITABLE_WIDGET_BACKGROUND());
             } else {
                 text.setBackground(text.getDisplay().getSystemColor(SWT.COLOR_RED));
                 if (showAlertIfError) {

main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/ui/wizards/metadata/connection/files/xml/XmlFileStep2Form.java

@@ -84,6 +84,7 @@ import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.datatools.xml.utils.ATreeNode;
 import org.talend.datatools.xml.utils.XPathPopulationUtil;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
+import org.talend.designer.mapper.ui.color.ColorInfo;
 import org.talend.metadata.managment.ui.preview.AsynchronousPreviewHandler;
 import org.talend.metadata.managment.ui.preview.IPreviewHandlerListener;
 import org.talend.metadata.managment.ui.preview.ProcessDescription;
@@ -779,7 +780,7 @@ public class XmlFileStep2Form extends AbstractXmlFileStepForm implements IRefres
         StyledText text = new StyledText(outputComposite, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.READ_ONLY);
         GridData gridData = new GridData(GridData.FILL_BOTH);
         text.setLayoutData(gridData);
-        outputComposite.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_WHITE));
+        outputComposite.setBackground(ColorInfo.EDITABLE_WIDGET_BACKGROUND());
 
         String errorInfo = Messages.getString("FileStep2.noresult") + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
         errorInfo = errorInfo + Messages.getString("FileStep2.noresultDetailMessage") + "\n"; //$NON-NLS-1$ //$NON-NLS-2$

main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/ui/wizards/metadata/connection/files/xml/extraction/ExtractionFieldsWithXPathEditorView.java

@@ -42,6 +42,7 @@ import org.talend.commons.utils.data.list.UniqueStringGenerator;
 import org.talend.core.model.metadata.builder.connection.SchemaTarget;
 import org.talend.core.model.update.ConnectionColumnUpdateManager;
 import org.talend.core.ui.metadata.editor.XmlExtractorFieldModel;
+import org.talend.designer.mapper.ui.color.ColorInfo;
 import org.talend.repository.metadata.i18n.Messages;
 
 /**
@@ -345,7 +346,7 @@ public class ExtractionFieldsWithXPathEditorView extends AbstractDataTableEditor
             if (conflictNames.contains(name)) {
                 getTable().getItem(i).setBackground(Display.getDefault().getSystemColor(SWT.COLOR_RED));
             } else {
-                getTable().getItem(i).setBackground(Display.getDefault().getSystemColor(SWT.COLOR_WHITE));
+                getTable().getItem(i).setBackground(ColorInfo.EDITABLE_WIDGET_BACKGROUND());
             }
         }
 

main/plugins/org.talend.repository.view.example/components/tExampleComponent/tExampleComponent_java.xml

@@ -201,8 +201,8 @@ SHOW_IF="USE_FILE_AMBIGUOUS=='true'">
 	<CODEGENERATION>
 		<IMPORTS>
 			<IMPORT NAME="Talen File Enhanced"
-				MODULE="talend_file_enhanced-1.2.jar"
-				MVN="mvn:org.talend.components.lib/talend_file_enhanced/1.2" REQUIRED="true" />
+				MODULE="talend_file_enhanced-1.3.jar"
+				MVN="mvn:org.talend.components.lib/talend_file_enhanced/1.3" REQUIRED="true" />
 			<IMPORT NAME="Talend_CSV" MODULE="talendcsv.jar"
 				MVN="mvn:org.talend.libraries/talendcsv/6.0.0"
 				REQUIRED="true" />

main/plugins/org.talend.themes.core/src/org/talend/themes/core/TalendThemeService.java

@@ -106,6 +106,11 @@ public class TalendThemeService implements ITalendThemeService {
         }
     }
 
+    @Override
+    public IPreferenceStore getThemePreferenceStore() {
+        return getPreferenceStore(ITalendThemeService.THEME_PREFERENCE_ID);
+    }
+
     private IPreferenceStore getPreferenceStore(String bundleId) {
         IPreferenceStore prefStore = storeMap.get(bundleId);
         if (prefStore == null) {

main/plugins/org.talend.themes.core/src/org/talend/themes/core/elements/constants/TalendThemeConstants.java

@@ -21,4 +21,6 @@ public class TalendThemeConstants {
     public static final String TALEND_THEME_PREFIX = "org.talend.themes."; //$NON-NLS-1$
 
     public static final String TALEND_DEFAULT_THEME_ID = TALEND_THEME_PREFIX + "css.talend.default"; //$NON-NLS-1$
+
+    public static final String TALEND_DARK_THEME_ID = "org.eclipse.e4.ui.css.theme.e4_dark"; //$NON-NLS-1$
 }

main/plugins/org.talend.themes.core/src/org/talend/themes/core/elements/utils/TalendThemeUtils.java

@@ -12,6 +12,8 @@
 // ============================================================================
 package org.talend.themes.core.elements.utils;
 
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.talend.commons.ui.runtime.ITalendThemeService;
 import org.talend.themes.core.elements.constants.TalendThemeConstants;
 
 /**
@@ -26,4 +28,13 @@ public class TalendThemeUtils {
         }
         return themeId.startsWith(TalendThemeConstants.TALEND_THEME_PREFIX);
     }
+
+    public static boolean isDarkModeTheme() {
+        IPreferenceStore themePreferenceStore = ITalendThemeService.get().getThemePreferenceStore();
+        if (themePreferenceStore != null
+                && TalendThemeConstants.TALEND_DARK_THEME_ID.equals(themePreferenceStore.getString("themeid"))) {
+            return true;
+        }
+        return false;
+    }
 }

main/plugins/org.talend.themes.css.talend/plugin.properties

@@ -1,5 +1,5 @@
-theme.default=Talend default theme
-theme.dark=Talend experimental dark theme
+theme.light=Talend light theme
+theme.dark=Talend dark theme
 
 #New theme element definitions
 DARK_BACKGROUND=Dark Background Color

main/plugins/org.talend.themes.css.talend/plugin.xml

@@ -2,51 +2,33 @@
 <?eclipse version="3.2"?>
 <plugin>
 
-    <extension
-          point="org.eclipse.e4.ui.css.swt.theme">
-       <theme
-             basestylesheeturi="themes/default/css/default.css"
-             id="org.talend.themes.css.talend.default"
-             label="%theme.default">
-             <!-- please see: TalendThemeConstants.TALEND_DEFAULT_THEME_ID -->
-       </theme>
-<!--
-       <theme
-            basestylesheeturi="themes/dark/e4-dark_linux.css"
-            id="org.eclipse.e4.ui.css.theme.e4_dark"
-            label="%theme.dark"
-            os="linux">
-        </theme>
-        <theme
-            basestylesheeturi="themes/dark/e4-dark_win.css"
-            id="org.eclipse.e4.ui.css.theme.e4_dark"
-            label="%theme.dark"
-            os="win32">
-        </theme>
-        <theme
-            basestylesheeturi="themes/dark/e4-dark_mac.css"
-            id="org.eclipse.e4.ui.css.theme.e4_dark"
-            label="%theme.dark"
-            os="macosx">
-        </theme>
-        <theme
-            basestylesheeturi="themes/dark/e4-dark_mac1013.css"
-            id="org.eclipse.e4.ui.css.theme.e4_dark"
-            label="%theme.dark"
-            os="macosx"
-            os_version="10.11,10.12,10.13">
-        </theme>
--->
-        <stylesheet
-            uri="themes/dark/dark/e4-dark_preferencestyle.css">
-            <themeid
-                refid="org.eclipse.e4.ui.css.theme.e4_dark"></themeid>
-        </stylesheet>
-        <stylesheet
-            uri="themes/default/css/preferencestyle.css">
-            <themeid
-                refid="org.talend.themes.css.talend.default"></themeid>
-        </stylesheet>
-    </extension>
+	<extension point="org.eclipse.e4.ui.css.swt.theme">
+		<theme basestylesheeturi="themes/default/css/default.css" id="org.talend.themes.css.talend.default" label="%theme.light">
+			<!-- please see: TalendThemeConstants.TALEND_DEFAULT_THEME_ID -->
+		</theme>
+
+		<theme basestylesheeturi="themes/dark/e4-dark_linux.css" id="org.eclipse.e4.ui.css.theme.e4_dark" label="%theme.dark" os="linux"></theme>
+		<theme basestylesheeturi="themes/dark/e4-dark_win.css" id="org.eclipse.e4.ui.css.theme.e4_dark" label="%theme.dark" os="win32"></theme>
+		<theme basestylesheeturi="themes/dark/e4-dark_mac.css" id="org.eclipse.e4.ui.css.theme.e4_dark" label="%theme.dark" os="macosx"></theme>
+		<theme basestylesheeturi="themes/dark/e4-dark_mac1013.css" id="org.eclipse.e4.ui.css.theme.e4_dark" label="%theme.dark" os="macosx" os_version="10.11,10.12,10.13"></theme>
+		<stylesheet os="win32" uri="themes/dark/dark/e4-dark_preferencestyle_win.css">
+			<themeid refid="org.eclipse.e4.ui.css.theme.e4_dark"></themeid>
+		</stylesheet>
+		<stylesheet os="linux" uri="themes/dark/dark/e4-dark_preferencestyle_linux.css">
+			<themeid refid="org.eclipse.e4.ui.css.theme.e4_dark"></themeid>
+		</stylesheet>
+		<stylesheet os="macosx" uri="themes/dark/dark/e4-dark_preferencestyle_mac.css">
+			<themeid refid="org.eclipse.e4.ui.css.theme.e4_dark"></themeid>
+		</stylesheet>
+		<stylesheet os="win32" uri="themes/default/css/preferencestyle_win.css">
+			<themeid refid="org.talend.themes.css.talend.default"></themeid>
+		</stylesheet>
+		<stylesheet os="linux" uri="themes/default/css/preferencestyle_linux.css">
+			<themeid refid="org.talend.themes.css.talend.default"></themeid>
+		</stylesheet>
+		<stylesheet os="macosx" uri="themes/default/css/preferencestyle_mac.css">
+			<themeid refid="org.talend.themes.css.talend.default"></themeid>
+		</stylesheet>
+	</extension>
 
 </plugin>

main/plugins/org.talend.themes.css.talend/plugin_fr.properties

@@ -4,29 +4,29 @@ theme.dark=Th\u00E8me sombre Talend exp\u00E9rimental
 #New theme element definitions
 DARK_BACKGROUND=Couleur du fond sombre
 DARK_FOREGROUND=Couleur du premier plan sombre
-INACTIVE_UNSELECTED_TABS_COLOR_START=Inactive, unselected part color begin
-INACTIVE_UNSELECTED_TABS_COLOR_START=Inactive, unselected part color begin
-INACTIVE_UNSELECTED_TABS_COLOR_END=Inactive, unselected part color end
-INACTIVE_TAB_TEXT_COLOR=Inactive part text color
-INACTIVE_TAB_OUTER_KEYLINE_COLOR=Inactive part outer keyline color
-INACTIVE_TAB_INNER_KEYLINE_COLOR=Inactive part inner keyline color
-INACTIVE_TAB_OUTLINE_COLOR=Inactive part outline color
-ACTIVE_UNSELECTED_TABS_COLOR_START=Active, unselected part color begin
-ACTIVE_UNSELECTED_TABS_COLOR_END=Active, unselected part color end
-ACTIVE_TAB_TEXT_COLOR=Active part text color
-ACTIVE_TAB_OUTER_KEYLINE_COLOR=Active part outer keyline color
-ACTIVE_TAB_INNER_KEYLINE_COLOR=Active part inner keyline color
-ACTIVE_TAB_OUTLINE_COLOR=Active part outline color
-INACTIVE_TAB_BG_START=Inactive, selected part background begin
-INACTIVE_TAB_BG_END=Inactive, selected part background end
-INACTIVE_TAB_UNSELECTED_TEXT_COLOR=Inactive, unselected part foreground
-INACTIVE_TAB_SELECTED_TEXT_COLOR=Inactive, selected part foreground
-ACTIVE_TAB_BG_START=Active, selected part background begin
-ACTIVE_TAB_BG_END=Active, selected part background end
-ACTIVE_TAB_UNSELECTED_TEXT_COLOR=Active, unselected part foreground
-ACTIVE_TAB_SELECTED_TEXT_COLOR=Active, selected part foreground
-ACTIVE_NOFOCUS_TAB_TEXT_COLOR=Active (no focus), selected part text color
-ACTIVE_NOFOCUS_TAB_BG_START=Active (no focus), selected part background begin
-ACTIVE_NOFOCUS_TAB_BG_END=Active (no focus), selected part background end
-ACTIVE_NOFOCUS_TAB_SELECTED_TEXT_COLOR=Active (no focus), selected part foreground
+INACTIVE_UNSELECTED_TABS_COLOR_START=Inactive, partie du d\u00E9but de couleur non s\u00E9lectionn\u00E9e
+INACTIVE_UNSELECTED_TABS_COLOR_START=Inactive, partie du d\u00E9but de couleur non s\u00E9lectionn\u00E9e
+INACTIVE_UNSELECTED_TABS_COLOR_END=Inactive, partie de fin de couleur non s\u00E9lectionn\u00E9e
+INACTIVE_TAB_TEXT_COLOR=Couleur inactive pour la partie du texte
+INACTIVE_TAB_OUTER_KEYLINE_COLOR=Couleur de la partie inactive pour la ligne de cl\u00E9 externe
+INACTIVE_TAB_INNER_KEYLINE_COLOR=Couleur de la partie inactive pour la ligne de cl\u00E9 interne
+INACTIVE_TAB_OUTLINE_COLOR=Couleur de la partie inactive pour la structure
+ACTIVE_UNSELECTED_TABS_COLOR_START=Active, partie du d\u00E9but de couleur non s\u00E9lectionn\u00E9e
+ACTIVE_UNSELECTED_TABS_COLOR_END=Active, partie de fin de couleur non s\u00E9lectionn\u00E9e
+ACTIVE_TAB_TEXT_COLOR=Couleur active pour la partie du texte
+ACTIVE_TAB_OUTER_KEYLINE_COLOR=Couleur de la partie active pour la ligne de cl\u00E9 externe
+ACTIVE_TAB_INNER_KEYLINE_COLOR=Couleur de la partie active pour la ligne de cl\u00E9 interne
+ACTIVE_TAB_OUTLINE_COLOR=Couleur de la partie active pour la structure
+INACTIVE_TAB_BG_START=Inactive, partie du d\u00E9but de l'arri\u00E8re-plan s\u00E9lectionn\u00E9e
+INACTIVE_TAB_BG_END=Inactive, partie de fin de l'arri\u00E8re-plan s\u00E9lectionn\u00E9e
+INACTIVE_TAB_UNSELECTED_TEXT_COLOR=Inactive, partie du premier plan non s\u00E9lectionn\u00E9e
+INACTIVE_TAB_SELECTED_TEXT_COLOR=Inactive, partie du premier plan s\u00E9lectionn\u00E9e
+ACTIVE_TAB_BG_START=Active, partie du d\u00E9but de l'arri\u00E8re-plan s\u00E9lectionn\u00E9e
+ACTIVE_TAB_BG_END=Active, partie de fin de l'arri\u00E8re-plan s\u00E9lectionn\u00E9e
+ACTIVE_TAB_UNSELECTED_TEXT_COLOR=Active, partie du premier plan non s\u00E9lectionn\u00E9e
+ACTIVE_TAB_SELECTED_TEXT_COLOR=Active, partie du premier plan s\u00E9lectionn\u00E9e
+ACTIVE_NOFOCUS_TAB_TEXT_COLOR=Active (aucun focus), couleur du texte pour la partie s\u00E9lectionn\u00E9e
+ACTIVE_NOFOCUS_TAB_BG_START=Active (aucun focus), partie du d\u00E9but de l'arri\u00E8re-plan s\u00E9lectionn\u00E9e
+ACTIVE_NOFOCUS_TAB_BG_END=Active (aucun focus), partie de fin de l'arri\u00E8re-plan s\u00E9lectionn\u00E9e
+ACTIVE_NOFOCUS_TAB_SELECTED_TEXT_COLOR=Active (Aucun focus), partie du premier plan s\u00E9lectionn\u00E9e
 LINK_COLOR=Couleur du lien

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

@@ -348,3 +348,9 @@ TabbedPropertyList {
     tPalette-list-background-color:'#org-eclipse-ui-workbench-DARK_BACKGROUND';
     tPalette-slider-palette-background-color:'#org-eclipse-ui-workbench-DARK_BACKGROUND';
 }
+
+.FooterComposite {
+	background-color:'#org-eclipse-ui-workbench-DARK_BACKGROUND'; 
+    color:'#org-eclipse-ui-workbench-DARK_FOREGROUND'; 
+}
+

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

@@ -1,93 +1,156 @@
-/*******************************************************************************
- * Copyright (c) 2014, 2015 Lars Vogel and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Lars Vogel <Lars.Vogel@gmail.com> - initial API and implementation
- *     Andrea Guarinoni - intial color schema definition
- *     Lars Vogel <Lars.Vogel@vogella.com> - Ongoing maintenance
- *******************************************************************************/
-
-/* ############################## Eclipse UI properties ############################## */
-
-
-IEclipsePreferences#org-eclipse-ui-editors:org-talend-themes-css-talend { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
-	preferences:
-		'AbstractTextEditor.Color.Background.SystemDefault=false'
-		'AbstractTextEditor.Color.SelectionForeground.SystemDefault=false'
-		'AbstractTextEditor.Color.SelectionBackground.SystemDefault=false'
-		'AbstractTextEditor.Color.Background=47,47,47'
-		'AbstractTextEditor.Color.Foreground.SystemDefault=false'
-		'AbstractTextEditor.Color.SelectionBackground=33,66,131'
-		'AbstractTextEditor.Color.SelectionForeground=147,161,161'
-		'AbstractTextEditor.Color.Foreground=204,204,204'
-		'AbstractTextEditor.Color.FindScope=30,120,155'
-		'asOccurencesIndicationColor=72,72,72'
-		'breakpointIndicationColor=51,119,193'
-		'currentIPColor=90,90,90'
-		'currentLineColor=55,55,55'
-		'deletionIndicationColor=224,226,228'
-		'filteredSearchResultIndicationColor=27,98,145'
-		'hyperlinkColor=102,175,249'
-		'hyperlinkColor.SystemDefault=false'
-		'infoIndicationColor=86,194,170'
-		'lineNumberColor=119,145,154'
-		'linked.slave.color=66,156,255'
-		'matchingTagIndicationColor=72,72,72'
-		'occurrenceIndicationColor=27,98,145'
-		'overrideIndicatorColor=78,120,117'
-		'printMarginColor=81,86,88'
-		'searchResultHighlighting=false'
-		'searchResultIndication=true'
-		'searchResultIndicationColor=94,94,94'
-		'searchResultTextStyle=BOX'
-		'secondaryIPColor=90,90,90'
-		'spellingIndicationColor=253,170,211'
-		'writeOccurrenceIndicationColor=27,98,145'
-}
-
-IEclipsePreferences#org-eclipse-ui-workbench:org-talend-themes-css-talend { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
-	preferences:
-		'ACTIVE_HYPERLINK_COLOR=138,201,242'
-		'CONFLICTING_COLOR=240,15,66'
-		'CONTENT_ASSIST_BACKGROUND_COLOR=52,57,61'
-		'CONTENT_ASSIST_FOREGROUND_COLOR=238,238,238'
-		'org.eclipse.ui.workbench.INFORMATION_BACKGROUND=81,86,88'
-		'org.eclipse.ui.workbench.INFORMATION_FOREGROUND=238,238,238'
-		'org.eclipse.ui.workbench.HOVER_BACKGROUND=52,57,61'
-		'org.eclipse.ui.workbench.HOVER_FOREGROUND=238,238,238'
-		'ERROR_COLOR=247,68,117'
-		'HYPERLINK_COLOR=111,197,238'
-		'INCOMING_COLOR=31,179,235'
-		'OUTGOING_COLOR=238,238,238'
-		'RESOLVED_COLOR=108,210,17'
-		'EDITION_COLOR=238,238,238'
-		'org.eclipse.search.ui.match.highlight=206,92,0'
-		'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.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'
-		'org.talend.core.repository.REPO_INACTIVE_ENTRY_COLOR=138,138,138'
-		'org.talend.core.repository.REPO_LOCKED_ENTRY=107,0,0'
-		'org.talend.core.repository.REPO_MERGED_REFERENCED_ITEMS_COLOR=175,175,175'
-		'org.talend.core.repository.TAB_START_COLOR=27,60,79'
-		'org.talend.core.repository.TAB_END_COLOR=86,86,86'
-}
-
-IEclipsePreferences#org-talend-designer-core:org-talend-themes-css-talend { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
-	preferences:
-		'jobDesignerBackgroundColor=122,122,122'
-		'subjobColor=0,0,0'
-		'subjobTitleColor=128,255,0'
-}
-
+/*******************************************************************************
+ * Copyright (c) 2014, 2015 Lars Vogel and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Lars Vogel <Lars.Vogel@gmail.com> - initial API and implementation
+ *     Andrea Guarinoni - intial color schema definition
+ *     Lars Vogel <Lars.Vogel@vogella.com> - Ongoing maintenance
+ *******************************************************************************/
+
+/* ############################## Eclipse UI properties ############################## */
+
+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:
+		'forbiddenSubjobColor=207,226,236'
+		'forbiddenSubjobTitleColor=92,131,150'
+}
+
+IEclipsePreferences#org-eclipse-ui-editors:org-talend-themes-css-talend-base { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
+	preferences:
+		'AbstractTextEditor.Color.Background.SystemDefault=false'
+		'AbstractTextEditor.Color.SelectionForeground.SystemDefault=false'
+		'AbstractTextEditor.Color.SelectionBackground.SystemDefault=false'
+		'AbstractTextEditor.Color.Background=47,47,47'
+		'AbstractTextEditor.Color.Foreground.SystemDefault=false'
+		'AbstractTextEditor.Color.SelectionBackground=33,66,131'
+		'AbstractTextEditor.Color.SelectionForeground=147,161,161'
+		'AbstractTextEditor.Color.Foreground=204,204,204'
+		'AbstractTextEditor.Color.FindScope=30,120,155'
+		'asOccurencesIndicationColor=72,72,72'
+		'breakpointIndicationColor=51,119,193'
+		'currentIPColor=90,90,90'
+		'currentLineColor=55,55,55'
+		'deletionIndicationColor=224,226,228'
+		'filteredSearchResultIndicationColor=27,98,145'
+		'hyperlinkColor=102,175,249'
+		'hyperlinkColor.SystemDefault=false'
+		'infoIndicationColor=86,194,170'
+		'lineNumberColor=119,145,154'
+		'linked.slave.color=66,156,255'
+		'matchingTagIndicationColor=72,72,72'
+		'occurrenceIndicationColor=27,98,145'
+		'overrideIndicatorColor=78,120,117'
+		'printMarginColor=81,86,88'
+		'searchResultHighlighting=false'
+		'searchResultIndication=true'
+		'searchResultIndicationColor=94,94,94'
+		'searchResultTextStyle=BOX'
+		'secondaryIPColor=90,90,90'
+		'spellingIndicationColor=253,170,211'
+		'writeOccurrenceIndicationColor=27,98,145'
+}
+
+IEclipsePreferences#org-eclipse-ui-workbench:org-talend-themes-css-talend-base { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
+	preferences:
+		'ACTIVE_HYPERLINK_COLOR=138,201,242'
+		'CONFLICTING_COLOR=240,15,66'
+		'CONTENT_ASSIST_BACKGROUND_COLOR=52,57,61'
+		'CONTENT_ASSIST_FOREGROUND_COLOR=238,238,238'
+		'org.eclipse.ui.workbench.INFORMATION_BACKGROUND=81,86,88'
+		'org.eclipse.ui.workbench.INFORMATION_FOREGROUND=238,238,238'
+		'org.eclipse.ui.workbench.HOVER_BACKGROUND=52,57,61'
+		'org.eclipse.ui.workbench.HOVER_FOREGROUND=238,238,238'
+		'ERROR_COLOR=247,68,117'
+		'HYPERLINK_COLOR=111,197,238'
+		'INCOMING_COLOR=31,179,235'
+		'OUTGOING_COLOR=238,238,238'
+		'RESOLVED_COLOR=108,210,17'
+		'EDITION_COLOR=238,238,238'
+		'org.eclipse.search.ui.match.highlight=206,92,0'
+		'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=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'
+		'org.talend.core.repository.REPO_INACTIVE_ENTRY_COLOR=138,138,138'
+		'org.talend.core.repository.REPO_LOCKED_ENTRY=107,0,0'
+		'org.talend.core.repository.REPO_MERGED_REFERENCED_ITEMS_COLOR=175,175,175'
+		'org.talend.core.repository.TAB_START_COLOR=27,60,79'
+		'org.talend.core.repository.TAB_END_COLOR=86,86,86'
+		
+		/*tMap*/
+		'COLOR_ENTRY_ERROR=100,200,255'
+		'COLOR_ENTRY_WARNING=0,200,60'
+		'COLOR_BACKGROUND_LINKS_ZONE=64,68,71' /* Link panel background */
+	
+		'COLOR_HIGHLIGHTED_TEXT_ROW=55,55,55'
+		'COLOR_BACKGROUND_ERROR_EXPRESSION_CELL=255,0,0' /*Error expression background*/
+		'COLOR_BACKGROUND_VALID_EXPRESSION_CELL=0,0,0' /*Normal expression background*/
+
+		'COLOR_FOREGROUND_ERROR_EXPRESSION_CELL=255,255,255' /*Error expression foreground*/
+		'COLOR_FOREGROUND_VALID_EXPRESSION_CELL=255,255,255' /*Normal expression foreground*/
+		'COLOR_DRAGGING_INSERTION_INDICATOR=0,78,152'
+		'COLOR_TMAP_PREVIEW=235,234,230'
+		'COLOR_TMAP_SCROLLED_COMPOSITE=81,86,88'
+		/*For db map*/
+		'COLOR_BACKGROUND_WARNING_EXPRESSION_CELL=255,190,150'
+		/*For xml map*/
+		'COLOR_TREE_BORDER=153,186,243'
+		'ZONE_BACKGROUND_COLOR=81,86,88'
+		'COLOR_TREE_LINES=128,128,128'
+		'COLOR_COLUMN_SELECTION=90,180,255'
+		'COLOR_COLUMN_TREE_SETTING=200,225,250'
+		'COLOR_EXPREESION_DISABLE=240,240,240'
+		'NODE_FIGURE_BACKGROUND=0,0,0'
+		'NODE_FIGURE_FORCEGROUND=255,255,255'
+
+		'ColorStyledText.Color.Background=47,47,47'  /*ColorStyledText background*/
+		'ColorStyledText.Color.Foreground=204,204,204' /*ColorStyledText foreground*/
+		'ColorStyledText.Color.SelectionBackground=33,66,131' /*ColorStyledText selection background*/
+		'ColorStyledText.Color.SelectionForeground=147,161,161'  /*ColorStyledText selection foreground*/
+		
+		/*ColorManager for ColorStyledText*/
+		'nullColor=255,255,255' /*Express code color null color*/
+		'comment1Color=0,140,34'
+		'comment2Color=34,140,0'
+		'literal1Color=0,0,255'
+		'literal2Color=160,100,240'
+		'labelColor=160,0,240'
+		'keyword1Color=0,255,0'
+		'keyword2Color=240,160,80'
+		'keyword3Color=160,32,100'
+		'functionColor=160,32,0'
+		'markupColor=178,0,34'
+		'operatorColor=178,34,0'
+		'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*/
+		'CONTEXT_TABLE_READONLY_FOREGROUND=163,163,163'
+}
+

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

@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2014, 2015 Lars Vogel and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Lars Vogel <Lars.Vogel@gmail.com> - initial API and implementation
+ *     Andrea Guarinoni - intial color schema definition
+ *     Lars Vogel <Lars.Vogel@vogella.com> - Ongoing maintenance
+ *******************************************************************************/
+
+/* ############################## Eclipse UI properties ############################## */
+
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark_preferencestyle.css");
+IEclipsePreferences#org-eclipse-ui-workbench:org-talend-themes-css-talend { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
+	preferences:
+		/*tMap not use following value*/
+		'COLOR_ENTRY_NORMALD_NO_USE=170,170,170'
+		'COLOR_ENTRY_NONED_NO_USE=0,0,0'
+		'COLOR_ENTRY_HIGHLIGHTED_NO_USE=38,66,89' /*High light*/
+		'COLOR_ENTRY_HIGHLIGHTEDALL_NO_USE=38,66,89' /*High light all*/
+		'COLOR_ENTRY_SEARCH_HIGHLIGHTED_NO_USE=38,66,89'  /*Search high light*/
+		'COLOR_SELECTED_ZONE_TO_ZONE_LINK_NO_USE=102,192,230'
+		'COLOR_UNSELECTED_ZONE_TO_ZONE_LINK_NO_USE=110,111,112'		
+		'COLOR_TMAP_TABELHEADER_SELECTED_BG_NO_USE=102,191,230'
+		'COLOR_TMAP_TABELHEADER_UNSELECTED_BG_NO_USE=70,70,70'
+}

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

@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2014, 2015 Lars Vogel and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Lars Vogel <Lars.Vogel@gmail.com> - initial API and implementation
+ *     Andrea Guarinoni - intial color schema definition
+ *     Lars Vogel <Lars.Vogel@vogella.com> - Ongoing maintenance
+ *******************************************************************************/
+
+/* ############################## Eclipse UI properties ############################## */
+
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark_preferencestyle.css");
+IEclipsePreferences#org-eclipse-ui-workbench:org-talend-themes-css-talend { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
+	preferences:
+		/*tMap Don't use following value*/
+		'COLOR_ENTRY_NORMAL=170,170,170'
+		'COLOR_ENTRY_NONE=30,30,30'
+		'COLOR_ENTRY_HIGHLIGHTED=0,88,208' /*High light*/
+		'COLOR_ENTRY_HIGHLIGHTEDALL=0,88,208' /*High light all*/
+		'COLOR_ENTRY_SEARCH_HIGHLIGHTED=0,88,208'  /*Search high light*/
+		'COLOR_SELECTED_ZONE_TO_ZONE_LINK=0,88,208'
+		'COLOR_TMAP_TABELHEADER_SELECTED_BG=0,88,208'
+		'COLOR_TMAP_TABELHEADER_UNSELECTED_BG=70,70,70'
+}

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

@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2014, 2015 Lars Vogel and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Lars Vogel <Lars.Vogel@gmail.com> - initial API and implementation
+ *     Andrea Guarinoni - intial color schema definition
+ *     Lars Vogel <Lars.Vogel@vogella.com> - Ongoing maintenance
+ *******************************************************************************/
+
+/* ############################## Eclipse UI properties ############################## */
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/dark/dark/e4-dark_preferencestyle.css");
+
+IEclipsePreferences#org-eclipse-ui-workbench:org-talend-themes-css-talend { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
+	preferences:
+		/*tMap*/
+		'COLOR_ENTRY_HIGHLIGHTED=38,66,89' /*High light*/
+		'COLOR_ENTRY_HIGHLIGHTEDALL=38,66,89' /*High light all*/
+		'COLOR_ENTRY_SEARCH_HIGHLIGHTED=38,66,89'  /*Search high light*/
+		'COLOR_ENTRY_NORMAL=170,170,170'
+		'COLOR_ENTRY_NONE=0,0,0'
+		'COLOR_SELECTED_ZONE_TO_ZONE_LINK=38,66,89'
+		'COLOR_UNSELECTED_ZONE_TO_ZONE_LINK=110,111,112'		
+		'COLOR_TMAP_TABELHEADER_SELECTED_BG=38,66,89'
+		'COLOR_TMAP_TABELHEADER_UNSELECTED_BG=70,70,70'
+}
+

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

@@ -686,6 +686,7 @@ CTabFolder.org-talend-rcp-abstractMultiPageEditor-footer CTabItem:selected {
 	MERGED_REFERENCED_ITEMS_COLOR: #787878;
 	
 }
+
 /**************************************************
  * User Color and Font Changes
  **************************************************/

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

@@ -16,18 +16,74 @@
 
 /* ############################## Eclipse UI properties ############################## */
 
-
-IEclipsePreferences#org-talend-designer-core:org-talend-themes-css-talend { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
+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=0,0,0'
+		'forbiddenSubjobTitleColor=255,255,255'
 }
 
-IEclipsePreferences#org-eclipse-ui-workbench:org-talend-themes-css-talend { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
+IEclipsePreferences#org-eclipse-ui-workbench:org-talend-themes-css-talend-base { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
 	preferences:
 		'org.talend.designer.core.lightColor=232,235,239'
 		'org.talend.designer.core.darkColor=125,135,150'
 		'org.talend.designer.core.alpha=30'
+		/*tMap*/
+		'COLOR_BACKGROUND_LINKS_ZONE=210,210,196'
+		
+		'COLOR_HIGHLIGHTED_TEXT_ROW=240,240,240'
+		'COLOR_BACKGROUND_ERROR_EXPRESSION_CELL=255,0,0'
+		'COLOR_BACKGROUND_VALID_EXPRESSION_CELL=255,255,255'
+
+		'COLOR_FOREGROUND_ERROR_EXPRESSION_CELL=255,255,255'
+		'COLOR_FOREGROUND_VALID_EXPRESSION_CELL=0,0,0'
+		'COLOR_DRAGGING_INSERTION_INDICATOR=0,78,152'
+		'COLOR_TMAP_PREVIEW=235,234,230'
+
+		'COLOR_ENTRY_ERROR=100,200,255'
+		'COLOR_ENTRY_WARNING=0,200,60'
+		/*For db map*/
+		'COLOR_BACKGROUND_WARNING_EXPRESSION_CELL=255,190,150'
+		/*For xml map*/
+		'COLOR_TREE_BORDER=153,186,243'
+		'ZONE_BACKGROUND_COLOR=210,210,196'
+		'COLOR_TREE_LINES=128,128,128'
+		'COLOR_COLUMN_SELECTION=90,180,255'
+		'COLOR_COLUMN_TREE_SETTING=200,225,250'
+		'COLOR_EXPREESION_DISABLE=240,240,240'
+		'NODE_FIGURE_BACKGROUND=255,255,255'
+		'NODE_FIGURE_FORCEGROUND=0,0,0'
+		/*GEF Job Editor*/
+		'NODE_FIGURE_LABEL_FORCEGROUND=0,0,0'
+		
+		/*Context Table*/
+		'CONTEXT_TABLE_READONLY_FOREGROUND=105,105,105'
+		/*ColorManager for ColorStyledText*/
+		'nullColor=0,0,0' /*Express code color null color*/
+		'comment1Color=0,140,34'
+		'comment2Color=34,140,0'
+		'literal1Color=0,0,255'
+		'literal2Color=160,100,240'
+		'labelColor=160,0,240'
+		'keyword1Color=50,32,160'
+		'keyword2Color=240,160,80'
+		'keyword3Color=160,32,100'
+		'functionColor=160,32,0'
+		'markupColor=178,0,34'
+		'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'
 }
 
+

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

@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2014, 2015 Lars Vogel and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Lars Vogel <Lars.Vogel@gmail.com> - initial API and implementation
+ *     Andrea Guarinoni - intial color schema definition
+ *     Lars Vogel <Lars.Vogel@vogella.com> - Ongoing maintenance
+ *******************************************************************************/
+
+/* ############################## Eclipse UI properties ############################## */
+
+
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/default/css/preferencestyle.css");
+IEclipsePreferences#org-eclipse-ui-workbench:org-talend-themes-css-talend { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
+	preferences:
+		/*tMap not use following value*/
+		'COLOR_ENTRY_NORMAL_NO_USE=50,50,50'
+		'COLOR_ENTRY_NONE_NO_USE=0,0,0' /*Input table entry*/
+		'COLOR_ENTRY_HIGHLIGHTED_NO_USE=229,243,255' /*High light*/
+		'COLOR_ENTRY_HIGHLIGHTEDALL_NO_USE=229,243,255' /*High light all*/
+		'COLOR_ENTRY_SEARCH_HIGHLIGHTED_NO_USE=229,243,255'  /*Search high light*/
+		'COLOR_TMAP_TABELHEADER_SELECTED_BG_NO_USE=102,191,230' /*Map table header selected background*/
+		'COLOR_SELECTED_ZONE_TO_ZONE_LINK_NO_USE=110,111,112'
+		'COLOR_UNSELECTED_ZONE_TO_ZONE_LINK_NO_USE=102,192,230'
+}
+
+

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

@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2014, 2015 Lars Vogel and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Lars Vogel <Lars.Vogel@gmail.com> - initial API and implementation
+ *     Andrea Guarinoni - intial color schema definition
+ *     Lars Vogel <Lars.Vogel@vogella.com> - Ongoing maintenance
+ *******************************************************************************/
+
+/* ############################## Eclipse UI properties ############################## */
+
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/default/css/preferencestyle.css");
+IEclipsePreferences#org-eclipse-ui-workbench:org-talend-themes-css-talend { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
+	preferences:
+		/*tMap Don't use following value*/
+		'COLOR_ENTRY_NORMAL=170,170,170'
+		'COLOR_ENTRY_NONE=255,255,255' /*Input table entry*/
+		'COLOR_ENTRY_HIGHLIGHTED=0,88,208' /*High light*/
+		'COLOR_ENTRY_HIGHLIGHTEDALL=0,88,208' /*High light all*/
+		'COLOR_ENTRY_SEARCH_HIGHLIGHTED=0,88,208'  /*Search high light*/
+		'COLOR_TMAP_TABELHEADER_SELECTED_BG=0,88,208' /*Map table header selected background*/
+		'COLOR_TMAP_TABELHEADER_UNSELECTED_BG=220,220,220'
+		'COLOR_SELECTED_ZONE_TO_ZONE_LINK=0,88,208'
+		'COLOR_UNSELECTED_ZONE_TO_ZONE_LINK=110,111,112'
+}
+

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

@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2014, 2015 Lars Vogel and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Lars Vogel <Lars.Vogel@gmail.com> - initial API and implementation
+ *     Andrea Guarinoni - intial color schema definition
+ *     Lars Vogel <Lars.Vogel@vogella.com> - Ongoing maintenance
+ *******************************************************************************/
+
+/* ############################## Eclipse UI properties ############################## */
+
+@import url("platform:/plugin/org.talend.themes.css.talend/themes/default/css/preferencestyle.css");
+IEclipsePreferences#org-eclipse-ui-workbench:org-talend-themes-css-talend { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
+	preferences:
+		/*tMap*/
+		'COLOR_ENTRY_NORMAL=170,170,170'
+		'COLOR_ENTRY_NONE=255,255,255' /*Input table entry*/
+		'COLOR_ENTRY_HIGHLIGHTED=229,243,255' /*High light*/
+		'COLOR_ENTRY_HIGHLIGHTEDALL=229,243,255' /*High light all*/
+		'COLOR_ENTRY_SEARCH_HIGHLIGHTED=229,243,255'  /*Search high light*/
+		'COLOR_TMAP_TABELHEADER_SELECTED_BG=204,232,255' /*Map table header selected background*/
+		'COLOR_SELECTED_ZONE_TO_ZONE_LINK=204,232,255'
+		'COLOR_UNSELECTED_ZONE_TO_ZONE_LINK=110,111,112'
+}
+