fix(TUP-39027): npe

is ongoing

README.md

@@ -2,7 +2,7 @@
 http://www.talend.com
 
 
-![alt text](https://www.talend.com/wp-content/uploads/talend_logo_5.png "Talend")
+![alt text](https://www.talend.com/wp-content/uploads/2016/07/talend-logo.png "Talend")
 
 
 ## Contents

SECURITY.md

@@ -0,0 +1,14 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 8.0.x   | :white_check_mark: |
+| 7.3.x   | :white_check_mark: |
+| < 7.3.x | :x:                |
+
+## Reporting a Vulnerability
+
+For information on how to report a new security problem please see [here](https://www.talend.com/security/vulnerability-disclosure/).
+Our existing security advisories are published [here](https://www.talend.com/security/incident-response/).

main/features/org.talend.commons.feature/feature.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.commons.feature" label="Commons Feature" version="8.0.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.commons.feature" label="Commons Feature" version="8.8.8.qualifier" provider-name=".Talend SA."> 
   <description url="http://www.talend.com/online/featuresdescription.html#commons-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#commons-feature</description>  
   <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
   <license>The licence are describe in branding feature</license>  

main/features/org.talend.commons.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.feature</artifactId>

main/features/org.talend.core.feature/feature.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.core.feature" label="Core Feature" version="8.0.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.core.feature" label="Core Feature" version="8.8.8.qualifier" provider-name=".Talend SA."> 
   <description url="http://www.talend.com/online/featuresdescription.html#core-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#core-feature</description>  
   <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
   <license>The licence are describe in branding feature</license>  

main/features/org.talend.core.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.feature</artifactId>

main/features/org.talend.fragment.jars.common.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.fragment.jars.common.feature"
       label="Fragment Jars in Common"
-      version="8.0.1.qualifier">
+      version="8.8.8.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -54,7 +54,13 @@
          id="org.talend.libraries.apache.lucene8"
          download-size="0"
          install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.signon.util"
+         download-size="0"
+         install-size="0"
          version="0.0.0"
-         unpack="true"/>
+         unpack="false"/>
 
 </feature>

main/features/org.talend.fragment.jars.common.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.fragment.jars.common.feature</artifactId>

main/features/org.talend.help.feature/feature.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.talend.help.feature" label="Help Feature" version="8.0.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.help.feature" label="Help Feature" version="8.8.8.qualifier" provider-name=".Talend SA."> 
   <description url="http://www.talend.com/online/featuresdescription.html#help-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#help-feature</description>  
   <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
   <license>The licence are describe in branding feature</license>  

main/features/org.talend.help.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.help.feature</artifactId>

main/features/org.talend.libraries.jdbc.feature/feature.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="8.0.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="8.8.8.qualifier" provider-name=".Talend SA."> 
   <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license url="http://www.example.com/license">[Enter License Description here.]</license>  

main/features/org.talend.libraries.jdbc.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.jdbc.feature</artifactId>

main/features/org.talend.platform.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.platform.feature"
       label="Platform featrue"
-      version="8.0.1.qualifier"
+      version="8.8.8.qualifier"
       provider-name=".Talend SA.">
 
    <description url="http://www.talend.com/online/featuresdescription.html#platform-feature">

main/features/org.talend.platform.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.platform.feature</artifactId>

main/features/org.talend.rcp.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.rcp.feature"
       label="RCP Feature"
-      version="8.0.1.qualifier"
+      version="8.8.8.qualifier"
       provider-name=".Talend SA.">
 
    <description url="http://www.talend.com/online/featuresdescription.html#rcp-feature">

main/features/org.talend.rcp.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.feature</artifactId>

main/features/org.talend.update.p2.feature/feature.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.update.p2.feature" label="P2-feature" version="8.0.1.qualifier"> 
+<feature id="org.talend.update.p2.feature" label="P2-feature" version="8.8.8.qualifier"> 
   <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license url="http://www.example.com/license">[Enter License Description here.]</license>  

main/features/org.talend.update.p2.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.update.p2.feature</artifactId>

main/features/org.talend.updates.feature/feature.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.updates.feature" label="Updates-feature" version="8.0.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.updates.feature" label="Updates-feature" version="8.8.8.qualifier" provider-name=".Talend SA."> 
   <copyright url="http://www.talend.com/about-us">[Enter Copyright Description here.]</copyright>  
   <plugin id="org.talend.updates.runtime" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>

main/features/org.talend.updates.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.updates.feature</artifactId>

main/features/org.talend.utils.feature/feature.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="8.0.1.qualifier"> 
+<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="8.8.8.qualifier"> 
   <description url="http://www.example.com/description">This feature contains the Talend utilities plugin and its dependencies.</description>  
   <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.68.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"/>
@@ -20,7 +19,7 @@
     <import plugin="org.apache.servicemix.bundles.avro" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.junit" version="4.13.2" match="greaterOrEqual"/>
     <import plugin="org.slf4j.api" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.slf4j.impl.log4j12" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.slf4j.binding.log4j12" version="0.0.0" match="greaterOrEqual"/>
   </requires>  
   <plugin id="org.talend.daikon" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.daikon.exception" download-size="0" install-size="0" version="0.0.0" unpack="false"/>

main/features/org.talend.utils.feature/pom.xml

@@ -4,9 +4,12 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.utils.feature</artifactId>
   <packaging>eclipse-feature</packaging>
+  <properties>
+    <tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
+  </properties>
 </project>

main/plugins/org.talend.common.ui.runtime/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common UI runtime Plug-in
 Bundle-SymbolicName: org.talend.common.ui.runtime;singleton:=true
-Bundle-Version: 8.0.1.qualifier
+Bundle-Version: 8.8.8.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.apache.commons.collections,
  org.talend.libraries.dom4j-jaxen,
@@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.apache.ant
 Export-Package: 
  org.talend.commons.ui.runtime,
+ org.talend.commons.ui.runtime.custom,
  org.talend.commons.ui.runtime.exception,
  org.talend.commons.ui.runtime.expressionbuilder,
  org.talend.commons.ui.runtime.geometry,

main/plugins/org.talend.common.ui.runtime/build.properties

@@ -4,4 +4,6 @@ bin.includes = META-INF/,\
                plugin.xml,\
                icons/,\
                icons1/,\
-               .
+               .,\
+               resources/
+

main/plugins/org.talend.common.ui.runtime/plugin.xml

@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-
+    <extension
+          point="org.eclipse.e4.ui.css.swt.theme">
+        <stylesheet
+            uri="resources/theme/light_preferencestyle.css">
+            <themeid
+                refid="org.talend.themes.css.talend.default"></themeid>
+        </stylesheet>
+        <stylesheet
+            uri="resources/theme/dark_preferencestyle.css">
+            <themeid
+                refid="org.eclipse.e4.ui.css.theme.e4_dark"></themeid>
+        </stylesheet>
+    </extension>
 </plugin>

main/plugins/org.talend.common.ui.runtime/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.common.ui.runtime</artifactId>

main/plugins/org.talend.common.ui.runtime/resources/theme/dark_preferencestyle.css

@@ -0,0 +1,8 @@
+/* ############################## Eclipse UI properties ############################## */
+
+IEclipsePreferences#org-talend-common-ui-runtime:org-talend-common-ui-runtime { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
+	preferences:
+		'table.background=#org-eclipse-ui-workbench-DARK_BACKGROUND'
+		'table.foreground=#org-eclipse-ui-workbench-DARK_FOREGROUND'
+}
+

main/plugins/org.talend.common.ui.runtime/resources/theme/light_preferencestyle.css

@@ -0,0 +1,8 @@
+/* ############################## Eclipse UI properties ############################## */
+
+
+IEclipsePreferences#org-talend-common-ui-runtime:org-talend-common-ui-runtime { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */
+	preferences:
+		'table.background=COLOR-LIST-BACKGROUND'
+		'table.foreground=COLOR_LIST_FOREGROUND'
+}

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

@@ -12,14 +12,22 @@
 // ============================================================================
 package org.talend.commons.ui.runtime;
 
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Display;
 
 /**
  * DOC cmeng  class global comment. Detailled comment
  */
 public interface ColorConstants {
 
+    static final String BUNDLE_ID_COMMON_UI_RUNTIME = "org.talend.common.ui.runtime";
+
+    static final String KEY_TABLE_BACKGROUND = "table.background";
+
+    static final String KEY_TABLE_FOREGROUND = "table.foreground";
+
     static final Color WHITE_COLOR = new Color(null, 255, 255, 255);
 
     static final Color GREY_COLOR = new Color(null, 215, 215, 215);
@@ -28,11 +36,38 @@ public interface ColorConstants {
 
     static final Color YELLOW_COLOR = new Color(null, 255, 173, 37);// 254, 182, 84
 
-    static final Color RED_COLOR = new Color(null, new RGB(204,87,89));// 255
+    static final Color RED_COLOR = new Color(null, new RGB(204, 87, 89));// 255
+    
+    static final Color ERROR_FONT_COLOR = new Color(null, new RGB(255, 0, 0));// 255
 
     static final Color VERTICAL_SEPERATOR_LINE_COLOR = new Color(null, 162, 179, 195);
 
     static final Color LOCHMARA_COLOR = new Color(null, 6, 117, 193);
 
     static final Color WATHET_COLOR = new Color(null, 135, 206, 235);
+
+    static final Color INFO_COLOR = new Color(null, 205, 227, 242);
+//    static final Color INFO_COLOR = YELLOW_GREEN_COLOR;
+
+    static final Color WARN_COLOR = new Color(null, 252, 230, 217);
+
+    static final Color ERR_COLOR = new Color(null, 255, 235, 235);
+
+    static final Color SUCCEED_COLOR = new Color(null, 221, 242, 217);
+
+    static Color getTableBackgroundColor() {
+        return ITalendThemeService.getColor(ColorConstants.BUNDLE_ID_COMMON_UI_RUNTIME, ColorConstants.KEY_TABLE_BACKGROUND)
+                .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_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/CommonUIPlugin.java

@@ -23,6 +23,8 @@ import org.talend.commons.ui.runtime.exception.ExceptionServiceImpl;
 
 public class CommonUIPlugin implements BundleActivator {
 
+    public static String BUNDLE_ID = "org.talend.common.ui.runtime";
+
     private static Boolean fullyHeadless = null;
 
     /*

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

@@ -0,0 +1,154 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.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;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+import org.talend.commons.exception.ExceptionHandler;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+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
+     * 
+     * @param prop
+     * @return the Color, <font color="red">please <b>DON'T</b> dispose it, it is managed by JFaceResources</font>
+     */
+    static Optional<Color> getColor(String prop) {
+        return getColor(DEFAULT_PREFERENCE_ID, prop);
+    }
+
+    /**
+     * Get color from instance scope preference of bundleId, which managed by theme; the standard way eclipse uses
+     * 
+     * @param bundleId the instance scope preference which stores the prop
+     * @param prop
+     * @return the Color, <font color="red">please <b>DON'T</b> dispose it, it is managed by JFaceResources</font>
+     */
+    static Optional<Color> getColor(String bundleId, String prop) {
+        ITalendThemeService theme = get();
+        if (theme != null) {
+            return Optional.ofNullable(theme.getColorForTheme(bundleId, prop));
+        }
+        return Optional.ofNullable(null);
+    }
+
+    Color getColorForTheme(String bundleId, String prop);
+
+    /**
+     * Get property from instance scope preference of default bundleId, which managed by theme; the standard way eclipse
+     * uses
+     * 
+     * @param key
+     * @return
+     */
+    static Optional<String> getProperty(String key) {
+        return getProperty(DEFAULT_PREFERENCE_ID, key);
+    }
+
+    /**
+     * Get property from instance scope preference of bundleId, which managed by theme; the standard way eclipse uses
+     * 
+     * @param bundleId the instance scope preference which stores the key
+     * @param key
+     * @return
+     */
+    static Optional<String> getProperty(String bundleId, String key) {
+        ITalendThemeService theme = get();
+        String value = null;
+        if (theme != null) {
+            value = theme.getPropertyForTheme(bundleId, key);
+        }
+        if (StringUtils.isBlank(value)) {
+            return Optional.ofNullable(null);
+        } else {
+            return Optional.ofNullable(value);
+        }
+    }
+
+    String getPropertyForTheme(String bundleId, String key);
+
+    static void addPropertyChangeListener(IPropertyChangeListener listener) {
+        ITalendThemeService theme = get();
+        if (theme != null) {
+            theme.addPropertyChangeListenerFor(DEFAULT_PREFERENCE_ID, listener);
+        }
+    }
+
+    static void addPropertyChangeListener(String bundleId, IPropertyChangeListener listener) {
+        ITalendThemeService theme = get();
+        if (theme != null) {
+            theme.addPropertyChangeListenerFor(bundleId, listener);
+        }
+    }
+
+    void addPropertyChangeListenerFor(String bundleId, IPropertyChangeListener listener);
+
+    static boolean containsPropertyChangeListener(String bundleId, IPropertyChangeListener listener) {
+        ITalendThemeService theme = get();
+        if (theme != null) {
+            return theme.containsPropertyChangeListenerFor(bundleId, listener);
+        }
+        return false;
+    }
+
+    boolean containsPropertyChangeListenerFor(String bundleId, IPropertyChangeListener listener);
+
+    static void removePropertyChangeListener(IPropertyChangeListener listener) {
+        ITalendThemeService theme = get();
+        if (theme != null) {
+            theme.removePropertyChangeListenerFor(DEFAULT_PREFERENCE_ID, listener);
+        }
+    }
+
+    static void removePropertyChangeListener(String bundleId, IPropertyChangeListener listener) {
+        ITalendThemeService theme = get();
+        if (theme != null) {
+            theme.removePropertyChangeListenerFor(bundleId, listener);
+        }
+    }
+
+    void removePropertyChangeListenerFor(String bundleId, IPropertyChangeListener listener);
+
+    IPreferenceStore getThemePreferenceStore();
+
+    static ITalendThemeService get() {
+        try {
+            BundleContext bc = FrameworkUtil.getBundle(ITalendThemeService.class).getBundleContext();
+            ServiceReference<ITalendThemeService> serviceReference = bc.getServiceReference(ITalendThemeService.class);
+            if (serviceReference == null) {
+                return null;
+            }
+            return bc.getService(serviceReference);
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return null;
+    }
+
+}

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

@@ -0,0 +1,98 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.runtime;
+
+import org.talend.commons.ui.runtime.custom.IBusinessHandler;
+import org.talend.commons.ui.runtime.custom.ICustomUI;
+import org.talend.commons.ui.runtime.custom.ICustomUIEngine;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public class TalendUI {
+
+    private static TalendUI inst;
+
+    private static Object lock = new Object();
+
+    private boolean isStudio = true;
+
+    private ICustomUIEngine stigmaUIEngine;
+
+    private TalendUI() {
+    }
+
+    public static TalendUI get() {
+        if (inst == null) {
+            synchronized (lock) {
+                if (inst == null) {
+                    inst = new TalendUI();
+                }
+            }
+        }
+        return inst;
+    }
+
+    public void setStudio(boolean isStudio) {
+        this.isStudio = isStudio;
+    }
+
+    public boolean isStudio() {
+        return this.isStudio;
+    }
+
+    public ICustomUIEngine getStigmaUIEngine() {
+        return this.stigmaUIEngine;
+    }
+
+    public void setStigmaUIEngine(ICustomUIEngine engine) {
+        this.stigmaUIEngine = engine;
+    }
+
+    public <T extends IBusinessHandler<?>> T run(IStudioRunnable<T> studioRun, ICustomUI<T> stigmaRun) {
+        if (isStudio()) {
+            return runInStudio(studioRun);
+        } else {
+            return runInStigma(stigmaRun);
+        }
+    }
+
+    public <T extends IBusinessHandler<?>> T runInStudio(IStudioRunnable<T> run) {
+        return run.run();
+    }
+
+    public <T extends IBusinessHandler<?>> T runInStigma(ICustomUI<T> ui) {
+        if (ui == null) {
+            throw new RuntimeException("Custom ui is not defined!");
+        }
+        return stigmaUIEngine.run(ui);
+    }
+
+    public static interface IStudioRunnable<T extends IBusinessHandler<?>> {
+
+        T run();
+
+    }
+
+    public static abstract class AbsStudioRunnable<T extends IBusinessHandler<?>> implements IStudioRunnable<T> {
+
+        @Override
+        public T run() {
+            return doRun();
+        }
+
+        abstract public T doRun();
+
+    }
+
+}

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

@@ -0,0 +1,57 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.runtime.custom;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.talend.commons.ui.runtime.TalendUI;
+import org.talend.commons.ui.runtime.TalendUI.IStudioRunnable;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public abstract class AbsBusinessHandler<T extends IBusinessHandler<?>> implements IBusinessHandler<T> {
+
+    private Object openResult = Dialog.CANCEL;
+
+    public AbsBusinessHandler() {
+    }
+
+    protected ICustomUI<T> getCustomUI() {
+        return new UnsupportedCustomUI<T>((T) this, getUiKey());
+    }
+
+    @Override
+    public T run(IStudioRunnable<T> studioRun) {
+        return TalendUI.get().run(studioRun, getCustomUI());
+    }
+
+    @Override
+    public T run(IStudioRunnable<T> studioRun, ICustomUI<T> stigmaUI) {
+        return TalendUI.get().run(studioRun, stigmaUI);
+    }
+
+    @Override
+    public boolean isModalDialog() {
+        return true;
+    }
+
+    @Override
+    public Object getOpenResult() {
+        return openResult;
+    }
+
+    public void setOpenResult(Object openResult) {
+        this.openResult = openResult;
+    }
+
+}

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

@@ -0,0 +1,25 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.runtime.custom;
+
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public abstract class AbsUIData extends AbsUIEvent implements IUIData {
+
+    public AbsUIData(String key, String id, String type) {
+        super(key, id, type);
+    }
+
+}

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

@@ -0,0 +1,78 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.runtime.custom;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public abstract class AbsUIEvent implements IUIEvent {
+
+    private String type;
+
+    private String id;
+
+    private String key;
+
+    private Map<String, Object> params = new HashMap<>();
+
+    public AbsUIEvent(String key, String id, String type) {
+        this.key = key;
+        this.id = id;
+        this.type = type;
+    }
+
+    @Override
+    public String getUIId() {
+        return id;
+    }
+
+    @Override
+    public void setUIId(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    @Override
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public Map<String, Object> getParams() {
+        return params;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+}

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

@@ -0,0 +1,219 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.runtime.custom;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.ui.runtime.TalendUI;
+
+/**
+ * DOC cmeng class global comment. Detailled comment
+ */
+public abstract class AbstractCustomUI<T extends IBusinessHandler<?>> implements ICustomUI<T> {
+
+    private Semaphore modalLock = new Semaphore(1);
+
+    private boolean isModalDialog = true;
+
+    private String uiId;
+
+    private String uiKey;
+
+    private ICustomUIEngine uiEngine;
+
+    private T businessHandler;
+
+    private Map<String, IUIEventHandler> eventMap = new HashMap<>();
+
+    public AbstractCustomUI(T businessHandler) {
+        this.businessHandler = businessHandler;
+        this.uiId = UUID.randomUUID().toString();
+        this.uiKey = this.businessHandler.getUiKey();
+        this.isModalDialog = this.businessHandler.isModalDialog();
+        this.uiEngine = TalendUI.get().getStigmaUIEngine();
+        registerEventHandlers();
+    }
+
+    protected IUIEvent createOpenEvent() {
+        DefaultUIEvent openEvent = new DefaultUIEvent(BuiltinEvent.open.name(), uiId, IUIEvent.TYPE_GLOBAL);
+        openEvent.getParams().put(BuiltinParams.uiKey.name(), getUiKey());
+        return openEvent;
+    }
+
+    protected DefaultUIEvent createUIEvent(String key) {
+        DefaultUIEvent event = new DefaultUIEvent(key, uiId);
+        return event;
+    }
+
+    protected DefaultUIData createUIDataEvent(String key) {
+        DefaultUIData uiData = new DefaultUIData(key, uiId);
+        return uiData;
+    }
+
+    @Override
+    public boolean canHandle(IUIEvent event) {
+        return true;
+    }
+
+    @Override
+    public void handleUIEvent(IUIEvent event) {
+        String eventKey = event.getKey();
+        boolean closeDialog = false;
+        if (BuiltinEvent.ok.name().equals(eventKey)) {
+            closeDialog = onOk(event);
+        } else if (BuiltinEvent.apply.name().equals(eventKey)) {
+            closeDialog = onApply(event);
+        } else if (BuiltinEvent.close.name().equals(eventKey)) {
+            closeDialog = onClose(event);
+        } else if (BuiltinEvent.cancel.name().equals(eventKey)) {
+            closeDialog = onCancel(event);
+        } else {
+            IUIEventHandler eventListener = eventMap.get(eventKey);
+            if (eventListener != null) {
+                eventListener.handleUIEvent(event);
+            } else {
+                ExceptionHandler.process(new Exception("Can't handle event: " + eventKey));
+            }
+        }
+        if (closeDialog) {
+            closeDialog();
+        }
+    }
+
+    @Override
+    public Object provideUIData(IUIData uiData) {
+        return getUIEngine().provideUIData(uiData);
+    }
+
+    protected void closeDialog() {
+        collectDialogData();
+        try {
+            dispatchUIEvent(new DefaultUIEvent(BuiltinEvent.close.name(), uiId));
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        this.uiEngine.unregisterUIEventHandler(uiId);
+        modalLock.release();
+        onDialogClosed();
+    }
+
+    @Override
+    public T run() {
+        try {
+            modalLock.acquire();
+        } catch (InterruptedException e) {
+            throw new RuntimeException("Can't open dialog", e);
+        }
+        try {
+            this.uiEngine.registerUIEventHandler(uiId, this);
+            doRun();
+            if (isModalDialog()) {
+                try {
+                    while (true) {
+                        boolean succeed = modalLock.tryAcquire(5, TimeUnit.MINUTES);
+                        if (succeed) {
+                            break;
+                        }
+                        if (Thread.currentThread().isInterrupted()) {
+                            throw new InterruptedException();
+                        }
+                        if (this.uiEngine == null || !this.uiEngine.isClientAlive()) {
+                            throw new Exception("Lose connection with client");
+                        }
+                    }
+                } catch (Exception e) {
+                    throw new RuntimeException("Dialog is closed unexpected", e);
+                }
+            }
+            return businessHandler;
+        } finally {
+            modalLock.release();
+        }
+    }
+
+    @Override
+    public T getBusinessHandler() {
+        return this.businessHandler;
+    }
+
+    abstract protected T collectDialogData();
+
+    protected void onDialogClosed() {
+        // nothing to do
+    }
+
+    protected void doRun() {
+        IUIEvent openEvent = createOpenEvent();
+        dispatchUIEvent(openEvent);
+    }
+
+    @Override
+    public void dispatchUIEvent(IUIEvent event) {
+        event.setUIId(uiId);
+        this.uiEngine.dispatchUIEvent(this, event);
+    }
+
+    @Override
+    public CompletableFuture<Object> requestUIData(IUIData uiData) {
+        uiData.setUIId(uiId);
+        return this.uiEngine.requestUIData(this, uiData);
+    }
+
+    protected void registerEventListener(String key, IUIEventHandler listener) {
+        eventMap.put(key, listener);
+    }
+
+    public boolean isModalDialog() {
+        // currently don't support to change modal, if do it, need to update logic of run
+        return isModalDialog;
+    }
+
+    protected ICustomUIEngine getUIEngine() {
+        return this.uiEngine;
+    }
+
+    @Override
+    public String getId() {
+        return this.uiId;
+    }
+
+    public String getUiKey() {
+        return uiKey;
+    }
+
+    protected void registerEventHandlers() {
+    }
+
+    protected boolean onOk(IUIEvent event) {
+        return true;
+    }
+
+    protected boolean onApply(IUIEvent event) {
+        return true;
+    }
+
+    protected boolean onClose(IUIEvent event) {
+        return true;
+    }
+
+    protected boolean onCancel(IUIEvent event) {
+        return true;
+    }
+
+}

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

@@ -0,0 +1,117 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.runtime.custom;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public abstract class AbstractCustomUIEngine implements ICustomUIEngine {
+
+    private static final Logger log = Logger.getLogger(AbstractCustomUIEngine.class);
+
+    private Map<String, IUIEventHandler> uiEventHandlers = Collections.synchronizedMap(new HashMap<>());
+
+    private Map<String, Set<IUIEventHandler>> globalUIEventHandlers = Collections.synchronizedMap(new HashMap<>());
+
+    public AbstractCustomUIEngine() {
+        // nothing to do
+    }
+
+    @Override
+    public <T extends IBusinessHandler<?>> T run(ICustomUI<T> ui) {
+        return doRun(ui);
+    }
+
+    protected <T extends IBusinessHandler<?>> T doRun(ICustomUI<T> ui) {
+        return ui.run();
+    }
+
+    @Override
+    public void handleUIEvent(IUIEvent event) {
+        if (StringUtils.equals(event.getType(), IUIEvent.TYPE_GLOBAL)) {
+            Set<IUIEventHandler> handlers = globalUIEventHandlers.get(event.getKey());
+            if (handlers != null) {
+                new Thread(() -> {
+                    for (IUIEventHandler handler : handlers) {
+                        if (handler.canHandle(event)) {
+                            handler.handleUIEvent(event);
+                        }
+                    }
+                }).start();
+            }
+        } else {
+            IUIEventHandler handler = uiEventHandlers.get(event.getUIId());
+            if (handler != null) {
+                new Thread(() -> {
+                    handler.handleUIEvent(event);
+                }).start();
+            }
+        }
+    }
+
+    @Override
+    public Object provideUIData(IUIData uiData) {
+        String uiId = uiData.getUIId();
+        IUIEventHandler handler = uiEventHandlers.get(uiId);
+        if (handler != null) {
+            return handler.provideUIData(uiData);
+        }
+        return null;
+    }
+
+    @Override
+    public void registerUIEventHandler(String uiId, IUIEventHandler handler) {
+        IUIEventHandler existing = uiEventHandlers.put(uiId, handler);
+        if (existing != null) {
+            log.warn("duplicated register for UI id: " + uiId);
+        }
+    }
+
+    @Override
+    public void unregisterUIEventHandler(String uiId) {
+        uiEventHandlers.remove(uiId);
+    }
+
+    @Override
+    public void registerGlobalUIEventHandler(String eventId, IUIEventHandler handler) {
+        Set<IUIEventHandler> handlers = globalUIEventHandlers.get(eventId);
+        if (handlers == null) {
+            synchronized (globalUIEventHandlers) {
+                handlers = globalUIEventHandlers.get(eventId);
+                if (handlers == null) {
+                    handlers = Collections.synchronizedSet(new LinkedHashSet<>());
+                    globalUIEventHandlers.put(eventId, handlers);
+                }
+            }
+        }
+        handlers.add(handler);
+    }
+
+    @Override
+    public void unregisterGlobalUIEventHandler(String eventId, IUIEventHandler handler) {
+        Set<IUIEventHandler> handlers = globalUIEventHandlers.get(eventId);
+        if (handlers != null) {
+            handlers.remove(handler);
+        }
+    }
+
+}

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

@@ -0,0 +1,30 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.runtime.custom;
+
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public class DefaultUIData extends AbsUIData {
+
+    public DefaultUIData(String key, String id) {
+        // type is null, means it is an event inside custom ui, which id is 'id'
+        super(key, id, null);
+    }
+
+    public DefaultUIData(String key, String id, String type) {
+        super(key, id, type);
+    }
+
+}

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

@@ -0,0 +1,30 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.runtime.custom;
+
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public class DefaultUIEvent extends AbsUIEvent {
+
+    public DefaultUIEvent(String key, String id) {
+        // type is null, means it is an event side the custom ui, which id is 'id'
+        super(key, id, null);
+    }
+
+    public DefaultUIEvent(String key, String id, String type) {
+        super(key, id, type);
+    }
+
+}

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

@@ -0,0 +1,36 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.runtime.custom;
+
+import org.talend.commons.ui.runtime.TalendUI.IStudioRunnable;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public interface IBusinessHandler<T extends IBusinessHandler<?>> {
+
+    public static final int OK = 0;
+
+    public static final int CANCEL = 1;
+
+    String getUiKey();
+
+    boolean isModalDialog();
+
+    Object getOpenResult();
+
+    T run(IStudioRunnable<T> studioRun);
+
+    T run(IStudioRunnable<T> studioRun, ICustomUI<T> stigmaUI);
+
+}

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

@@ -0,0 +1,53 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.runtime.custom;
+
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public interface ICustomUI<T extends IBusinessHandler<?>> extends IUIEventHandler {
+
+    String getId();
+
+    T getBusinessHandler();
+
+    T run();
+
+    /**
+     * Send event to stigma
+     */
+    void dispatchUIEvent(IUIEvent event);
+
+    /**
+     * Request data from stigma
+     */
+    CompletableFuture<Object> requestUIData(IUIData uiData);
+
+    static enum BuiltinEvent {
+        open,
+        ok,
+        apply,
+        close,
+        cancel;
+    }
+
+    static enum BuiltinParams {
+        uiKey,
+        name,
+        title,
+        message;
+    }
+
+}

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

@@ -0,0 +1,25 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.runtime.custom;
+
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public interface ICustomUIDialog {
+
+    int open();
+
+    int getOpenResult();
+
+}

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

@@ -0,0 +1,60 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.runtime.custom;
+
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public interface ICustomUIEngine {
+
+    <T extends IBusinessHandler<?>> T run(ICustomUI<T> ui);
+
+    /**
+     * Handle event from stigma
+     */
+    void handleUIEvent(IUIEvent event);
+
+    /**
+     * Provide UI data to stigma
+     */
+    Object provideUIData(IUIData uiData);
+
+    /**
+     * Send event to stigma
+     */
+    <T extends IBusinessHandler<?>> void dispatchUIEvent(ICustomUI<T> ui, IUIEvent event);
+
+    /**
+     * Request data from stigma
+     */
+    <T extends IBusinessHandler<?>> CompletableFuture<Object> requestUIData(ICustomUI<T> ui, IUIData uiData);
+
+    <M> M convertValue(Object value, Class<M> clz);
+
+    Object readJson(String value) throws Exception;
+
+    void registerThreadLocalContext(String key, Object value);
+
+    void registerUIEventHandler(String uiId, IUIEventHandler handler);
+
+    void unregisterUIEventHandler(String uiId);
+
+    void registerGlobalUIEventHandler(String eventId, IUIEventHandler handler);
+
+    void unregisterGlobalUIEventHandler(String eventId, IUIEventHandler handler);
+
+    boolean isClientAlive();
+
+}

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

@@ -0,0 +1,21 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.runtime.custom;
+
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public interface IUIData extends IUIEvent {
+
+}

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

@@ -0,0 +1,34 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.runtime.custom;
+
+import java.util.Map;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public interface IUIEvent {
+
+    static final String TYPE_GLOBAL = "global";
+
+    String getType();
+
+    String getUIId();
+
+    void setUIId(String id);
+
+    String getKey();
+
+    Map<String, Object> getParams();
+
+}

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

@@ -0,0 +1,30 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.runtime.custom;
+
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public interface IUIEventHandler {
+
+    boolean canHandle(IUIEvent event);
+
+    void handleUIEvent(IUIEvent event);
+
+    /**
+     * Provide UIData to frontend
+     */
+    Object provideUIData(IUIData uiData);
+
+}

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

@@ -0,0 +1,78 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.runtime.custom;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public class MessageDialogBusinessHandler extends AbsBusinessHandler<MessageDialogBusinessHandler> {
+
+    private static final String UI_KEY = "MessageDialog";
+
+    private String title;
+
+    private String message;
+
+    private int dialogType;
+
+    private boolean isModalDialog = true;
+
+    public MessageDialogBusinessHandler(int dialogType) {
+        super();
+        this.dialogType = dialogType;
+    }
+
+    @Override
+    protected ICustomUI<MessageDialogBusinessHandler> getCustomUI() {
+        return new MessageDialogCustomUI(this);
+    }
+
+    public int getDialogType() {
+        return dialogType;
+    }
+
+    public void setDialogType(int dialogType) {
+        this.dialogType = dialogType;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    @Override
+    public String getUiKey() {
+        return UI_KEY;
+    }
+
+    @Override
+    public boolean isModalDialog() {
+        return this.isModalDialog;
+    }
+
+    public void setModalDialog(boolean modal) {
+        this.isModalDialog = modal;
+    }
+
+}

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

@@ -0,0 +1,110 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.runtime.custom;
+
+import java.util.Map;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.talend.commons.exception.ExceptionHandler;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public class MessageDialogCustomUI extends AbstractCustomUI<MessageDialogBusinessHandler> {
+
+    private static final String OK = "ok";
+
+    private static final String CANCEL = "cancel";
+
+    public MessageDialogCustomUI(MessageDialogBusinessHandler businessHandler) {
+        super(businessHandler);
+    }
+
+    @Override
+    protected IUIEvent createOpenEvent() {
+        IUIEvent openEvent = super.createOpenEvent();
+        Map<String, Object> params = openEvent.getParams();
+        MessageDialogBusinessHandler bh = getBusinessHandler();
+        params.put(BuiltinParams.title.name(), bh.getTitle());
+        params.put(BuiltinParams.message.name(), bh.getMessage());
+        params.put("dialogType", mapDialogType(bh.getDialogType()));
+        return openEvent;
+    }
+
+    private String mapDialogType(int type) {
+        switch (type) {
+        case MessageDialog.CONFIRM:
+            return "confirm";
+        case MessageDialog.ERROR:
+            return "error";
+        case MessageDialog.INFORMATION:
+            return "info";
+        case MessageDialog.QUESTION:
+            return "question";
+        case MessageDialog.QUESTION_WITH_CANCEL:
+            return "questionWithCancel";
+        case MessageDialog.WARNING:
+            return "warning";
+        default:
+            return "none";
+        }
+    }
+
+    @Override
+    protected MessageDialogBusinessHandler collectDialogData() {
+        DefaultUIData uiData = createUIDataEvent("openResult");
+        MessageDialogBusinessHandler businessHandler = getBusinessHandler();
+        try {
+            Object openResult = requestUIData(uiData).get();
+            openResult = mapOpenResult(openResult);
+            businessHandler.setOpenResult(openResult);
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return businessHandler;
+    }
+
+    private Object mapOpenResult(Object data) {
+        Object result = data;
+        switch (getBusinessHandler().getDialogType()) {
+        case MessageDialog.CONFIRM:
+        case MessageDialog.ERROR:
+        case MessageDialog.INFORMATION:
+        case MessageDialog.WARNING:
+            if (OK.equals(data)) {
+                result = Boolean.TRUE;
+            } else {
+                result = Boolean.FALSE;
+            }
+            break;
+        case MessageDialog.QUESTION:
+            if (OK.equals(data)) {
+                result = Boolean.TRUE;
+            } else {
+                result = Boolean.FALSE;
+            }
+            break;
+        case MessageDialog.QUESTION_WITH_CANCEL:
+            if (OK.equals(data)) {
+                result = Boolean.TRUE;
+            } else {
+                result = Boolean.FALSE;
+            }
+            break;
+        default:
+            break;
+        }
+        return result;
+    }
+
+}

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

@@ -0,0 +1,101 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.runtime.custom;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Map;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public class UnsupportedCustomUI<T extends IBusinessHandler<?>> extends AbstractCustomUI<T> {
+
+    UnsupportedBusinessHandler realHandler;
+
+    public UnsupportedCustomUI(T bh, String name) {
+        super(bh);
+        realHandler = new UnsupportedBusinessHandler(name);
+    }
+
+    public UnsupportedCustomUI(T bh, String name, String message) {
+        super(bh);
+        realHandler = new UnsupportedBusinessHandler(name, message);
+    }
+
+    @Override
+    protected IUIEvent createOpenEvent() {
+        IUIEvent openEvent = super.createOpenEvent();
+        Map<String, Object> params = openEvent.getParams();
+        params.put(BuiltinParams.name.name(), realHandler.getDialogName());
+        params.put(BuiltinParams.message.name(), realHandler.getDialogName());
+        return openEvent;
+    }
+
+    @Override
+    protected T collectDialogData() {
+        return getBusinessHandler();
+    }
+
+    public static class UnsupportedBusinessHandler extends AbsBusinessHandler<UnsupportedBusinessHandler> {
+
+        private static final String UI_KEY = "UnsupportedDialog";
+
+        private String dialogName;
+
+        private String message;
+
+        public UnsupportedBusinessHandler(String name) {
+            super();
+            this.dialogName = name;
+            StringWriter sw = new StringWriter();
+            PrintWriter pw = new PrintWriter(sw);
+            new Exception().printStackTrace(pw);
+            this.message = sw.toString();
+        }
+
+        public UnsupportedBusinessHandler(String name, String message) {
+            super();
+            this.dialogName = name;
+            this.message = message;
+        }
+
+        @Override
+        protected ICustomUI<UnsupportedBusinessHandler> getCustomUI() {
+            return new UnsupportedCustomUI(this, dialogName, message);
+        }
+
+        @Override
+        public String getUiKey() {
+            return UI_KEY;
+        }
+
+        public String getDialogName() {
+            return dialogName;
+        }
+
+        public void setDialogName(String dialogName) {
+            this.dialogName = dialogName;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        public void setMessage(String message) {
+            this.message = message;
+        }
+
+    }
+
+}

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

@@ -72,12 +72,27 @@ public final class MessageBoxExceptionHandler {
         }
     }
 
+    public static void process(Throwable ex, Shell shell, boolean wrapMessage) {
+        CommonExceptionHandler.process(ex);
+
+        if (CommonsPlugin.isHeadless() || CommonsPlugin.isJUnitTest()) {
+            return;
+        }
+
+        if (shell != null) {
+            showMessage(ex, shell, wrapMessage);
+        }
+    }
+
+    public static void showMessage(Throwable ex, Shell shell) {
+        showMessage(ex, shell, true);
+    }
     /**
      * Open a message box showing a generic message and exception message.
      *
      * @param ex - exception to show
      */
-    public static void showMessage(Throwable ex, Shell shell) {
+    public static void showMessage(Throwable ex, Shell shell, boolean wrapMessage) {
         if (ex.equals(lastShowedAction)) {
             return;
         }
@@ -85,10 +100,14 @@ public final class MessageBoxExceptionHandler {
 
         // TODO smallet use ErrorDialogWidthDetailArea ?
         String title = Messages.getString("commons.error"); //$NON-NLS-1$
-        String msg = Messages.getString("exception.errorOccured", ex.getMessage()); //$NON-NLS-1$
+        String excepMsg = ex.getMessage();
         //add for tup-19726/19790, as for exception detailMessage will show more details on log area.
         if(ex.getCause()!=null) {
-        	msg = Messages.getString("exception.errorOccured", ex.getCause().getMessage()); //$NON-NLS-1$
+            excepMsg = ex.getCause().getMessage();
+        }
+        String msg = Messages.getString("exception.errorOccured", excepMsg); //$NON-NLS-1$
+        if (!wrapMessage) {
+            msg = Messages.getString("exception.message", excepMsg); //$NON-NLS-1$
         }
         Priority priority = CommonExceptionHandler.getPriority(ex);
 

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/i18n/messages.properties

@@ -114,6 +114,7 @@ TableViewerCreator.Table.BeNull=table is null
 TableViewerCreator.TableColumn.AssertMsg=The TableColumn of TableEditorColumn with idProperty '{0}' has not the correct Table parent
 TreeToTablesLinker.Type.Unsupported=This type of currentControl is unsupported
 commons.error=Error
+exception.message={0}\nSee log for more details.
 exception.errorOccured=An error occured ({0}).\nSee log for more details.
 ModelSelectionDialog.Message=Please choose one option, or cancel.
 ModelSelectionDialog.Option=option

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/i18n/messages_en.properties

@@ -1,132 +0,0 @@
-AccessorUtils.Assert0=The 'BeanPropertyAccessors' of the column (with title '{0}' and id '{1}') is not configured correctly.  {2} is required for bean <B>
-AccessorUtils.Assert1=The 'BeanPropertyAccessors' of the column (with title '{0}' and id '{1}') is not configured correctly or the value set has not the correct type.
-AccessorUtils.NoClassDef=NoClassDefFoundError ({0})\:{1}
-AccessorUtils.isReq=\ is required for the bean (<B>).
-AccessorUtils.isReqValue=\ is required for the value (<V>), but the value could be adapted with CellEditorValueAdapter.
-AddPushButton.AddButton.Tip=Add
-AddAllPushButton.AddAllButton.Tip=Add All
-CellEditorDialogBehavior.textContent=...
-CellEditorValueAdapterFactory.valueNotStringType=Bean value should be a class of String type \!
-ColorStyledText.RedoItem.Text=Redo
-ColorStyledText.UndoItem.Text=Undo
-ColorStyledText.CopyItem.Text=Copy
-ColorStyledText.PasteItem.Text=Paste
-ColorStyledText.SelectAllItem.Text=Select All
-ContentProposalAdapterExtended.close=close
-ContentProposalAdapterExtended.closeFocusout=close focusout
-ControlUtils.Unsupported1=This control ({0}) is not supported, add case if you want...
-CopyPushButton.CopyButton.Tip=Copy selected items
-Curve2D.MaxNum.Be0=maximumSegments must be positive or 0
-Curve2D.MinNum.Be0=minimumSegments must be positive or 0
-DateDialog.textContent=Select Date & Time
-DefaultCellModifier.tableItemDispose=TableItem disposed
-DialogErrorForCellEditorListener.Error.MsgDialogTitle=Error
-ErrorDialogWidthDetailArea.ErrorMessage.Text=Error Message
-ErrorDialogWidthDetailArea.ErrorMessage.ColumnText=Column can not be empty
-ErrorDialogWidthDetailArea.ErrorMessage.ColumnText.NotValid=The input '{0}' is not valid, will use the original value '{1}' instead of it.
-ErrorDialogWithContinue.setParameter=Set parameters and continue
-EventUtil.activate=activate
-EventUtil.arm=arm
-EventUtil.close=close
-EventUtil.collapse=collapse
-EventUtil.deactivate=deactivate
-EventUtil.defaultSelection=default selection
-EventUtil.deiconify=deiconify
-EventUtil.detailNull=null
-EventUtil.dispose=dispose
-EventUtil.dragDetect=drag detect
-EventUtil.expand=expand
-EventUtil.focusIn=focus in
-EventUtil.focusOut=focus out
-EventUtil.hardKeyDown=hard key down
-EventUtil.hardKeyUp=hard key up
-EventUtil.help=help
-EventUtil.hide=hide
-EventUtil.iconify=iconify
-EventUtil.keyDown=key down
-EventUtil.keyUp=key up
-EventUtil.menuDetect=menu detect
-EventUtil.modify=modify
-EventUtil.mouseDoubleClick=mouse double click
-EventUtil.mouseDown=mouse down
-EventUtil.mouseEnter=mouse enter
-EventUtil.mouseExit=mouse exit
-EventUtil.mouseHover=mouse hover
-EventUtil.mouseMove=mouse move
-EventUtil.mouseUp=mouse up
-EventUtil.move=move
-EventUtil.paint=paint
-EventUtil.resize=resize
-EventUtil.selectedEqual=SELECTED=
-EventUtil.selection=selection
-EventUtil.show=show
-EventUtil.traverse=traverse
-EventUtil.typeNull=null
-EventUtil.UnknowDetail=unkown ??? value of event detail \:
-EventUtil.UnknowType=unkown ??? value of event type \:
-EventUtil.verify=verify
-ExceptionHandler.Parameter.BeNull=ex param cannot be null
-ExceptionMessageDialog.Cancel=Cancel
-ExceptionMessageDialog.log=log
-ExceptionMessageDialog.No=No
-ExceptionMessageDialog.OK=OK
-ExceptionMessageDialog.Yes=Yes
-ExportPushButton.ExportButton.Tip=Export all rows into XML file
-ExportPushButtonForExtendedTable.ErrorMsg.Text=Error occurred
-ExtendedTableAddCommand.Add.Label=Add one or more table entries
-ExtendedTableCopyCommand.Copy.Label=Copy one or more table entries in the internal clipboard
-ExtendedTableModel.ModifiedObject.Error=ModifiedBeanListenable object must be set before use this method
-ExtendedTableMoveCommand.MoveLabel=Move up or down, one or more table entries
-ExtendedTablePasteCommand.Paste.Label=Paste data from the internal clipoard
-ExtendedTableRemoveCommand.Romve.Label=Remove table entries
-ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=Reset all DB Types to get the defaults
-ImportPushButton.ImportButton.Tip=Replace all rows by import from xml file
-ImportPushButtonForExtendedTable.ErrorMsg.Text=Error occurred
-LabelledFileField.BrowseButton.Text=Browse...
-LabelledFileField.FileDialog.Text=Select a
-Mode.Mode.ToString=Mode [{0}]
-ModeReader.IgnoreElement=Ignore unknown element
-ModelSelectionDialog.Title=Edit parameter using repository
-ModifyBeanValueCommand.ModifyCell.Label=Modify cell value
-MoveDownPushButton.MoveDownTip=Move down selected items
-MoveUpPushButton.MoveUpButton.Tip=Move up selected items
-PastePushButton.PasteButton.Label=Paste
-ProposalUtils.CellProposal.Error=Proposal of this type of CellEditor is unsupported \:
-ProposalUtils.CtrlProposal.ErrorMsg=Proposal for this type of Control is unsupported \:
-RemovePushButton.RemoveButton.Tip=Remove selected items
-ResetDBTypesButton.ResetDBTypesButton.Tip=Reset DB Types
-Rule.rule=Rule [{0}]
-SaveAsGenericSchemaPushButton.saveAsSchema=Save as generic schema
-SelectContextVariablesPushButton.Label=Select context variables
-SWTCalendarWithTime.contentEvening=Evening
-SWTCalendarWithTime.contentHr=Hr:
-SWTCalendarWithTime.contentMin=Min:
-SWTCalendarWithTime.contentMorning=Morning
-SWTCalendarWithTime.contentNoon=Noon
-SWTCalendarWithTime.contentNow=Now
-SWTCalendarWithTime.contnetSec=Sec:
-TableViewerCreator.CallMethod.ErrorMsg=You can call this method only if you have already called createTable()
-TableViewerCreator.CellModifier.ExError=The current CellModifier does'nt support this operation. \n Use '{0}' or a class which extends it to use this feature
-TableViewerCreator.columnNoIBeanProperty=The column '{0}' ('{1}') has a CellEditor set but does'nt have a IBeanPropertyAccessors \!
-TableViewerCreator.columnNullId=Column '{0}' has null id \!
-TableViewerCreator.IdProperty.AssertMsg=You must change the idProperty of one of your column, the idProperty must be unique for each column for one Table.
-TableViewerCreator.Table.BeNull=table is null
-TableViewerCreator.TableColumn.AssertMsg=The TableColumn of TableEditorColumn with idProperty '{0}' has not the correct Table parent
-TreeToTablesLinker.Type.Unsupported=This type of currentControl is unsupported
-commons.error=Error
-exception.errorOccured=An error occured ({0}).\nSee log for more details.
-ModelSelectionDialog.Message=Please choose one option, or cancel.
-ModelSelectionDialog.Option=option
-ModelSelectionDialog.BuiltIn=Change to built-in property.
-ModelSelectionDialog.ViewSchema=View schema (read only).
-ModelSelectionDialog.newViewSchema=View schema
-ModelSelectionDialog.ViewQuery=View query (read only).
-ModelSelectionDialog.Update=Update repository connection.
-FileStep2.previewFailure=Preview error. Some settings must be changed.\nNote\: Preview errors are generally due to a wrong encoding setting.
-GlobalServiceRegister.ServiceNotRegistered=The service {0} has not been registered.
-MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.title=The xml can't parse.
-MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.msg=The xml can't parse in this format.
-SSLConfirmDialog.KeyStore=please input keyStore
-SSLConfirmDialog.TrustStore=please input trustStore
-SSLConfirmDialog.Password=please input password
-HibernateUtils.auditDBIsNotUsable=The audit database must be empty or only contains tables related to audit.

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/i18n/messages_fr.properties

@@ -114,6 +114,7 @@ TableViewerCreator.Table.BeNull=la table est null.
 TableViewerCreator.TableColumn.AssertMsg=La TableColumn de TableEditorColumn avec idProperty '{0}' n'a pas la bonne Table parente
 TreeToTablesLinker.Type.Unsupported=Ce type de currentControl n'est pas support\u00E9
 commons.error=Erreur
+exception.message={0}\nConsultez le log pour plus de d\u00E9tails.
 exception.errorOccured=Une erreur est survenue ({0}).\nConsultez le log pour plus de d\u00E9tails.
 ModelSelectionDialog.Message=S\u00E9lectionnez une option ou annulez.
 ModelSelectionDialog.Option=Option

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/i18n/messages_ja.properties

@@ -65,7 +65,7 @@ EventUtil.typeNull=NULL
 EventUtil.UnknowDetail=\u30A4\u30D9\u30F3\u30C8\u8A73\u7D30\u306E\u4E0D\u660E\u306A???\u5024:
 EventUtil.UnknowType=\u30A4\u30D9\u30F3\u30C8\u30BF\u30A4\u30D7\u306E\u4E0D\u660E\u306A???\u5024:
 EventUtil.verify=\u78BA\u8A8D
-ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u51FA\u6765\u307E\u305B\u3093
+ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093
 ExceptionMessageDialog.Cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
 ExceptionMessageDialog.log=\u30ED\u30B0
 ExceptionMessageDialog.No=\u3044\u3044\u3048
@@ -73,12 +73,12 @@ ExceptionMessageDialog.OK=OK
 ExceptionMessageDialog.Yes=\u306F\u3044
 ExportPushButton.ExportButton.Tip=\u3059\u3079\u3066\u306E\u884C\u3092XML\u30D5\u30A1\u30A4\u30EB\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
 ExportPushButtonForExtendedTable.ErrorMsg.Text=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-ExtendedTableAddCommand.Add.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30921\u3064\u4EE5\u4E0A\u8FFD\u52A0
-ExtendedTableCopyCommand.Copy.Label=\u5185\u90E8\u30AF\u30EA\u30FC\u30F3\u30DC\u30FC\u30C9\u306B\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30921\u3064\u4EE5\u4E0A\u30B3\u30D4\u30FC
+ExtendedTableAddCommand.Add.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u30921\u3064\u4EE5\u4E0A\u8FFD\u52A0
+ExtendedTableCopyCommand.Copy.Label=\u5185\u90E8\u30AF\u30EA\u30FC\u30F3\u30DC\u30FC\u30C9\u306B\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u30921\u3064\u4EE5\u4E0A\u30B3\u30D4\u30FC
 ExtendedTableModel.ModifiedObject.Error=\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u4F7F\u7528\u3059\u308B\u524D\u306BModifiedBeanListenable\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-ExtendedTableMoveCommand.MoveLabel=\u8907\u6570\u306E\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u3092\u4E0A\u4E0B\u306B\u79FB\u52D5
+ExtendedTableMoveCommand.MoveLabel=\u8907\u6570\u306E\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u4E0A\u4E0B\u306B\u79FB\u52D5
 ExtendedTablePasteCommand.Paste.Label=\u5185\u90E8\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u304B\u3089\u30C7\u30FC\u30BF\u3092\u8CBC\u308A\u4ED8\u3051\u308B
-ExtendedTableRemoveCommand.Romve.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u3092\u524A\u9664
+ExtendedTableRemoveCommand.Romve.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u524A\u9664
 ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=DB\u30BF\u30A4\u30D7\u3092\u3059\u3079\u3066\u30EA\u30BB\u30C3\u30C8\u3057\u3066\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u53D6\u5F97
 ImportPushButton.ImportButton.Tip=\u884C\u3092\u3059\u3079\u3066XML\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u306B\u7F6E\u63DB
 ImportPushButtonForExtendedTable.ErrorMsg.Text=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
@@ -96,7 +96,7 @@ ProposalUtils.CtrlProposal.ErrorMsg=\u3053\u306E\u30BF\u30A4\u30D7\u306E\u5236\u
 RemovePushButton.RemoveButton.Tip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u524A\u9664
 ResetDBTypesButton.ResetDBTypesButton.Tip=DB\u30BF\u30A4\u30D7\u3092\u30EA\u30BB\u30C3\u30C8
 Rule.rule=\u30EB\u30FC\u30EB[{0}]
-SaveAsGenericSchemaPushButton.saveAsSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
+SaveAsGenericSchemaPushButton.saveAsSchema=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
 SelectContextVariablesPushButton.Label=\u30B3\u30F3\u30C6\u30AF\u30B9\u30C8\u5909\u6570\u3092\u9078\u629E
 SWTCalendarWithTime.contentEvening=\u5915\u65B9
 SWTCalendarWithTime.contentHr=\u6642:
@@ -106,7 +106,7 @@ SWTCalendarWithTime.contentNoon=\u5348\u5F8C
 SWTCalendarWithTime.contentNow=\u73FE\u5728
 SWTCalendarWithTime.contnetSec=\u79D2:
 TableViewerCreator.CallMethod.ErrorMsg=\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u3001createTable()\u3092\u65E2\u306B\u547C\u3073\u51FA\u3057\u3066\u3044\u308B\u5834\u5408\u306E\u307F\u547C\u3073\u51FA\u305B\u307E\u3059
-TableViewerCreator.CellModifier.ExError=\u73FE\u5728\u306ECellModifier\u306F\u3053\u306E\u64CD\u4F5C\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093\u3002\n\u3053\u306E\u6A5F\u80FD\u3092\u4F7F\u3046\u306B\u306F\u3001'{0}'\u304B\u62E1\u5F35\u30AF\u30E9\u30B9\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
+TableViewerCreator.CellModifier.ExError=\u73FE\u5728\u306ECellModifier\u306F\u3053\u306E\u64CD\u4F5C\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093\u3002 \n \u3053\u306E\u6A5F\u80FD\u3092\u4F7F\u7528\u3059\u308B\u306B\u306F\u3001'{0}'\u304B\u3001\u62E1\u5F35\u3059\u308B\u30AF\u30E9\u30B9\u3092\u4F7F\u3044\u307E\u3059\u3002
 TableViewerCreator.columnNoIBeanProperty=\u30AB\u30E9\u30E0'{0}' ('{1}')\u306B\u306FCellEditor\u30BB\u30C3\u30C8\u304C\u3042\u308A\u307E\u3059\u304C\u3001IBeanPropertyAccessors\u304C\u3042\u308A\u307E\u305B\u3093!
 TableViewerCreator.columnNullId=\u30AB\u30E9\u30E0'{0}'\u304Cnull\u3067\u3059\uFF01
 TableViewerCreator.IdProperty.AssertMsg=\u30AB\u30E9\u30E0\u306EidProperty\u306E\u5909\u66F4\u304C\u5FC5\u8981\u3067\u3059\u3001idProperty\u306F\uFF11\u3064\u306E\u30C6\u30FC\u30D6\u30EB\u3067\u30E6\u30CB\u30FC\u30AF\u3067\u306A\u304F\u3066\u306F\u306A\u308A\u307E\u305B\u3093\u3002
@@ -114,6 +114,7 @@ TableViewerCreator.Table.BeNull=\u30C6\u30FC\u30D6\u30EB\u304CNULL\u3067\u3059
 TableViewerCreator.TableColumn.AssertMsg=idProperty'{0}'\u304C\u3042\u308BTableEditorColumn\u306ETableColumn\u306B\u306F\u3001\u6B63\u3057\u3044\u89AA\u30C6\u30FC\u30D6\u30EB\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093
 TreeToTablesLinker.Type.Unsupported=currentControl\u306E\u3053\u306E\u30BF\u30A4\u30D7\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 commons.error=\u30A8\u30E9\u30FC
+exception.message={0}\n\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 exception.errorOccured=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F({0})\u3002\n\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 ModelSelectionDialog.Message=\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\uFF11\u3064\u9078\u629E\u3059\u308B\u304B\u3001\u30AD\u30E3\u30F3\u30BB\u30EB\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 ModelSelectionDialog.Option=\u30AA\u30D7\u30B7\u30E7\u30F3
@@ -121,11 +122,11 @@ ModelSelectionDialog.BuiltIn=\u7D44\u307F\u8FBC\u307F\u30D7\u30ED\u30D1\u30C6\u3
 ModelSelectionDialog.ViewSchema=\u30B9\u30AD\u30FC\u30DE\u3092\u8868\u793A\u3057\u307E\u3059(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)\u3002
 ModelSelectionDialog.newViewSchema=\u30B9\u30AD\u30FC\u30DE\u3092\u8868\u793A
 ModelSelectionDialog.ViewQuery=\u30AF\u30A8\u30EA\u30FC\u3046\u3092\u8868\u793A\u3057\u307E\u3059(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)\u3002
-ModelSelectionDialog.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u63A5\u7D9A\u3092\u66F4\u65B0\u3057\u307E\u3059\u3002
+ModelSelectionDialog.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u63A5\u7D9A\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u3002
 SSLConfirmDialog.KeyStore=KeyStore\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
 SSLConfirmDialog.TrustStore=TrustStore\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
 SSLConfirmDialog.Password=\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
-FileStep2.previewFailure=\u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u3002\u3044\u304F\u3064\u304B\u306E\u8A2D\u5B9A\u5909\u66F4\u304C\u5FC5\u8981\u3067\u3059\u3002\n\u6CE8: \u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u306F\u4E00\u822C\u306B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u8A2D\u5B9A\u306E\u8AA4\u308A\u304C\u539F\u56E0\u3067\u3059\u3002
+FileStep2.previewFailure=\u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u3002\u4E00\u90E8\u306E\u8A2D\u5B9A\u3092\u5909\u66F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\u6CE8: \u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u306F\u4E00\u822C\u7684\u306B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u8A2D\u5B9A\u306E\u8AA4\u308A\u304C\u539F\u56E0\u3067\u3059\u3002
 GlobalServiceRegister.ServiceNotRegistered=\u30B5\u30FC\u30D3\u30B9{0}\u304C\u767B\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.title=XML\u306B\u89E3\u6790\u3067\u304D\u307E\u305B\u3093.
 MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.msg=\u3053\u306E\u5F62\u5F0F\u3067\u306F\u3001XML\u306B\u89E3\u6790\u3067\u304D\u307E\u305B\u3093.

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/i18n/messages_zh_CN.properties

@@ -106,7 +106,7 @@ SWTCalendarWithTime.contentNoon=\u4E2D\u5348
 SWTCalendarWithTime.contentNow=\u73B0\u5728
 SWTCalendarWithTime.contnetSec=\u79D2:
 TableViewerCreator.CallMethod.ErrorMsg=\u53EA\u6709\u60A8\u5DF2\u7ECF\u8C03\u7528\u4E86 createTable() \u65B9\u6CD5\u540E\uFF0C\u624D\u80FD\u8C03\u7528\u6B64\u65B9\u6CD5\u3002
-TableViewerCreator.CellModifier.ExError=\u5F53\u524D CellModifier \u4E0D\u652F\u6301\u6B64\u64CD\u4F5C\u3002\n \u4F7F\u7528 '{0}' \u6216\u80FD\u591F\u5BF9\u5176\u8FDB\u884C\u6269\u5C55\u7684\u7C7B\u6765\u4F7F\u7528\u6B64\u529F\u80FD
+TableViewerCreator.CellModifier.ExError=\u5F53\u524D CellModifier \u4E0D\u652F\u6301\u6B64\u64CD\u4F5C\u3002 \n \u4F7F\u7528 '{0}' \u6216\u6269\u5C55\u5B83\u7684\u7C7B\u6765\u4F7F\u7528\u6B64\u529F\u80FD
 TableViewerCreator.columnNoIBeanProperty=\u5217 '{0}' ('{1}') \u8BBE\u7F6E\u4E86 CellEditor\uFF0C\u4F46\u6CA1\u6709 IBeanPropertyAccessors\uFF01
 TableViewerCreator.columnNullId=\u5217 '{0}' \u7684 id \u4E3A null\uFF01
 TableViewerCreator.IdProperty.AssertMsg=\u4F60\u5FC5\u987B\u6539\u53D8\u5176\u4E2D\u4E00\u4E2A\u5217\u7684 idProperty\uFF0C\u4E00\u4E2A\u8868\u4E2D\u7684\u6BCF\u4E2A\u5217\u7684 idProperty \u5FC5\u987B\u552F\u4E00\u3002
@@ -114,7 +114,8 @@ TableViewerCreator.Table.BeNull=\u8868\u4E3A null
 TableViewerCreator.TableColumn.AssertMsg=TableEditorColumn \u7684 idProperty \u4E3A '{0}' \u7684 TableColumn \u6CA1\u6709\u6B63\u786E\u7684 Table \u7236\u9879
 TreeToTablesLinker.Type.Unsupported=\u4E0D\u652F\u6301\u8FD9\u79CD\u7C7B\u578B\u7684 currentControl
 commons.error=\u9519\u8BEF
-exception.errorOccured=\u53D1\u751F\u9519\u8BEF ({0})\u3002\n\u8BF7\u67E5\u770B\u65E5\u5FD7\u4EE5\u83B7\u53D6\u66F4\u591A\u8BE6\u7EC6\u4FE1\u606F\u3002
+exception.message={0}\n\u8BF7\u67E5\u770B\u65E5\u5FD7\u4EE5\u83B7\u53D6\u66F4\u591A\u8BE6\u7EC6\u4FE1\u606F\u3002
+exception.errorOccured=\u51FA\u73B0\u9519\u8BEF ({0})\u3002\n\u8BF7\u67E5\u770B\u65E5\u5FD7\u4EE5\u83B7\u53D6\u66F4\u591A\u8BE6\u7EC6\u4FE1\u606F\u3002
 ModelSelectionDialog.Message=\u8BF7\u9009\u62E9\u4E00\u4E2A\u9009\u9879\u6216\u53D6\u6D88\u3002
 ModelSelectionDialog.Option=\u9009\u9879
 ModelSelectionDialog.BuiltIn=\u66F4\u6539\u4E3A\u5185\u7F6E\u5C5E\u6027\u3002
@@ -125,7 +126,7 @@ ModelSelectionDialog.Update=\u66F4\u65B0\u5B58\u50A8\u5E93\u8FDE\u63A5\u3002
 SSLConfirmDialog.KeyStore=\u8BF7\u8F93\u5165\u5BC6\u94A5\u5E93
 SSLConfirmDialog.TrustStore=\u8BF7\u8F93\u5165\u4FE1\u4EFB\u5E93
 SSLConfirmDialog.Password=\u8BF7\u8F93\u5165\u5BC6\u7801
-FileStep2.previewFailure=\u9884\u89C8\u9519\u8BEF\u3002\u987B\u6539\u53D8\u4E00\u4E9B\u8BBE\u7F6E\u3002\n\u6CE8\u610F\uFF1A\u9884\u89C8\u9519\u8BEF\u53EF\u80FD\u662F\u56E0\u4E3A\u9519\u8BEF\u7684\u7F16\u7801\u8BBE\u7F6E\u9020\u6210\u7684\u3002
+FileStep2.previewFailure=\u9884\u89C8\u9519\u8BEF\u3002\u5FC5\u987B\u66F4\u6539\u67D0\u4E9B\u8BBE\u7F6E\u3002\n\u6CE8\u610F\uFF1A\u9884\u89C8\u9519\u8BEF\u901A\u5E38\u662F\u7531\u4E8E\u9519\u8BEF\u7684\u7F16\u7801\u8BBE\u7F6E\u5BFC\u81F4\u3002
 GlobalServiceRegister.ServiceNotRegistered=\u670D\u52A1 {0} \u8FD8\u672A\u6CE8\u518C\u3002
 MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.title=xml \u65E0\u6CD5\u89E3\u6790\u3002
 MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.msg=xml \u65E0\u6CD5\u4EE5\u8FD9\u79CD\u683C\u5F0F\u89E3\u6790\u3002

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

@@ -74,6 +74,7 @@ public enum ECoreImage implements IImage {
     CONTEXT_WIZ("/icons1/context_wiz.png"), //$NON-NLS-1$
     CODE_ICON("/icons1/code.png"), //$NON-NLS-1$
     ROUTES_ICON("/icons1/routes_icon.png"), //$NON-NLS-1$
+    ROUTELET_ICON("/icons1/routelet.png"), //$NON-NLS-1$
     ROUTINE_ICON("/icons1/routine.png"), //$NON-NLS-1$
     ROUTINE_EDITOR_ICON("/icons1/routine_editor.png"), //$NON-NLS-1$
     ROUTINESJAR_ICON("/icons1/routinesjar.png"), //$NON-NLS-1$

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

@@ -39,6 +39,10 @@ public enum EImage implements IImage {
     EDIT_ICON("/icons/write_obj.gif"), //$NON-NLS-1$
     READ_ICON("/icons/read_obj.gif"), //$NON-NLS-1$
 
+    QUESTION_ICON("/icons/question.gif"), //$NON-NLS-1$
+
+    HELP_ICON("/icons/help.png"), //$NON-NLS-1$
+
     CREATE_CONNECTION_ICON("/icons/connection.gif"), //$NON-NLS-1$
 
     RESET_DBTYPES_ICON("/icons/reset_dbtypes.jpg"), //$NON-NLS-1$
@@ -127,7 +131,6 @@ public enum EImage implements IImage {
     FILL_COLOR_ICON("/icons/fill_color.gif"), //$NON-NLS-1$
 
     OPEN_IN_BROWSER("/icons/open.gif"), //$NON-NLS-1$
-    DOWNLOAD_MODULE("/icons/download.gif"), //$NON-NLS-1$
 
     COMPONENT_MISSING("/icons/component_missing.png"), //$NON-NLS-1$
 

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

@@ -16,8 +16,14 @@ import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.SWT;
@@ -158,8 +164,35 @@ public class ImageUtils {
         return imageDes;
     }
 
-    private static Map<byte[], ImageDataProvider> imageFromDataCachedImages = new HashMap<byte[], ImageDataProvider>();
+    private static Map<byte[], ImageDataProvider> imageFromDataCachedImages = Collections.synchronizedMap(new HashMap<byte[], ImageDataProvider>());
+    private static Map<Long, byte[]> cachedImagesTimeKeeping = Collections.synchronizedMap(new HashMap<Long, byte[]>());
+    
+    private static Thread clearImageFromDataCachedImages = new Thread() {
+        @SuppressWarnings("static-access")
+        public void run() {
+            long timeout = 5 * 60 * 1000;
+            while(true) {//remove older than 5 mins
+                Set<Entry<Long, byte[]>> collect = cachedImagesTimeKeeping.entrySet().stream()
+                        .filter(entry -> (System.currentTimeMillis() - entry.getKey()) > timeout).collect(Collectors.toSet());
+                for(Entry<Long, byte[]> entry: collect) {
+                    Long key = entry.getKey();
+                    cachedImagesTimeKeeping.remove(key);
+                    imageFromDataCachedImages.remove(entry.getValue());
+                }
+                
+                try {
+                    sleep(timeout);
+                } catch (InterruptedException e) {//
+                }
+            }
+        };
+    };
 
+    static {
+        clearImageFromDataCachedImages.setDaemon(true);
+        clearImageFromDataCachedImages.start();
+    }
+    
     /**
      * By default, keep in memory the .
      *
@@ -169,12 +202,17 @@ public class ImageUtils {
      */
     public static ImageDescriptor createImageFromData(byte[] data, boolean... keepInMemory) {
         if (data != null) {
-            ImageDataProvider imageProvider = imageFromDataCachedImages.get(data);
+            ImageDataProvider imageProvider = null;
+            Optional<byte[]> findKey = imageFromDataCachedImages.keySet().stream().filter(key->Arrays.equals(key, data)).findAny();
+            if(findKey.isPresent()) {
+                imageProvider = imageFromDataCachedImages.get(findKey.get());
+            }
             if (imageProvider == null) {
                 ByteArrayInputStream bais = new ByteArrayInputStream(data);
                 ImageData img = new ImageData(bais);
                 imageProvider = new TalendImageProvider(img);
                 imageFromDataCachedImages.put(data, imageProvider);
+                cachedImagesTimeKeeping.put(System.currentTimeMillis(), data);
             }
             return ImageDescriptor.createFromImageDataProvider(imageProvider);
         }
@@ -183,8 +221,9 @@ public class ImageUtils {
 
     public static void disposeImages(byte[] data) {
         if (data != null) {
-            if (imageFromDataCachedImages.get(data) != null) {
-                imageFromDataCachedImages.remove(data);
+            Optional<byte[]> findKey = imageFromDataCachedImages.keySet().stream().filter(key->Arrays.equals(key, data)).findAny();
+            if(findKey.isPresent()) {
+                imageFromDataCachedImages.remove(findKey.get());
             }
         }
     }

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/swt/tableviewer/TableViewerCreatorNotModifiable.java

@@ -57,6 +57,8 @@ import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
+import org.talend.commons.ui.runtime.ColorConstants;
+import org.talend.commons.ui.runtime.ITalendThemeService;
 import org.talend.commons.ui.runtime.i18n.Messages;
 import org.talend.commons.ui.runtime.swt.proposal.IShowInvisibleCellEditorMethods;
 import org.talend.commons.ui.runtime.swt.tableviewer.behavior.DefaultHeaderColumnSelectionListener;
@@ -291,7 +293,8 @@ public class TableViewerCreatorNotModifiable<B> {
     public TableViewerCreatorNotModifiable(Composite compositeParent) {
         super();
         this.compositeParent = compositeParent;
-        this.emptyZoneColor = compositeParent.getDisplay().getSystemColor(SWT.COLOR_WHITE);
+        this.emptyZoneColor = ITalendThemeService.getColor("org.talend.commons.ui.BgColorForEmptyArea")
+                .orElse(compositeParent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 
     }
 
@@ -669,8 +672,22 @@ public class TableViewerCreatorNotModifiable<B> {
             table.addListener(SWTFacade.Paint, paintListener);
         }
 
-        setBackgroundColor(backgroundColor != null ? backgroundColor : table.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-        setForegroundColor(foregroundColor != null ? foregroundColor : table.getDisplay().getSystemColor(SWT.COLOR_BLACK));
+        Color prefBackgroundColor = backgroundColor;
+        if (prefBackgroundColor == null) {
+            prefBackgroundColor = ColorConstants.getTableBackgroundColor();
+            if (prefBackgroundColor == null) {
+                prefBackgroundColor = table.getDisplay().getSystemColor(SWT.COLOR_WHITE);
+            }
+        }
+        Color prefForegroundColor = foregroundColor;
+        if (prefForegroundColor == null) {
+            prefForegroundColor = ColorConstants.getTableForegroundColor();
+            if (prefForegroundColor == null) {
+                prefForegroundColor = table.getDisplay().getSystemColor(SWT.COLOR_BLACK);
+            }
+        }
+        setBackgroundColor(prefBackgroundColor);
+        setForegroundColor(prefForegroundColor);
 
         if (useCustomItemColoring) {
             setUseCustomItemColoring(true);

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

@@ -12,9 +12,14 @@
 // ============================================================================
 package org.talend.commons.ui.runtime.utils;
 
+import org.eclipse.jface.resource.ColorRegistry;
+import org.eclipse.jface.resource.DataFormatException;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.StringConverter;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Device;
+import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Display;
 
 /**
@@ -102,4 +107,16 @@ public class TalendColorPalette {
     public static final java.awt.Color TERTIARY_ORANGE_AWT = new java.awt.Color(244, 175, 128);
 
     public static final java.awt.Color TERTIARY_YELLOW_AWT = new java.awt.Color(255, 217, 143);
+
+    public static Color convertToColor(String rgbStr) throws DataFormatException {
+        ColorRegistry colorRegistry = JFaceResources.getColorRegistry();
+        Color color = colorRegistry.get(rgbStr);
+        if (color != null) {
+            return color;
+        }
+        RGB rgb = StringConverter.asRGB(rgbStr);
+        colorRegistry.put(rgbStr, rgb);
+        return colorRegistry.get(rgbStr);
+    }
+
 }

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

@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Enumeration;
 import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
 
 import org.apache.tools.zip.ZipEntry;
@@ -169,8 +170,52 @@ public class ZipFileUtils {
             inputStream.close();
         }
     }
+    
+    public static void unZipFileEntry(File destFile, java.util.zip.ZipFile zipFile, java.util.zip.ZipEntry entry) throws IOException {
+        InputStream inputStream;
+        FileOutputStream fileOut;
+        if (entry.isDirectory()) {
+            destFile.mkdirs();
+        } else {
+            File parent = destFile.getParentFile();
+            if (parent != null && !parent.exists()) {
+                parent.mkdirs();
+            }
+
+            inputStream = zipFile.getInputStream(entry);
+
+            fileOut = new FileOutputStream(destFile);
+            byte[] buf = new byte[bufSize];
+            int readedBytes;
+            while ((readedBytes = inputStream.read(buf)) > 0) {
+                fileOut.write(buf, 0, readedBytes);
+            }
+            fileOut.close();
+
+            inputStream.close();
+        }
+    }
 
     public void setBufSize(int bufSize) {
         ZipFileUtils.bufSize = bufSize;
     }
+    
+    public static boolean isValidJarFile(String moduleFilePath) {
+        if (moduleFilePath == null) {
+            return false;
+        }
+
+        if (!new File(moduleFilePath).exists()) {
+            return false;
+        }
+
+        try (JarFile zip = new JarFile(moduleFilePath)) {
+            zip.getManifest();
+        } catch (IOException e) {
+            return false;
+        }
+
+        return true;
+    }
+
 }

main/plugins/org.talend.commons.runtime/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Runtime Plug-in
 Bundle-SymbolicName: org.talend.commons.runtime;singleton:=true
-Bundle-Version: 8.0.1.qualifier
+Bundle-Version: 8.8.8.qualifier
 Require-Bundle: org.apache.log4j;visibility:=reexport,
  org.apache.commons.commons-beanutils,
  org.apache.commons.collections,

main/plugins/org.talend.commons.runtime/modes/tsql.xml

@@ -283,6 +283,7 @@
 			<KEYWORD1>smallint</KEYWORD1>
 			<KEYWORD1>smallmoney</KEYWORD1>
 			<KEYWORD1>text</KEYWORD1>
+			<KEYWORD1>TIME</KEYWORD1>
 			<KEYWORD1>timestamp</KEYWORD1>
 			<KEYWORD1>tinyint</KEYWORD1>
 			<KEYWORD1>uniqueidentifier</KEYWORD1>

main/plugins/org.talend.commons.runtime/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.runtime</artifactId>

main/plugins/org.talend.commons.runtime/pom_server.xml

@@ -95,10 +95,9 @@
             <version>2.12.0</version>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
-            <type>bundle</type>
+            <groupId>ch.qos.reload4j</groupId>
+            <artifactId>reload4j</artifactId>
+            <version>1.2.22</version>
         </dependency>
     </dependencies>
 

main/plugins/org.talend.commons.runtime/src/org/talend/commons/CommonsPlugin.java

@@ -58,10 +58,14 @@ public class CommonsPlugin implements BundleActivator {
     // TESB-17856: For commandline builds ESB Micorservice bundle
     private static boolean isESBMicorservice = false;
 
+    private static Boolean isJunitWorking;
+
     private static Boolean isDevMode = null;
 
     private static ServiceTracker proxyTracker;
 
+    private static Boolean isDebugP2 = null;
+
     public static boolean isWorkbenchCreated() {
         return isWorkbenchCreated;
     }
@@ -124,6 +128,17 @@ public class CommonsPlugin implements BundleActivator {
         }
     }
 
+    public static boolean isDebugP2() {
+        try {
+            if (isDebugP2 == null) {
+                isDebugP2 = Boolean.getBoolean("talend.studio.lite.p2.debug");
+            }
+            return isDebugP2;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
     public static boolean isDebugMode() {
         return Boolean.getBoolean("talendDebug") //$NON-NLS-1$
                 || ArrayUtils.contains(Platform.getApplicationArgs(), TalendDebugHandler.TALEND_DEBUG);
@@ -137,6 +152,35 @@ public class CommonsPlugin implements BundleActivator {
         return "org.talend.rcp.branding.tuj.product".equals(Platform.getProduct().getId()); //$NON-NLS-1$
     }
 
+    public static boolean isJunitWorking() {
+        if (isJunitWorking == null) {
+            try {
+                String[] args = Platform.getCommandLineArgs();
+                String applicationId = null;
+
+                for (int i = 0; i < args.length - 1; i++) {
+                    if (args[i].equalsIgnoreCase("-application")) { //$NON-NLS-1$
+                        applicationId = args[i + 1];
+                    }
+                }
+
+                if (applicationId != null
+                        && (applicationId.equals("org.eclipse.swtbot.eclipse.junit.headless.swtbottestapplication") //$NON-NLS-1$
+                                || applicationId.equals("org.eclipse.pde.junit.runtime.uitestapplication"))) { //$NON-NLS-1$
+                    isJunitWorking = true;
+                } else {
+                    isJunitWorking = false;
+                }
+            } catch (Throwable e) {
+                isJunitWorking = false;
+            }
+        }
+        if (isJunitWorking == null) {
+            isJunitWorking = false;
+        }
+        return isJunitWorking;
+    }
+
     /**
      * Answer the file associated with name. This handles the case of running as a plugin and running standalone which
      * happens during testing.

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);
@@ -52,6 +64,10 @@ public final class CommonExceptionHandler {
         log.log(Level.WARN, message);
     }
 
+    public static void error(String message) {
+        log.log(Level.ERROR, message);
+    }
+
     /**
      * Return priority corresponding to the exception implementation.
      *

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

@@ -38,6 +38,12 @@ public class ExceptionHandler {
         CommonExceptionHandler.log(message);
     }
 
+    public static void logDebug(String message) {
+        if (CommonsPlugin.isDebugMode() || CommonsPlugin.isDevMode()) {
+            CommonExceptionHandler.log(message);
+        }
+    }
+    
     public static void process(Throwable ex, Priority priority) {
         CommonExceptionHandler.process(ex, priority);
 

main/plugins/org.talend.commons.runtime/src/org/talend/commons/i18n/internal/messages_en.properties

@@ -1,60 +0,0 @@
-DatabaseContentRetriever.PRODUCTNAME=Database Product Name:
-DatabaseContentRetriever.PRODUCTVERSION=Database Product Version:
-DB2ForZosResultSet.outofRange=\ is out of range.
-DB2ForZosResultSet.parameterIndex=Invalid argument\: parameter index
-DB2ForZosResultSet.unknowCloumn=Invalid argument\: unknown column name
-SybaseResultSet.outofRange=\ is out of range.
-SybaseResultSet.parameterIndex=Invalid argument\: parameter index
-SybaseResultSet.unknowCloumn=Invalid argument\: unknown column name
-AbstractFakeResultSet.unknowCloumn=Invalid argument\: {0} is unknown column name
-AbstractFakeResultSet.parameterIndexOutOfRange=Invalid argument\: parameter index {0} is out of range
-EntryLocation.returnTableName={tableName={0}, columnName={1}}
-ExceptionHandler.Parameter.BeNull=ex param cannot be null
-ExtensionImplementationProviders.ExtensionPointError=Extension point must authorize a single instance
-ListenableList.IndexSameLength.Error=indexOrigin and indexDestination must have same length
-ReflectionPropertyException.Access.ErrorMsg3=Error when trying to access to the {0} of the property ' of the property '{1}' of the class '{2}'
-ResourceUtils.canMove1=Can move
-ResourceUtils.canMove2=Can move {0} -> {1}
-ResourceUtils.cannotMoveRule3=Cannot move {0} -> {1} (Rule 3-Descendant)
-ResourceUtils.cnanotMoveRule1=Cannot move {0} -> {1} (Rule 1-Test if source & target are differents)
-ResourceUtils.go=\ ->
-ResourceUtils.streamNull=stream is null
-ReusableMultiKey.Keys.BeNull=The array of keys must not be null
-StringUtils.IllegalArgument0=only support the \\uxxxx or \\xhh encoding.
-StringUtils.IllegalArgument1=Malformed \\uxxxx encoding.
-StringUtils.IllegalArgument2=Malformed \\uxxxx encoding.
-StringUtils.IllegalArgument3=Malformed \\0xxx encoding.
-VersionUtils.Version.Error2=Malformed string {0} (expecting M{1}m)
-FilesUtils.operationCanceled=Operation is canceled during copying folders or files.
-resources.file.notCreated=File "{0}" cannot be created ({1})
-resources.file.notDeleted=File "{0}" cannot be deleted
-resources.file.notGet=Required file "{0}" not found in folder "{1}"
-resources.fileContent.notGet=Content of file "{0}" cannot be retrieve
-resources.folder.notCreated=Folder "{0}" cannot be created
-resources.folder.notDeleted=Folder "{0}" cannot be deleted
-resources.folder.notEmptied=Folder "{0}" cannot be emptied
-resources.folder.notGet=Required folder "{0}" not found in project "{1}"
-resources.members.notGet=Members of container "{0}" cannot be retrieve
-resources.project.notGet=Required project "{0}" not found
-resources.resource.notMoved=Resource "{0}" cannot be moved to "{1}"
-utils.data.container=Id {0} already used in container
-utils.workbench.extensions.badNumberOfExtension=Bad number of extensions found on {0}. Expecting between {1} and {2} but found {3}.
-utils.workbench.extensions.noExtension=No plug-in extending extension point ID "{0}" can be found.
-XmlNodeRetriever.countResult=Count result \:
-XmlNodeRetriever.field2Node=field2Node=
-XmlNodeRetriever.filed1Node=field1Node=
-XmlNodeRetriever.mainExpression=main expression =
-XmlNodeRetriever.mainNode=mainNode=
-XmlNodeRetriever.proposal2Node=proposal2Nodes \:
-XmlNodeRetriever.prposal1Node=proposal1Nodes \:
-XmlNodeRetriever.singleQuotes='
-XmlNodeRetriever.xPathExpression=xPathExpression = '
-VersionUtils.readPropertyFileError=Error to read property in talend.properties file.
-SoftwareSystemManager.NULL_CONN_INSTANCE=null connection instance.
-SoftwareSystemManager.NULL_INSTANCE_SOFTWARE_SYS=null software system instance.
-AS400ResultSet.unknowCloumn=Invalid argument\: unknown column name
-AS400ResultSet.parameterIndex=Invalid argument\: parameter index
-AS400ResultSet.outofRange=\ is out of range.
-ITaCoKitService.exception.multipleInstance=More than one instance found: {0}
-TalendProxySelector.exception.badUriMap=Bad uri map: {0}
-TalendProxySelector.exception.proxySelectionError=Error occurs when selecting proxy for {0}

main/plugins/org.talend.commons.runtime/src/org/talend/commons/i18n/internal/messages_ja.properties

@@ -11,7 +11,7 @@ SybaseResultSet.unknowCloumn=\u7121\u52B9\u306A\u5F15\u6570: \u30AB\u30E9\u30E0\
 AbstractFakeResultSet.unknowCloumn=\u7121\u52B9\u306A\u5F15\u6570: {0}\u304C\u4E0D\u660E\u306A\u30AB\u30E9\u30E0\u540D
 AbstractFakeResultSet.parameterIndexOutOfRange=\u7121\u52B9\u306A\u5F15\u6570: \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9{0}\u304C\u7BC4\u56F2\u5916
 EntryLocation.returnTableName={tableName={0}, \u30AB\u30E9\u30E0\u540D={1}}
-ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u51FA\u6765\u307E\u305B\u3093
+ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093
 ExtensionImplementationProviders.ExtensionPointError=\u62E1\u5F35\u30DD\u30A4\u30F3\u30C8\u306F1\u3064\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u8A8D\u8A3C\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 ListenableList.IndexSameLength.Error=indexOrigin\u3068indexDestination\u304C\u540C\u3058\u9577\u3055\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 ReflectionPropertyException.Access.ErrorMsg3=\u30AF\u30E9\u30B9'{2}'\u306E\u30D7\u30ED\u30D1\u30C6\u30A3'{1}'\u306E{0}\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F

main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/model/emf/CustomXMIResource.java

@@ -0,0 +1,85 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2023 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.runtime.model.emf;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.StringJoiner;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.xmi.XMLHelper;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.ecore.xmi.XMLSave;
+import org.eclipse.emf.ecore.xmi.impl.XMISaveImpl;
+import org.eclipse.emf.ecore.xmi.impl.XMLString;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class CustomXMIResource extends TalendXMIResource {
+
+    public static final String ENCODING = "UTF-8"; //$NON-NLS-1$
+
+    CustomXMISave xmiSave;
+
+    public CustomXMIResource() {
+        super();
+    }
+
+    public CustomXMIResource(URI uri) {
+        super(uri);
+    }
+
+    @Override
+    protected void init() {
+        super.init();
+        encoding = ENCODING;
+    }
+
+    @Override
+    protected XMLSave createXMLSave() {
+        xmiSave = new CustomXMISave(createXMLHelper());
+        return xmiSave;
+    }
+
+    public String getResourceContent(Map<?, ?> options) {
+        if (xmiSave == null) {
+            createXMLSave();
+        }
+        return xmiSave.getXMLContent(this, options);
+    }
+
+}
+
+class CustomXMISave extends XMISaveImpl {
+
+    public CustomXMISave(XMLHelper helper) {
+        super(helper);
+    }
+
+    public String getXMLContent(XMLResource resource, Map<?, ?> options) {
+        StringJoiner strJoin = new StringJoiner("");
+        super.init(resource, options);
+        super.traverse(resource.getContents());
+        XMLString xmlString = this.doc;
+        Iterator<String> iterator = xmlString.stringIterator();
+        while (iterator.hasNext()) {
+            String string = (String) iterator.next();
+            if (string != null) {
+                strJoin.add(string);
+            }
+        }
+        return strJoin.toString();
+    }
+
+}

main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/model/emf/EmfHelper.java

@@ -16,6 +16,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -263,4 +264,12 @@ public class EmfHelper {
         return result;
     }
 
+    public static String getEmfModelContent(EObject model) throws Exception {
+        String content = "";
+        CustomXMIResource xmiResource = new CustomXMIResource();
+        xmiResource.getContents().add(model);
+        content = xmiResource.getResourceContent(Collections.EMPTY_MAP);
+        return content;
+    }
+
 }

main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/service/ITaCoKitService.java

@@ -46,6 +46,12 @@ public interface ITaCoKitService {
 
     boolean isTaCoKitType(Object repoType);
 
+    Object getDatastoreFromDataset(Object repositoryViewObject);
+
+    String getParentItemIdFromItem(Object Item);
+
+    boolean isValueSelectionParameter(Object parameter);
+
     public static ITaCoKitService getInstance() {
         BundleContext bc = FrameworkUtil.getBundle(ITaCoKitService.class).getBundleContext();
         Collection<ServiceReference<ITaCoKitService>> tacokitServices = Collections.emptyList();

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/VersionUtils.java

@@ -36,6 +36,7 @@ import org.osgi.framework.FrameworkUtil;
 import org.talend.commons.CommonsPlugin;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.i18n.internal.Messages;
+import org.talend.utils.format.PresentableBox;
 
 /**
  * Represents a version. Contents a major and a minor version.<br/>
@@ -367,10 +368,14 @@ public class VersionUtils {
     }
 
     public static String getDisplayPatchVersion(String patchName) {
-        if (Integer.parseInt(StringUtils.substringAfterLast(patchName, "v")) > 1) { //$NON-NLS-1$
+        try {
+            if (Integer.parseInt(StringUtils.substringAfterLast(patchName, "v")) > 1) { //$NON-NLS-1$
+                return patchName;
+            }
+            return StringUtils.substringBefore(patchName, "v"); //$NON-NLS-1$
+        } catch (NumberFormatException e) {
             return patchName;
         }
-        return StringUtils.substringBefore(patchName, "v"); //$NON-NLS-1$
     }
 
     public static void clearCache() {
@@ -405,5 +410,15 @@ public class VersionUtils {
         }
         return null;
     }
+    
+    public static String getProductVersionLog() {
+            Object version = getDisplayVersion();
+            String mess = "Starting Talend's platform log system."; //$NON-NLS-1$
+            if (version != null) {
+                mess += ("VERSION= " + version); //$NON-NLS-1$
+            }
+            PresentableBox box = new PresentableBox("TALEND", mess, 0); //$NON-NLS-1$
+            return box.getFullBox();
+    }
 
 }

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/DB2ForZosDataBaseMetadata.java

@@ -145,7 +145,30 @@ public class DB2ForZosDataBaseMetadata extends PackageFakeDatabaseMetadata {
      */
     @Override
     public ResultSet getPrimaryKeys(String catalog, String schema, String table) throws SQLException {
-        return new DB2ForZosResultSet();
+        ResultSet rs = super.getPrimaryKeys(catalog, schema, table);
+        if (rs == null) {
+            rs = new DB2ForZosResultSet();
+        }
+        return rs;
+    }
+    
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.talend.commons.utils.database.FakeDatabaseMetaData#getExportedKeys(java.lang.String, java.lang.String,
+     * java.lang.String)
+     */
+    @Override
+    public ResultSet getExportedKeys(String catalog, String schema, String table) throws SQLException {
+        ResultSet rs = super.getExportedKeys(catalog, schema, table);
+        if (rs == null) {
+            if (this.metaData != null) {
+                rs = this.metaData.getExportedKeys(catalog, schema, table);
+            } else {
+                rs = new DB2ForZosResultSet();
+            }
+        }
+        return rs;
     }
 
     /*
@@ -174,17 +197,6 @@ public class DB2ForZosDataBaseMetadata extends PackageFakeDatabaseMetadata {
         return tableResultSet;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.talend.commons.utils.database.FakeDatabaseMetaData#getExportedKeys(java.lang.String, java.lang.String,
-     * java.lang.String)
-     */
-    @Override
-    public ResultSet getExportedKeys(String catalog, String schema, String table) throws SQLException {
-        return new DB2ForZosResultSet();
-    }
-
     /*
      * (non-Javadoc)
      *

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;
 
@@ -50,13 +51,16 @@ public class NetworkUtil {
 
     private static final String TALEND_DISABLE_INTERNET = "talend.disable.internet";//$NON-NLS-1$
 
-    private static final String HTTP_NETWORK_URL = "https://talend-update.talend.com";
-
     private static final int DEFAULT_TIMEOUT = 4000;
 
     private static final int DEFAULT_NEXUS_TIMEOUT = 20000;// same as preference value
 
     public static final String ORG_TALEND_DESIGNER_CORE = "org.talend.designer.core"; //$NON-NLS-1$
+    
+    /*
+     * see ITalendCorePrefConstants.PERFORMANCE_TAC_READ_TIMEOUT
+     */
+    private static final String PERFORMANCE_TAC_READ_TIMEOUT = "PERFORMANCE_TAC_READ_TIMEOUT"; //$NON-NLS-1$
 
     private static final String PROP_DISABLEDSCHEMES_USE_DEFAULT = "talend.studio.jdk.http.auth.tunneling.disabledSchemes.useDefault";
 
@@ -89,7 +93,7 @@ public class NetworkUtil {
         }
         HttpURLConnection conn = null;
         try {
-            URL url = new URL(HTTP_NETWORK_URL);
+            URL url = new URL(getCheckUrl());
             conn = (HttpURLConnection) url.openConnection();
             conn.setDefaultUseCaches(false);
             conn.setUseCaches(false);
@@ -105,6 +109,7 @@ public class NetworkUtil {
                 return true;
             }
         } catch (Exception e) {
+            CommonExceptionHandler.process(e, getCheckUrl());
             return false;
         } finally {
             conn.disconnect();
@@ -112,6 +117,15 @@ public class NetworkUtil {
         return true;
     }
 
+    private static String getCheckUrl() {
+        String customUrl = System.getProperty("talend.studio.network.checkUrlPath");
+        if (StringUtils.isNotBlank(customUrl)) {
+            return customUrl;
+        } else {
+            return "https://talend-update.talend.com/nexus/content/groups/studio-libraries/";
+        }
+    }
+
     public static boolean isNetworkValid(String url, Integer timeout) {
         if (url == null) {
             return isNetworkValid(timeout);
@@ -132,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;
@@ -142,10 +157,10 @@ public class NetworkUtil {
     }
 
     public static int getNexusTimeout() {
-        int timeout = DEFAULT_NEXUS_TIMEOUT;
+        int timeout = Integer.getInteger("nexus.timeout.min", DEFAULT_NEXUS_TIMEOUT);
         try {
             IEclipsePreferences node = InstanceScope.INSTANCE.getNode(ORG_TALEND_DESIGNER_CORE);
-            timeout = node.getInt(ITalendNexusPrefConstants.NEXUS_TIMEOUT, DEFAULT_NEXUS_TIMEOUT);
+            timeout = Math.max(timeout, node.getInt(PERFORMANCE_TAC_READ_TIMEOUT, 0) * 1000);
         } catch (Throwable e) {
             ExceptionHandler.process(e);
         }

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

@@ -139,11 +139,16 @@ public class TalendProxySelector extends ProxySelector {
     private boolean updateSystemPropertiesForJre = true;
 
     private boolean excludeLoopbackAddressAutomatically = false;
-    
+
     private ProxySelector getStardardJreProxySelector() {
+        if (this.jreDefaultSelector != null) {
+            return this.jreDefaultSelector;
+        }
         Object o = System.getProperties().get(SYS_JRE_PROXY_SELECTOR);
         if (o != null && o instanceof ProxySelector) {
-            return (ProxySelector) o;
+            this.jreDefaultSelector = (ProxySelector) o;
+            System.getProperties().remove(SYS_JRE_PROXY_SELECTOR);
+            return this.jreDefaultSelector;
         }
         return getDefault();
     }

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/system/EclipseCommandLine.java

@@ -21,10 +21,29 @@
 // ============================================================================
 package org.talend.commons.utils.system;
 
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.osgi.service.datalocation.Location;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Filter;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.util.tracker.ServiceTracker;
+import org.talend.commons.exception.ExceptionHandler;
 
 /**
  * Creates and updates properties for the eclipse commandline in case of relaunch <br/>
@@ -41,6 +60,8 @@ public class EclipseCommandLine {
     static final String PROP_COMMANDS = "eclipse.commands"; //$NON-NLS-1$
 
     static final String CMD_VMARGS = "-vmargs"; //$NON-NLS-1$
+    
+    static final String CMD_VM = "-vm"; //$NON-NLS-1$
 
     static final String NEW_LINE = "\n"; //$NON-NLS-1$
 
@@ -67,13 +88,17 @@ public class EclipseCommandLine {
     static public final String TALEND_CONTINUE_LOGON = "-talendContinueLogon";
 
     static public final String TALEND_CONTINUE_UPDATE = "-talendContinueUpdate";
+    
+    static public final String TALEND_CLEAN_M2 = "-talendCleanM2";
 
     static public final String TALEND_CLEAN_UNINSTALLED_BUNDLES = "-talendCleanUninstalledBundles";
 
     static public final String PROP_KEY_PROFILE_ID = "eclipse.p2.profile";
 
     static public final String ARG_BRANCH = "-branch";
-
+    
+    static public final String ARG_PROJECT = "-project";
+    
     static public final String LOGIN_ONLINE_UPDATE = "--loginOnlineUpdate";
 
     static public final String ARG_TALEND_BUNDLES_CLEANED = "-talend.studio.bundles.cleaned"; //$NON-NLS-1$
@@ -106,6 +131,21 @@ public class EclipseCommandLine {
      * later.
      */
     static public final String TALEND_SHOW_JOB_TYPE_COMMAND = "--showJobType"; //$NON-NLS-1$
+    
+    private static final String HEX_STRING = "0123456789ABCDEF";
+    
+    public static final String SCHEME_FILE = "file"; //$NON-NLS-1$
+
+    private static final String UNC_PREFIX = "//"; //$NON-NLS-1$
+    
+    static private final Set<String> TALEND_ARGS = new HashSet<String>();
+    
+    static {
+        TALEND_ARGS.add(TALEND_CLEAN_UNINSTALLED_BUNDLES);
+        TALEND_ARGS.add(ARG_TALEND_BUNDLES_CLEANED);
+        TALEND_ARGS.add(PROP_TALEND_BUNDLES_DO_CLEAN);
+        TALEND_ARGS.add(TALEND_RELOAD_COMMAND);
+    }
 
     static public void updateOrCreateExitDataPropertyWithCommand(String command, String value, boolean delete) {
         updateOrCreateExitDataPropertyWithCommand(command, value, delete, false);
@@ -115,6 +155,16 @@ public class EclipseCommandLine {
         if (argName == null || argName.trim().isEmpty()) {
             return null;
         }
+
+        try {
+            if (isWindows() && TALEND_ARGS.contains(argName) && !isPoweredByTalend()) {
+                ExceptionHandler.logDebug("argName: " + argName + ", sysProp: " + argName + ", value: " + System.getProperty(argName));
+                Properties p = loadConfigIni();
+                return p.getProperty(argName);
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
         String[] commandLineArgs = Platform.getCommandLineArgs();
         if (commandLineArgs == null || commandLineArgs.length <= 0) {
             return null;
@@ -128,6 +178,152 @@ public class EclipseCommandLine {
         return null;
     }
 
+    private static boolean isPoweredByTalend() {
+        return !Platform.getProduct().getId().equals("org.talend.rcp.branding.jetl.product") && !Platform.getProduct().getId().equals("org.talend.rcp.branding.jetl.bigdata.product");
+    }
+    
+    private static boolean isWindows() {
+        return EnvironmentUtils.isWindowsSystem();
+    }
+    
+    private static void updateConfigIni(String command, String value, boolean delete) {
+        Properties p = loadConfigIni();
+
+        if (delete) {
+            p.remove(command);
+        } else {
+            p.put(command, value);
+        }
+        try {
+            File f = getConfigFile();
+            try (FileOutputStream fos = new FileOutputStream(f)) {
+                p.store(fos, "updated " + command);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+    
+    private static Properties loadConfigIni() {
+        Properties p = new Properties();
+        try {
+            File f = getConfigFile();
+            try (FileInputStream fis = new FileInputStream(f)) {
+                p.load(fis);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return p;
+    }
+    
+    private static String decode(String bytes) {
+        if (bytes == null) {
+            return null;
+        }
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(bytes.length() / 2);
+        for (int i = 0; i < bytes.length(); i += 2) {
+            baos.write((HEX_STRING.indexOf(bytes.charAt(i)) << 4 | HEX_STRING.indexOf(bytes.charAt(i + 1))));
+        }
+        return new String(baos.toByteArray());
+    }
+    
+    private static File getConfigFile() throws URISyntaxException {
+        // configuration/config.ini
+        File iniFile = new File(getConfigurationFolder(), decode("636F6E6669672E696E69")); //$NON-NLS-1$
+
+        return iniFile;
+    }
+
+    private static Location getConfigLocation(BundleContext context) {
+        Filter filter = null;
+        try {
+            filter = context.createFilter(Location.CONFIGURATION_FILTER);
+        } catch (InvalidSyntaxException e) {
+            // should not happen
+        }
+        ServiceTracker configLocationTracker = new ServiceTracker(context, filter, null);
+        configLocationTracker.open();
+        try {
+            return (Location) configLocationTracker.getService();
+        } finally {
+            configLocationTracker.close();
+        }
+    }
+    
+    /**
+     * Returns the URL as a URI. This method will handle broken URLs that are not properly encoded (for example they
+     * contain unencoded space characters).
+     */
+    private static URI toURI(URL url) throws URISyntaxException {
+        // URL behaves differently across platforms so for file: URLs we parse from string form
+        if (SCHEME_FILE.equals(url.getProtocol())) {
+            String pathString = url.toExternalForm().substring(5);
+            // ensure there is a leading slash to handle common malformed URLs such as file:c:/tmp
+            if (pathString.indexOf('/') != 0)
+                pathString = '/' + pathString;
+            else if (pathString.startsWith(UNC_PREFIX) && !pathString.startsWith(UNC_PREFIX, 2)) {
+                // URL encodes UNC path with two slashes, but URI uses four (see bug 207103)
+                pathString = UNC_PREFIX + pathString;
+            }
+            return new URI(SCHEME_FILE, null, pathString, null);
+        }
+        try {
+            return new URI(url.toExternalForm());
+        } catch (URISyntaxException e) {
+            // try multi-argument URI constructor to perform encoding
+            return new URI(url.getProtocol(), url.getUserInfo(), url.getHost(), url.getPort(), url.getPath(), url.getQuery(),
+                    url.getRef());
+        }
+    }
+
+    private static File toFile(URI uri) {
+        try {
+            if (!SCHEME_FILE.equalsIgnoreCase(uri.getScheme()))
+                return null;
+            // assume all illegal characters have been properly encoded, so use URI class to unencode
+            return new File(uri);
+        } catch (IllegalArgumentException e) {
+            // File constructor does not support non-hierarchical URI
+            String path = uri.getPath();
+            // path is null for non-hierarchical URI such as file:c:/tmp
+            if (path == null)
+                path = uri.getSchemeSpecificPart();
+            return new File(path);
+        }
+    }
+    
+    private static File getConfigurationFolder() {
+        BundleContext configuratorBundleContext = getCurrentBundleContext();
+        final URL url = getConfigLocation(configuratorBundleContext).getURL();
+        try {
+            return toFile(toURI(url));
+        } catch (URISyntaxException e) {
+            //
+        }
+        return null;
+    }
+    
+ // always return a valid bundlesContext or throw a runtimeException
+    private static BundleContext getCurrentBundleContext() {
+        Bundle bundle = FrameworkUtil.getBundle(EclipseCommandLine.class);
+        if (bundle != null) {
+            BundleContext bundleContext = bundle.getBundleContext();
+            if (bundleContext != null) {
+                return bundleContext;
+            } else {
+                throw new RuntimeException(
+                        "could not find current BundleContext, this should never happen, check that the bunlde is activated when this class is accessed");
+            }
+        } else {
+            throw new RuntimeException(
+                    "could not find current Bundle, this should never happen, check that the bunlde is activated when this class is accessed");
+        }
+    }
+    
     /**
      * this creates or updates the org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY by adding or changing
      * the command with value, except if value is null then the command shall be removed.
@@ -138,6 +334,17 @@ public class EclipseCommandLine {
      * @param isOption this flag used to trigger for the option command without any arguments.
      */
     static public void updateOrCreateExitDataPropertyWithCommand(String command, String value, boolean delete, boolean isOption) {
+        try {
+            if (isWindows() && TALEND_ARGS.contains(command) && !isPoweredByTalend()) {
+                ExceptionHandler.logDebug("command: " + command + ", prop: " + command + ", value: " + value + ", delete: " + delete);
+                updateConfigIni(command, value, delete);
+                return;
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+       
+        
         boolean isValueNull = false;
         if (value == null || "".equals(value)) { //$NON-NLS-1$
             isValueNull = true;
@@ -191,9 +398,9 @@ public class EclipseCommandLine {
                                 + (isValueNull ? "" : value + EclipseCommandLine.NEW_LINE)
                                 + currentProperty.substring(indexOfVmArgs);
                     } else {// vmargs command not found so don't know where to set it to throw Exception
-                        throw new IllegalArgumentException("the property :"
-                                + org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY + "must constain "
-                                + EclipseCommandLine.CMD_VMARGS);
+                        currentProperty = currentProperty + command + EclipseCommandLine.NEW_LINE
+                                + (isValueNull ? "" : value + EclipseCommandLine.NEW_LINE);
+//                        throw new IllegalArgumentException("the property :" + org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY + "must constain " + EclipseCommandLine.CMD_VMARGS);
                     }
                 }
             }
@@ -262,6 +469,44 @@ public class EclipseCommandLine {
                 result.append(vmargs);
             }
         }
-        System.setProperty(org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY, result.toString());
+        
+        String exitData = result.toString();
+        
+        ExceptionHandler.logDebug("exitData before duplicated: " + exitData);
+        
+        if (isWindows() && !isPoweredByTalend()) {
+            exitData = removeDuplicated(result).toString();
+        }
+        ExceptionHandler.logDebug("exitData: " + exitData);
+        System.setProperty(org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY, exitData);
+        
+    }
+    
+    private static StringBuilder removeDuplicated(StringBuffer sb) {
+        StringBuilder ret = new StringBuilder();
+        StringTokenizer t = new StringTokenizer(sb.toString(), EclipseCommandLine.NEW_LINE);
+        while (t.hasMoreElements()) {
+            String ele = (String) t.nextElement();
+            boolean add = true;
+            if (ele.equals("-launcher")) {
+                if (ret.indexOf(ele) > 0) {
+                    // dump value of launcher
+                    t.nextElement();
+                    add = false;
+                }
+            } else if (ele.equals(EclipseCommandLine.CMD_VMARGS)) {
+                add = false;
+                break;
+            }
+
+            if (add) {
+                ret.append(ele);
+                ret.append(EclipseCommandLine.NEW_LINE);
+            }
+
+        }
+        
+        return ret;
+
     }
 }

main/plugins/org.talend.commons.runtime/talend.properties

@@ -1 +1 @@
-talend.version=8.0.1
+talend.version=8.8.8

main/plugins/org.talend.commons.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common UI Plug-in
 Bundle-SymbolicName: org.talend.commons.ui;singleton:=true
-Bundle-Version: 8.0.1.qualifier
+Bundle-Version: 8.8.8.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.jface.text,

main/plugins/org.talend.commons.ui/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.ui</artifactId>

main/plugins/org.talend.commons.ui/src/main/java/messages_en.properties

@@ -1,137 +0,0 @@
-commons.error=Error
-TableViewerCreator.TableColumn.AssertMsg=The TableColumn of TableEditorColumn with idProperty '{0}' has not the correct Table parent
-ColorStyledText.PasteItem.Text=Paste
-EventUtil.UnknowDetail=unkown ??? value of event detail : 
-ImportPushButtonForExtendedTable.ErrorMsg.Text=Error occurred
-ResetDBTypesButton.ResetDBTypesButton.Tip=Reset DB Types
-ExportPushButtonForExtendedTable.ErrorMsg.Text=Error occurred
-TableViewerCreator.IdProperty.AssertMsg=You must change the idProperty of one of your column, the idProperty must be unique for each column for one Table.
-TableViewerCreator.CallMethod.ErrorMsg=You can call this method only if you have already called createTable()
-ModelSelectionDialog.BuiltIn=Change to built-in property.
-ExtendedTablePasteCommand.Paste.Label=Paste data from the internal clipoard
-SelectContextVariablesPushButton.Label=Select context variables
-ExtendedTableModel.ModifiedObject.Error=ModifiedBeanListenable object must be set before use this method
-ImportPushButton.ImportButton.Tip=Replace all rows by import from xml file
-LabelledFileField.FileDialog.Text=Select a
-ModelSelectionDialog.Option=option
-ModelSelectionDialog.Update=Update repository connection.
-TableViewerCreator.Table.BeNull=table is null
-ModelSelectionDialog.Title=Edit parameter using repository
-AddAllPushButton.AddAllButton.Tip=Add All
-ExtendedTableRemoveCommand.Romve.Label=Remove table entries
-AddPushButton.AddButton.Tip=Add
-MoveDownPushButton.MoveDownTip=Move down selected items
-ExtendedTableCopyCommand.Copy.Label=Copy one or more table entries in the internal clipboard
-ProposalUtils.CtrlProposal.ErrorMsg=Proposal for this type of Control is unsupported : 
-AccessorUtils.isReq= is required for the bean (<B>).
-EventUtil.UnknowType=unkown ??? value of event type : 
-ProposalUtils.CellProposal.Error=Proposal of this type of CellEditor is unsupported: 
-RemovePushButton.RemoveButton.Tip=Remove selected items
-FileStep2.previewFailure=Preview error. Some settings must be changed.\nNote: Preview errors are generally due to a wrong encoding setting. 
-PastePushButton.PasteButton.Label=Paste
-ModelSelectionDialog.ViewSchema=View schema (read only).
-LabelledFileField.BrowseButton.Text=Browse...
-ModelSelectionDialog.ViewQuery=View query (read only).
-MoveUpPushButton.MoveUpButton.Tip=Move up selected items
-AccessorUtils.Assert1=The 'BeanPropertyAccessors' of the column (with title '{0}' and id '{1}') is not configured correctly or the value set has not the correct type.
-exception.errorOccured=An error occured ({0}).\nSee log for more details.
-ColorStyledText.CopyItem.Text=Copy
-AccessorUtils.Assert0=The 'BeanPropertyAccessors' of the column (with title '{0}' and id '{1}') is not configured correctly.  {2} is required for bean <B>
-ExtendedTableMoveCommand.MoveLabel=Move up or down, one or more table entries
-CopyPushButton.CopyButton.Tip=Copy selected items
-ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=Reset all DB Types to get the defaults
-ExtendedTableAddCommand.Add.Label=Add one or more table entries
-ControlUtils.Unsupported1=This control ({0}) is not supported, add case if you want...
-AccessorUtils.isReqValue= is required for the value (<V>), but the value could be adapted with CellEditorValueAdapter.
-AccessorUtils.NoClassDef=NoClassDefFoundError ({0}):
-ErrorDialogWidthDetailArea.ErrorMessage.Text=Error Message
-ExceptionHandler.Parameter.BeNull=ex param cannot be null
-ModelSelectionDialog.Message=Please choose one option, or cancel.
-TreeToTablesLinker.Type.Unsupported=This type of currentControl is unsupported
-Mode.Mode.ToString=Mode [{0}]
-ModifyBeanValueCommand.ModifyCell.Label=Modify cell value
-ColorStyledText.SelectAllItem.Text=Select All
-DialogErrorForCellEditorListener.Error.MsgDialogTitle=Error
-ExportPushButton.ExportButton.Tip=Export all rows into XML file
-TableViewerCreator.CellModifier.ExError=The current CellModifier does'nt support this operation. \n Use '{0}' or a class which extends it to use this feature
-Curve2D.MinNum.Be0=minimumSegments be must positive or 0
-ModeReader.IgnoreElement=Ignore unknown element
-Curve2D.MaxNum.Be0=maximumSegments must be positive or 0
-CellEditorDialogBehavior.textContent=...
-CellEditorValueAdapterFactory.valueNotStringType=Bean value should be a class of String type \!
-ColorStyledText.RedoItem.Text=Redo
-ColorStyledText.UndoItem.Text=Undo
-ContentProposalAdapterExtended.close=close
-ContentProposalAdapterExtended.closeFocusout=close focusout
-DateDialog.textContent=Select Date & Time
-DefaultCellModifier.tableItemDispose=TableItem disposed
-ErrorDialogWithContinue.setParameter=Set parameters and continue
-EventUtil.activate=activate
-EventUtil.arm=arm
-EventUtil.close=close
-EventUtil.collapse=collapse
-EventUtil.deactivate=deactivate
-EventUtil.defaultSelection=default selection
-EventUtil.deiconify=deiconify
-EventUtil.detailNull=null
-EventUtil.dispose=dispose
-EventUtil.dragDetect=drag detect
-EventUtil.expand=expand
-EventUtil.focusIn=focus in
-EventUtil.focusOut=focus out
-EventUtil.hardKeyDown=hard key down
-EventUtil.hardKeyUp=hard key up
-EventUtil.help=help
-EventUtil.hide=hide
-EventUtil.iconify=iconify
-EventUtil.keyDown=key down
-EventUtil.keyUp=key up
-EventUtil.menuDetect=menu detect
-EventUtil.modify=modify
-EventUtil.mouseDoubleClick=mouse double click
-EventUtil.mouseDown=mouse down
-EventUtil.mouseEnter=mouse enter
-EventUtil.mouseExit=mouse exit
-EventUtil.mouseHover=mouse hover
-EventUtil.mouseMove=mouse move
-EventUtil.mouseUp=mouse up
-EventUtil.move=move
-EventUtil.paint=paint
-EventUtil.resize=resize
-EventUtil.selectedEqual=SELECTED
-EventUtil.selection=selection
-EventUtil.show=show
-EventUtil.traverse=traverse
-EventUtil.typeNull=null
-EventUtil.verify=verify
-ExceptionMessageDialog.log=log
-Rule.rule=Rule [{0}]
-SaveAsGenericSchemaPushButton.saveAsSchema=Save as generic schema
-SWTCalendarWithTime.contentEvening=Evening
-SWTCalendarWithTime.contentHr=Hr:
-SWTCalendarWithTime.contentMin=Min:
-SWTCalendarWithTime.contentMorning=Morning
-SWTCalendarWithTime.contentNoon=Noon
-SWTCalendarWithTime.contentNow=Now
-SWTCalendarWithTime.contnetSec=Sec:
-TableViewerCreator.columnNoIBeanProperty=The column '{0}' ('{1}') has a CellEditor set but does'nt have a IBeanPropertyAccessors \!
-TableViewerCreator.columnNullId=Column '{0}' has null id \!
-StateComposite.FLL_DB_INFOR=Fill DB Information
-StateComposite.HELP_MESSAGE=Help Messages
-StateComposite.MESSAGE1=It's possible to create dynamic jobs and set a file name or table name who depends on the input table.
-StateComposite.MESSAGE2=For this it just needs to use the text
-StateComposite.MESSAGE3=\ in the file name or table name.
-StateComposite.MESSAGE4=For example for one table:
-StateComposite.MESSAGE5=For example for one file:
-StateComposite.MESSAGE6=\ or maybe
-StateComposite.OUTPUT_SELECTION=Output Selection
-StateComposite.SEL_JOBNAME=Set Jobs Name
-StateComposite.STATE=State
-StateComposite.TABLE_SELECTION=Table Selection
-StateComposite.TEMPLATE_SELECTION=Template Selection
-ArchiveDirectoryChooser.WizardProjectsImportPage_RootSelectTitle=Select roo&t directory:
-ArchiveDirectoryChooser.DataTransfer_browse=B&rowse...
-ArchiveDirectoryChooser.WizardProjectsImportPage_ArchiveSelectTitle=Select &archive file:
-ArchiveDirectoryChooser.FileExport_selectDestinationMessage=Select a directory to export to.
-ArchiveDirectoryChooser.ArchiveExport_description=Export resources to an archive file on the local file system.
-DisplayUtils.NotSupportedExceptionOnLinux=Linux/Unit doesn't support multiple display.

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

@@ -63,16 +63,16 @@ EventUtil.typeNull=NULL
 EventUtil.UnknowDetail=\u30A4\u30D9\u30F3\u30C8\u8A73\u7D30\u306E\u4E0D\u660E\u306A???\u5024:
 EventUtil.UnknowType=\u30A4\u30D9\u30F3\u30C8\u30BF\u30A4\u30D7\u306E\u4E0D\u660E\u306A???\u5024:
 EventUtil.verify=\u78BA\u8A8D
-ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u51FA\u6765\u307E\u305B\u3093
+ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093
 ExceptionMessageDialog.log=\u30ED\u30B0
 ExportPushButton.ExportButton.Tip=\u3059\u3079\u3066\u306E\u884C\u3092XML\u30D5\u30A1\u30A4\u30EB\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
 ExportPushButtonForExtendedTable.ErrorMsg.Text=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-ExtendedTableAddCommand.Add.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30921\u3064\u4EE5\u4E0A\u8FFD\u52A0
-ExtendedTableCopyCommand.Copy.Label=\u5185\u90E8\u30AF\u30EA\u30FC\u30F3\u30DC\u30FC\u30C9\u306B\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30921\u3064\u4EE5\u4E0A\u30B3\u30D4\u30FC
+ExtendedTableAddCommand.Add.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u30921\u3064\u4EE5\u4E0A\u8FFD\u52A0
+ExtendedTableCopyCommand.Copy.Label=\u5185\u90E8\u30AF\u30EA\u30FC\u30F3\u30DC\u30FC\u30C9\u306B\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u30921\u3064\u4EE5\u4E0A\u30B3\u30D4\u30FC
 ExtendedTableModel.ModifiedObject.Error=\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u4F7F\u7528\u3059\u308B\u524D\u306BModifiedBeanListenable\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-ExtendedTableMoveCommand.MoveLabel=\u8907\u6570\u306E\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u3092\u4E0A\u4E0B\u306B\u79FB\u52D5
+ExtendedTableMoveCommand.MoveLabel=\u8907\u6570\u306E\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u4E0A\u4E0B\u306B\u79FB\u52D5
 ExtendedTablePasteCommand.Paste.Label=\u5185\u90E8\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u304B\u3089\u30C7\u30FC\u30BF\u3092\u8CBC\u308A\u4ED8\u3051\u308B
-ExtendedTableRemoveCommand.Romve.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u3092\u524A\u9664
+ExtendedTableRemoveCommand.Romve.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u524A\u9664
 ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=DB\u30BF\u30A4\u30D7\u3092\u3059\u3079\u3066\u30EA\u30BB\u30C3\u30C8\u3057\u3066\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u53D6\u5F97
 ExtendedTableCaseCommand.case.Label=\u9078\u629E\u3055\u308C\u305FDB\u30AB\u30E9\u30E0\u3092\u5927\u6587\u5B57/\u5C0F\u6587\u5B57\u306B\u5909\u66F4
 ExtendedTableQuoteCommand.Quote.Label=\u9078\u629E\u3055\u308C\u305FDB\u30AB\u30E9\u30E0\u3092\u56F2\u3080
@@ -92,7 +92,7 @@ ProposalUtils.CtrlProposal.ErrorMsg=\u3053\u306E\u30BF\u30A4\u30D7\u306E\u5236\u
 RemovePushButton.RemoveButton.Tip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u524A\u9664
 ResetDBTypesButton.ResetDBTypesButton.Tip=DB\u30BF\u30A4\u30D7\u3092\u30EA\u30BB\u30C3\u30C8
 Rule.rule=\u30EB\u30FC\u30EB[{0}]
-SaveAsGenericSchemaPushButton.saveAsSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
+SaveAsGenericSchemaPushButton.saveAsSchema=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
 SelectContextVariablesPushButton.Label=\u30B3\u30F3\u30C6\u30AF\u30B9\u30C8\u5909\u6570\u3092\u9078\u629E
 SWTCalendarWithTime.contentEvening=\u5915\u65B9
 SWTCalendarWithTime.contentHr=\u6642:
@@ -102,7 +102,7 @@ SWTCalendarWithTime.contentNoon=\u5348\u5F8C
 SWTCalendarWithTime.contentNow=\u73FE\u5728
 SWTCalendarWithTime.contnetSec=\u79D2:
 TableViewerCreator.CallMethod.ErrorMsg=\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u3001createTable()\u3092\u65E2\u306B\u547C\u3073\u51FA\u3057\u3066\u3044\u308B\u5834\u5408\u306E\u307F\u547C\u3073\u51FA\u305B\u307E\u3059
-TableViewerCreator.CellModifier.ExError=\u73FE\u5728\u306ECellModifier\u306F\u3053\u306E\u64CD\u4F5C\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093\u3002\n\u3053\u306E\u6A5F\u80FD\u3092\u4F7F\u3046\u306B\u306F\u3001'{0}'\u304B\u62E1\u5F35\u30AF\u30E9\u30B9\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
+TableViewerCreator.CellModifier.ExError=\u73FE\u5728\u306ECellModifier\u306F\u3053\u306E\u64CD\u4F5C\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093\u3002 \n \u3053\u306E\u6A5F\u80FD\u3092\u4F7F\u7528\u3059\u308B\u306B\u306F\u3001'{0}'\u304B\u3001\u62E1\u5F35\u3059\u308B\u30AF\u30E9\u30B9\u3092\u4F7F\u3044\u307E\u3059\u3002
 TableViewerCreator.columnNoIBeanProperty=\u30AB\u30E9\u30E0'{0}' ('{1}')\u306B\u306FCellEditor\u30BB\u30C3\u30C8\u304C\u3042\u308A\u307E\u3059\u304C\u3001IBeanPropertyAccessors\u304C\u3042\u308A\u307E\u305B\u3093!
 TableViewerCreator.columnNullId=\u30AB\u30E9\u30E0'{0}'\u304Cnull\u3067\u3059\uFF01
 TableViewerCreator.IdProperty.AssertMsg=\u30AB\u30E9\u30E0\u306EidProperty\u306E\u5909\u66F4\u304C\u5FC5\u8981\u3067\u3059\u3001idProperty\u306F\uFF11\u3064\u306E\u30C6\u30FC\u30D6\u30EB\u3067\u30E6\u30CB\u30FC\u30AF\u3067\u306A\u304F\u3066\u306F\u306A\u308A\u307E\u305B\u3093\u3002
@@ -116,8 +116,8 @@ ModelSelectionDialog.Option=\u30AA\u30D7\u30B7\u30E7\u30F3
 ModelSelectionDialog.BuiltIn=\u7D44\u307F\u8FBC\u307F\u30D7\u30ED\u30D1\u30C6\u30A3\u306B\u5909\u66F4\u3057\u307E\u3059\u3002
 ModelSelectionDialog.ViewSchema=\u30B9\u30AD\u30FC\u30DE\u3092\u8868\u793A\u3057\u307E\u3059(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)\u3002
 ModelSelectionDialog.ViewQuery=\u30AF\u30A8\u30EA\u30FC\u3046\u3092\u8868\u793A\u3057\u307E\u3059(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)\u3002
-ModelSelectionDialog.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u63A5\u7D9A\u3092\u66F4\u65B0\u3057\u307E\u3059\u3002
-FileStep2.previewFailure=\u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u3002\u3044\u304F\u3064\u304B\u306E\u8A2D\u5B9A\u5909\u66F4\u304C\u5FC5\u8981\u3067\u3059\u3002\n\u6CE8: \u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u306F\u4E00\u822C\u306B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u8A2D\u5B9A\u306E\u8AA4\u308A\u304C\u539F\u56E0\u3067\u3059\u3002
+ModelSelectionDialog.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u63A5\u7D9A\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u3002
+FileStep2.previewFailure=\u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u3002\u4E00\u90E8\u306E\u8A2D\u5B9A\u3092\u5909\u66F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\u6CE8: \u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u306F\u4E00\u822C\u7684\u306B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u8A2D\u5B9A\u306E\u8AA4\u308A\u304C\u539F\u56E0\u3067\u3059\u3002
 StateComposite.FLL_DB_INFOR=DB\u60C5\u5831\u3092\u5165\u529B
 StateComposite.HELP_MESSAGE=\u30D8\u30EB\u30D7\u30E1\u30C3\u30BB\u30FC\u30B8
 StateComposite.MESSAGE1=\u30C0\u30A4\u30CA\u30DF\u30C3\u30AF\u30B8\u30E7\u30D6\u3092\u8A2D\u5B9A\u3057\u3066\u3001\u5165\u529B\u30C6\u30FC\u30D6\u30EB\u306B\u4F9D\u5B58\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u540D\u307E\u305F\u306F\u30C6\u30FC\u30D6\u30EB\u540D\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u3059\u3002

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

@@ -102,7 +102,7 @@ SWTCalendarWithTime.contentNoon=\u4E2D\u5348
 SWTCalendarWithTime.contentNow=\u73B0\u5728
 SWTCalendarWithTime.contnetSec=\u79D2:
 TableViewerCreator.CallMethod.ErrorMsg=\u53EA\u6709\u60A8\u5DF2\u7ECF\u8C03\u7528\u4E86 createTable() \u65B9\u6CD5\u540E\uFF0C\u624D\u80FD\u8C03\u7528\u6B64\u65B9\u6CD5\u3002
-TableViewerCreator.CellModifier.ExError=\u5F53\u524D CellModifier \u4E0D\u652F\u6301\u6B64\u64CD\u4F5C\u3002\n \u4F7F\u7528 '{0}' \u6216\u80FD\u591F\u5BF9\u5176\u8FDB\u884C\u6269\u5C55\u7684\u7C7B\u6765\u4F7F\u7528\u6B64\u529F\u80FD
+TableViewerCreator.CellModifier.ExError=\u5F53\u524D CellModifier \u4E0D\u652F\u6301\u6B64\u64CD\u4F5C\u3002 \n \u4F7F\u7528 '{0}' \u6216\u6269\u5C55\u5B83\u7684\u7C7B\u6765\u4F7F\u7528\u6B64\u529F\u80FD
 TableViewerCreator.columnNoIBeanProperty=\u5217 '{0}' ('{1}') \u8BBE\u7F6E\u4E86 CellEditor\uFF0C\u4F46\u6CA1\u6709 IBeanPropertyAccessors\uFF01
 TableViewerCreator.columnNullId=\u5217 '{0}' \u7684 id \u4E3A null\uFF01
 TableViewerCreator.IdProperty.AssertMsg=\u4F60\u5FC5\u987B\u6539\u53D8\u5176\u4E2D\u4E00\u4E2A\u5217\u7684 idProperty\uFF0C\u4E00\u4E2A\u8868\u4E2D\u7684\u6BCF\u4E2A\u5217\u7684 idProperty \u5FC5\u987B\u552F\u4E00\u3002
@@ -110,14 +110,14 @@ TableViewerCreator.Table.BeNull=\u8868\u4E3A null
 TableViewerCreator.TableColumn.AssertMsg=TableEditorColumn \u7684 idProperty \u4E3A '{0}' \u7684 TableColumn \u6CA1\u6709\u6B63\u786E\u7684 Table \u7236\u9879
 TreeToTablesLinker.Type.Unsupported=\u4E0D\u652F\u6301\u8FD9\u79CD\u7C7B\u578B\u7684 currentControl
 commons.error=\u9519\u8BEF
-exception.errorOccured=\u53D1\u751F\u9519\u8BEF ({0})\u3002\n\u8BF7\u67E5\u770B\u65E5\u5FD7\u4EE5\u83B7\u53D6\u66F4\u591A\u8BE6\u7EC6\u4FE1\u606F\u3002
+exception.errorOccured=\u51FA\u73B0\u9519\u8BEF ({0})\u3002\n\u8BF7\u67E5\u770B\u65E5\u5FD7\u4EE5\u83B7\u53D6\u66F4\u591A\u8BE6\u7EC6\u4FE1\u606F\u3002
 ModelSelectionDialog.Message=\u8BF7\u9009\u62E9\u4E00\u4E2A\u9009\u9879\u6216\u53D6\u6D88\u3002
 ModelSelectionDialog.Option=\u9009\u9879
 ModelSelectionDialog.BuiltIn=\u66F4\u6539\u4E3A\u5185\u7F6E\u5C5E\u6027\u3002
 ModelSelectionDialog.ViewSchema=\u67E5\u770B schema (\u53EA\u8BFB)\u3002
 ModelSelectionDialog.ViewQuery=\u67E5\u770B\u67E5\u8BE2 (\u53EA\u8BFB)\u3002
 ModelSelectionDialog.Update=\u66F4\u65B0\u5B58\u50A8\u5E93\u8FDE\u63A5\u3002
-FileStep2.previewFailure=\u9884\u89C8\u9519\u8BEF\u3002\u987B\u6539\u53D8\u4E00\u4E9B\u8BBE\u7F6E\u3002\n\u6CE8\u610F\uFF1A\u9884\u89C8\u9519\u8BEF\u53EF\u80FD\u662F\u56E0\u4E3A\u9519\u8BEF\u7684\u7F16\u7801\u8BBE\u7F6E\u9020\u6210\u7684\u3002
+FileStep2.previewFailure=\u9884\u89C8\u9519\u8BEF\u3002\u5FC5\u987B\u66F4\u6539\u67D0\u4E9B\u8BBE\u7F6E\u3002\n\u6CE8\u610F\uFF1A\u9884\u89C8\u9519\u8BEF\u901A\u5E38\u662F\u7531\u4E8E\u9519\u8BEF\u7684\u7F16\u7801\u8BBE\u7F6E\u5BFC\u81F4\u3002
 StateComposite.FLL_DB_INFOR=\u586B\u5199\u6570\u636E\u5E93\u4FE1\u606F
 StateComposite.HELP_MESSAGE=\u5E2E\u52A9\u6D88\u606F
 StateComposite.MESSAGE1=\u53EF\u4EE5\u521B\u5EFA\u52A8\u6001\u4F5C\u4E1A\u5E76\u8BBE\u7F6E\u4F9D\u8D56\u4E8E\u8F93\u5165\u8868\u7684\u6587\u4EF6\u540D\u6216\u8868\u540D\u3002

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/dialogs/IConfigModuleDialog.java

@@ -12,6 +12,8 @@
 // ============================================================================
 package org.talend.commons.ui.swt.dialogs;
 
+import java.util.Map;
+
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.RGB;
 import org.talend.commons.ui.utils.image.ColorUtils;
@@ -29,5 +31,7 @@ public interface IConfigModuleDialog {
     public String getMavenURI();
 
     public int open();
+    
+    public Map<String, String> getModulesMVNUrls();
 
 }

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/ITalendWizard.java

@@ -0,0 +1,38 @@
+// ============================================================================
+//
+// 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.dialogs;
+
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.swt.graphics.Color;
+
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public interface ITalendWizard extends IWizard {
+
+    Color getBackgroundColor();
+
+    Color getForegroundColor();
+
+    int getHorizonPadding();
+
+    int getVerticalPadding();
+
+    int getVerticalMargin();
+
+    int getHorizonMargin();
+
+    boolean hideDefaultMessageArea();
+
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/ITalendWizardContainer.java

@@ -0,0 +1,26 @@
+// ============================================================================
+//
+// 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.dialogs;
+
+import org.eclipse.jface.dialogs.IDialogPage;
+import org.eclipse.jface.wizard.IWizardContainer2;
+
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public interface ITalendWizardContainer extends IWizardContainer2 {
+
+    void showMoreInfoLink(IDialogPage page, String name, String link);
+
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/ModelSelectionBusinessHandler.java

@@ -0,0 +1,78 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2023 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.dialogs;
+
+import org.eclipse.swt.widgets.Shell;
+import org.talend.commons.ui.runtime.custom.AbsBusinessHandler;
+import org.talend.commons.ui.swt.dialogs.ModelSelectionDialog.EEditSelection;
+import org.talend.commons.ui.swt.dialogs.ModelSelectionDialog.ESelectionType;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public class ModelSelectionBusinessHandler extends AbsBusinessHandler<ModelSelectionBusinessHandler> {
+
+    private static final String UI_KEY = "ModelSelectionDialog";
+
+    private Shell parentShell;
+
+    private ESelectionType selectionType;
+
+    private boolean isReadOnly;
+
+    private EEditSelection optionValue;
+
+    public ModelSelectionBusinessHandler(Shell parentShell, ESelectionType selectionType, boolean isReadOnly) {
+        this.parentShell = parentShell;
+        this.selectionType = selectionType;
+        this.isReadOnly = isReadOnly;
+    }
+
+    @Override
+    public String getUiKey() {
+        return UI_KEY;
+    }
+
+    public Shell getParentShell() {
+        return parentShell;
+    }
+
+    public void setParentShell(Shell parentShell) {
+        this.parentShell = parentShell;
+    }
+
+    public ESelectionType getSelectionType() {
+        return selectionType;
+    }
+
+    public void setSelectionType(ESelectionType selectionType) {
+        this.selectionType = selectionType;
+    }
+
+    public boolean isReadOnly() {
+        return isReadOnly;
+    }
+
+    public void setReadOnly(boolean isReadOnly) {
+        this.isReadOnly = isReadOnly;
+    }
+
+    public EEditSelection getOptionValue() {
+        return this.optionValue;
+    }
+
+    public void setOptionValue(EEditSelection optionValue) {
+        this.optionValue = optionValue;
+    }
+
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/ModelSelectionDialog.java

@@ -62,6 +62,10 @@ public class ModelSelectionDialog extends SelectionDialog {
         this(parentShell, selectionType, false);
     }
 
+    public ModelSelectionDialog(ModelSelectionBusinessHandler handler) {
+        this(handler.getParentShell(), handler.getSelectionType(), handler.isReadOnly());
+    }
+
     public ModelSelectionDialog(Shell parentShell, ESelectionType selectionType, boolean isReadOnly) {
         super(parentShell);
         setHelpAvailable(false);

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/TalendWizardDialog.java

@@ -0,0 +1,968 @@
+// ============================================================================
+//
+// 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.dialogs;
+
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IDialogPage;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.window.ToolTip;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.jface.wizard.ProgressMonitorPart;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.PaintEvent;
+import org.eclipse.swt.events.PaintListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.program.Program;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Canvas;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.forms.events.HyperlinkAdapter;
+import org.eclipse.ui.forms.events.HyperlinkEvent;
+import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.ui.runtime.ColorConstants;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public class TalendWizardDialog extends WizardDialog implements ITalendWizardContainer {
+
+    private boolean useNewStyle = false;
+
+    private Color backgroundColor;
+
+    private Color foregroundColor;
+
+    private static Font titleBigFont;
+
+    private Canvas titleLabelWithAnimation;
+
+    private Canvas messagePanel;
+
+    private Color msgPanelColor = ColorConstants.INFO_COLOR;
+
+    private Composite topPanel;
+
+    private Label errIcon;
+
+    private StyledText errMsgTxt;
+
+    private Hyperlink moreInfoLink;
+
+    private String moreInfoUrl;
+
+    private volatile Thread titleAnimationSchedulerThread;
+
+    private volatile boolean threadShowingMsg = false;
+
+    private Image bigTitleImg;
+
+    private Image smallTitleImg;
+
+    private String title;
+
+    private int messageTopY;
+
+    private volatile double percentage = 1.0;
+
+    private boolean hideMessageArea = false;
+
+    public TalendWizardDialog(Shell parentShell, IWizard newWizard) {
+        super(parentShell, newWizard);
+        useNewStyle = true;
+        if (newWizard instanceof ITalendWizard) {
+            ITalendWizard talendWizard = (ITalendWizard) newWizard;
+            backgroundColor = talendWizard.getBackgroundColor();
+            foregroundColor = talendWizard.getForegroundColor();
+            hideMessageArea = talendWizard.hideDefaultMessageArea();
+        }
+//        this.setTitleAreaColor(new RGB(205, 227, 242));
+    }
+
+    private Thread createTitleAnimationSchedulerThread(boolean showMessage) {
+        return new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                titleAnimationSchedulerThread(showMessage);
+            }
+        }, "title anmimation, show: " + showMessage);
+    }
+
+    private void titleAnimationSchedulerThread(boolean showMessage) {
+        int totalTime = 500;
+        int split = 30;
+        int sleepTime = totalTime / split;
+        double percentPerFrame = 1.0 / split;
+        for (int i = 1; i < split; i++) {
+            double curX = 1 - percentPerFrame * i;
+            double donePercent = Math.sqrt(1 - curX * curX);
+            onTitleAreaRefresh(donePercent, showMessage);
+            if (Thread.currentThread().isInterrupted()) {
+                break;
+            }
+            try {
+                Thread.sleep(sleepTime);
+            } catch (InterruptedException e) {
+                onTitleAnimationInterupted(showMessage);
+                return;
+            }
+        }
+        onTitleAreaRefresh(1.0, showMessage);
+    }
+
+    private void onTitleAnimationInterupted(boolean showMessage) {
+        this.percentage = 1.0;
+    }
+
+    private boolean isHideMessageArea() {
+        return hideMessageArea;
+    }
+
+    private void onTitleAreaRefresh(double donePercent, boolean showMessage) {
+        if (isHideMessageArea()) {
+            return;
+        }
+        topPanel.getDisplay().syncExec(() -> {
+            onTitleAreaRefreshFrame(donePercent, showMessage);
+        });
+    }
+
+    private void onTitleAreaRefreshFrame(double donePercent, boolean showMessage) {
+        if (isHideMessageArea()) {
+            return;
+        }
+        this.percentage = donePercent;
+        sortPanelOrder();
+        if (!showMessage) {
+            messagePanel.setVisible(false);
+        } else {
+            messagePanel.setVisible(true);
+//            errIcon.setVisible(true);
+        }
+        Point size = topPanel.getSize();
+        int totalY = size.y - messageTopY;
+        int y = 0;
+        if (showMessage) {
+            y = messageTopY + (int) ((1.0 - donePercent) * totalY);
+        } else {
+            y = messageTopY + (int) (donePercent * totalY);
+        }
+
+        FormData fd = (FormData) messagePanel.getLayoutData();
+        fd.top = new FormAttachment(0, y);
+        this.titleLabelWithAnimation.redraw();
+        topPanel.layout();
+    }
+
+    public void setNewErrorStyle(boolean newErrStyle) {
+        this.useNewStyle = newErrStyle;
+    }
+
+    @Override
+    protected Control createContents(Composite parent) {
+        if (useNewStyle()) {
+            parent.setBackground(backgroundColor);
+            parent.setForeground(foregroundColor);
+        }
+        Control panel = super.createContents(parent);
+        try {
+            if (useNewStyle()) {
+                sortPanelOrder();
+                workArea.setBackground(backgroundColor);
+                workArea.setForeground(foregroundColor);
+                pageContainer.setBackground(backgroundColor);
+                pageContainer.setForeground(foregroundColor);
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return panel;
+    }
+
+    private boolean useNewStyle() {
+        return this.useNewStyle;
+    }
+
+    @Override
+    protected Control createDialogArea(Composite parent) {
+        Composite panel = (Composite) super.createDialogArea(parent);
+        if (useNewStyle()) {
+            this.titleBarSeparator.dispose();
+            this.separator.dispose();
+        }
+        return panel;
+    }
+
+    @Override
+    protected ProgressMonitorPart createProgressMonitorPart(Composite composite, GridLayout pmlayout) {
+        if (useNewStyle()) {
+            composite.setBackground(backgroundColor);
+            composite.setForeground(foregroundColor);
+//            progMonitor.setBackground(backgroundColor);
+//            progMonitor.setForeground(foregroundColor);
+        }
+        ProgressMonitorPart progMonitor = super.createProgressMonitorPart(composite, pmlayout);
+        return progMonitor;
+    }
+
+    @Override
+    protected Control createButtonBar(Composite parent) {
+        if (!useNewStyle()) {
+            return super.createButtonBar(parent);
+        }
+        Composite composite = new Composite(parent, SWT.NONE);
+        composite.setBackground(backgroundColor);
+        composite.setForeground(foregroundColor);
+        GridLayout layout = new GridLayout();
+        layout.marginWidth = 0;
+        layout.marginHeight = 0;
+        layout.horizontalSpacing = 0;
+        composite.setLayout(layout);
+        composite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+        composite.setFont(parent.getFont());
+
+        Control helpControl = null;
+        // create help control if needed
+        if (isHelpAvailable()) {
+            helpControl = createHelpControl(composite);
+            ((GridData) helpControl.getLayoutData()).horizontalIndent = convertHorizontalDLUsToPixels(
+                    IDialogConstants.HORIZONTAL_MARGIN);
+        }
+        createButtonsForButtonBar(composite);
+
+        Button helpButton = getButton(IDialogConstants.HELP_ID);
+        Button finishButton = getButton(IDialogConstants.FINISH_ID);
+        Button cancelButton = getButton(IDialogConstants.CANCEL_ID);
+        Button backButton = getButton(IDialogConstants.BACK_ID);
+        Button nextButton = getButton(IDialogConstants.NEXT_ID);
+
+        FormLayout formLayout = new FormLayout();
+        formLayout.marginWidth = getHorizonMargin();
+        formLayout.marginHeight = getVerticalPadding();
+        composite.setLayout(formLayout);
+        final int HORIZON_ALIGN = getHorizonPadding();
+
+        cancelButton.setBackground(backgroundColor);
+        cancelButton.setForeground(foregroundColor);
+        FormData cancelData = new FormData();
+        cancelData.left = new FormAttachment(0);
+        cancelData.top = new FormAttachment(composite, 0, SWT.CENTER);
+        cancelData.width = getButtonWidth(cancelButton);
+        cancelButton.setLayoutData(cancelData);
+
+        Control tmpCtrl = cancelButton;
+
+        if (helpControl != null) {
+            helpControl.setBackground(backgroundColor);
+            helpControl.setForeground(foregroundColor);
+            FormData formData = new FormData();
+            formData.left = new FormAttachment(tmpCtrl, HORIZON_ALIGN, SWT.RIGHT);
+            formData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
+            helpControl.setLayoutData(formData);
+            tmpCtrl = helpControl;
+        }
+        if (helpButton != null) {
+            helpButton.setBackground(backgroundColor);
+            helpButton.setForeground(foregroundColor);
+            FormData formData = new FormData();
+            formData.left = new FormAttachment(tmpCtrl, HORIZON_ALIGN, SWT.RIGHT);
+            formData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
+            formData.width = getButtonWidth(helpButton);
+            helpButton.setLayoutData(formData);
+            tmpCtrl = helpButton;
+        }
+        finishButton.setBackground(backgroundColor);
+        finishButton.setForeground(foregroundColor);
+        FormData finishData = new FormData();
+        finishData.right = new FormAttachment(100);
+        finishData.top = new FormAttachment(composite, 0, SWT.CENTER);
+        finishData.width = getButtonWidth(finishButton);
+        finishButton.setLayoutData(finishData);
+        tmpCtrl = finishButton;
+
+        if (nextButton != null) {
+            nextButton.setBackground(backgroundColor);
+            nextButton.setForeground(foregroundColor);
+            FormData nextData = new FormData();
+            Composite nextParentCtrl = nextButton.getParent();
+            nextParentCtrl.setBackground(backgroundColor);
+            nextParentCtrl.setForeground(foregroundColor);
+            nextData.right = new FormAttachment(tmpCtrl, -HORIZON_ALIGN, SWT.LEFT);
+            nextData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
+            nextParentCtrl.setLayoutData(nextData);
+        }
+        if (backButton != null) {
+            backButton.setBackground(backgroundColor);
+            backButton.setForeground(foregroundColor);
+        }
+
+        return composite;
+    }
+
+    private int getButtonWidth(Button btn) {
+        int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
+        Point minSize = btn.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
+        return Math.max(widthHint, minSize.x);
+    }
+
+    @Override
+    protected Control createTitleArea(Composite parent) {
+        Control titleCtrl = null;
+        if (useNewStyle()) {
+            final int horizonPadding = getHorizonPadding();
+            final int horizonMargin = getHorizonMargin();
+            final int verticalPadding = getVerticalPadding();
+            final int msgMargin = getMargin();
+            Control oldTitleArea = super.createTitleArea(parent);
+            topPanel = new Composite(parent, SWT.NONE);
+            titleCtrl = topPanel;
+//            topPanel.setBackground(ColorConstants.RED_COLOR);
+            topPanel.setBackground(backgroundColor);
+            topPanel.setForeground(foregroundColor);
+            FormData topPanelFd = new FormData();
+            topPanelFd.top = new FormAttachment(0);
+            topPanelFd.left = new FormAttachment(0);
+            topPanelFd.right = new FormAttachment(100);
+//            topPanelFd.bottom = new FormAttachment(oldTitleArea, 0, SWT.BOTTOM);
+            Label tmpLabel = new Label(parent, SWT.NONE);
+//            tmpLabel.setFont(getTitleBigFont());
+            tmpLabel.setFont(JFaceResources.getBannerFont());
+            tmpLabel.setText("Test");
+            tmpLabel.pack();
+            Point size = tmpLabel.getSize();
+            tmpLabel.setFont(null);
+            tmpLabel.setText("Test");
+            tmpLabel.pack();
+            Point errSize = tmpLabel.getSize();
+            tmpLabel.dispose();
+            if (isHideMessageArea()) {
+                topPanelFd.height = 0;
+            } else {
+                topPanelFd.height = verticalPadding + size.y + verticalPadding + errSize.y + msgMargin * 2;
+            }
+            topPanel.setLayoutData(topPanelFd);
+            topPanel.setLayout(new FormLayout());
+//            sortPanelOrder();
+
+            titleLabelWithAnimation = new Canvas(topPanel, SWT.DOUBLE_BUFFERED);
+            titleLabelWithAnimation.addPaintListener(new PaintListener() {
+
+                @Override
+                public void paintControl(PaintEvent e) {
+                    drawTitle(e);
+                }
+            });
+            titleLabelWithAnimation.setBackground(backgroundColor);
+            titleLabelWithAnimation.setForeground(foregroundColor);
+            titleLabelWithAnimation.addDisposeListener(new DisposeListener() {
+
+                @Override
+                public void widgetDisposed(DisposeEvent e) {
+                    if (bigTitleImg != null && !bigTitleImg.isDisposed()) {
+                        bigTitleImg.dispose();
+                    }
+                    if (smallTitleImg != null && !smallTitleImg.isDisposed()) {
+                        smallTitleImg.dispose();
+                    }
+                }
+            });
+
+            FormData fd = new FormData();
+            fd.top = new FormAttachment(0, verticalPadding);
+            fd.left = new FormAttachment(0, horizonMargin);
+            fd.right = new FormAttachment(100);
+            fd.bottom = new FormAttachment(100);
+            titleLabelWithAnimation.setLayoutData(fd);
+
+            messagePanel = new Canvas(topPanel, SWT.DOUBLE_BUFFERED);
+            messagePanel.addPaintListener(new PaintListener() {
+
+                @Override
+                public void paintControl(PaintEvent e) {
+                    drawMessageBackground(e, messagePanel);
+//                    int len = 160;
+//                    int a = 10;
+//                    int a_Len = a + (int) (percentage * (size.x - a));
+//                    int b_Len = a_Len + len;
+//                    if (a_Len < size.x || b_Len < size.x) {
+//                        if (size.x <= a_Len) {
+//                            a_Len = size.x;
+//                        }
+//                        if (size.x <= b_Len) {
+//                            b_Len = size.x;
+//                        }
+//                        e.gc.setBackground(ColorConstants.WHITE_COLOR);
+//                        e.gc.fillPolygon(new int[] { a_Len, 0, size.x, 0, size.x, size.y, b_Len, size.y });
+//                    }
+                }
+            });
+            messagePanel.setBackground(backgroundColor);
+            messagePanel.setForeground(foregroundColor);
+            fd = new FormData();
+            tmpLabel = new Label(topPanel, SWT.NONE);
+            tmpLabel.setFont(JFaceResources.getBannerFont());
+            tmpLabel.setText("Test");
+            tmpLabel.pack();
+            size = tmpLabel.getSize();
+            tmpLabel.dispose();
+            messageTopY = verticalPadding + size.y + verticalPadding;
+            fd.top = new FormAttachment(0, messageTopY);
+//            fd.left = new FormAttachment(0, convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING));
+//            fd.right = new FormAttachment(100, -convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING));
+            fd.left = new FormAttachment(0, horizonMargin);
+            fd.right = new FormAttachment(100, -horizonMargin);
+            fd.bottom = new FormAttachment(100);
+            messagePanel.setLayoutData(fd);
+            messagePanel.setLayout(new FormLayout());
+
+            errIcon = new Label(messagePanel, SWT.NONE);
+            errIcon.setBackground(msgPanelColor);
+            errIcon.setForeground(foregroundColor);
+            fd = new FormData();
+            fd.top = new FormAttachment(0, msgMargin);
+            fd.left = new FormAttachment(0, msgMargin);
+            errIcon.setLayoutData(fd);
+
+            moreInfoLink = new Hyperlink(messagePanel, SWT.NONE);
+            moreInfoLink.setText("");
+            moreInfoLink.setBackground(msgPanelColor);
+            moreInfoLink.setUnderlined(true);
+            moreInfoLink.addHyperlinkListener(new HyperlinkAdapter() {
+
+                @Override
+                public void linkActivated(HyperlinkEvent e) {
+                    onMoreInfoLinkClicked(e);
+                }
+            });
+
+            errMsgTxt = new StyledText(messagePanel, SWT.READ_ONLY | SWT.WRAP);
+            errMsgTxt.setEditable(false);
+            errMsgTxt.setBackground(msgPanelColor);
+            errMsgTxt.setForeground(org.eclipse.draw2d.ColorConstants.black);
+
+            fd = new FormData();
+            fd.top = new FormAttachment(errMsgTxt, 0, SWT.CENTER);
+            fd.right = new FormAttachment(100, -msgMargin);
+            moreInfoLink.setLayoutData(fd);
+
+            fd = new FormData();
+            fd.top = new FormAttachment(errIcon, 0, SWT.TOP);
+            fd.left = new FormAttachment(errIcon, horizonPadding, SWT.RIGHT);
+            fd.right = new FormAttachment(moreInfoLink, -horizonPadding, SWT.LEFT);
+            fd.bottom = new FormAttachment(100, -msgMargin);
+            errMsgTxt.setLayoutData(fd);
+
+            parent.setBackground(backgroundColor);
+//            parent.setBackground(ColorConstants.YELLOW_COLOR);
+            titleImageLabel.setBackground(backgroundColor);
+            titleLabel.setBackground(backgroundColor);
+            titleLabel.moveBelow(null);
+            messageImageLabel.setBackground(backgroundColor);
+            leftFillerLabel.setBackground(backgroundColor);
+            bottomFillerLabel.setBackground(backgroundColor);
+            messageLabel.setBackground(backgroundColor);
+        } else {
+            titleCtrl = super.createTitleArea(parent);
+        }
+        return titleCtrl;
+    }
+
+    private Composite createToolTipContent(Composite parent) {
+        Composite result = new Composite(parent, SWT.NONE);
+        final int msgMargin = getMargin();
+        final int horizonPadding = getHorizonPadding();
+        result.setBackground(null);
+        result.setLayout(new FormLayout());
+        Canvas msgPanel = new Canvas(result, SWT.DOUBLE_BUFFERED);
+        FormData fd = new FormData();
+        fd.top = new FormAttachment(0);
+        fd.left = new FormAttachment(0);
+        fd.width = messagePanel.getSize().x;
+        fd.bottom = new FormAttachment(100);
+        msgPanel.setLayoutData(fd);
+        msgPanel.addPaintListener(new PaintListener() {
+
+            @Override
+            public void paintControl(PaintEvent e) {
+                drawMessageBackground(e, msgPanel);
+            }
+        });
+        msgPanel.setBackground(messagePanel.getBackground());
+        msgPanel.setForeground(messagePanel.getForeground());
+        msgPanel.setLayout(new FormLayout());
+
+        Label errIconLabel = new Label(msgPanel, SWT.NONE);
+        errIconLabel.setBackground(errIcon.getBackground());
+        errIconLabel.setForeground(errIcon.getForeground());
+        errIconLabel.setImage(errIcon.getImage());
+        fd = new FormData();
+        fd.top = new FormAttachment(0, msgMargin);
+        fd.left = new FormAttachment(0, msgMargin);
+        errIconLabel.setLayoutData(fd);
+
+        Hyperlink link = new Hyperlink(msgPanel, SWT.NONE);
+        link.setText(moreInfoLink.getText());
+        link.setBackground(moreInfoLink.getBackground());
+        link.setUnderlined(moreInfoLink.isUnderlined());
+
+        StyledText msgTxt = new StyledText(msgPanel, SWT.READ_ONLY | SWT.WRAP);
+        msgTxt.setBackground(errMsgTxt.getBackground());
+        msgTxt.setForeground(errMsgTxt.getForeground());
+        msgTxt.setText(errMsgTxt.getText());
+
+        fd = new FormData();
+        fd.top = new FormAttachment(msgTxt, 0, SWT.CENTER);
+        fd.right = new FormAttachment(100, -msgMargin);
+        link.setLayoutData(fd);
+
+        fd = new FormData();
+        fd.top = new FormAttachment(errIconLabel, 0, SWT.TOP);
+        fd.left = new FormAttachment(errIconLabel, horizonPadding, SWT.RIGHT);
+        fd.right = new FormAttachment(link, -horizonPadding, SWT.LEFT);
+        msgTxt.setLayoutData(fd);
+        return result;
+    }
+
+    private void onMoreInfoLinkClicked(HyperlinkEvent e) {
+        Program.launch(moreInfoUrl);
+    }
+
+    @Override
+    protected void resetWorkAreaAttachments(Control top) {
+        FormData childData = new FormData();
+        childData.top = new FormAttachment(topPanel, 0, SWT.BOTTOM);
+        childData.right = new FormAttachment(100, 0);
+        childData.left = new FormAttachment(0, 0);
+        childData.bottom = new FormAttachment(100, 0);
+        workArea.setLayoutData(childData);
+    }
+
+    @Override
+    protected void layoutForNewMessage(boolean forceLayout) {
+        if (!useNewStyle()) {
+            super.layoutForNewMessage(forceLayout);
+            return;
+        }
+//        if (forceLayout) {
+//            return;
+//        }
+        if (hasMessage()) {
+            messagePanel.setVisible(true);
+//            Image image = messageImageLabel.getImage();
+//            if (image == null) {
+//                image = messageImage;
+//            }
+//            if (image != null && messageImageLabel.isVisible()) {
+////                this.errIcon.setVisible(true);
+//                this.errIcon.setImage(image);
+//            } else {
+//                this.errIcon.setImage(null);
+////                this.errIcon.setVisible(false);
+//            }
+            updateMsgPanelColor(pageMessageType);
+//            topPanel.layout();
+            messagePanel.layout();
+            Point messageSize = errMsgTxt.getSize();
+            int messageLabelUnclippedHeight = errMsgTxt.computeSize(messageSize.x, SWT.DEFAULT, true).y;
+            boolean messageLabelClipped = messageLabelUnclippedHeight > messageSize.y;
+            if (errMsgTxt.getData() instanceof ToolTip) {
+                ToolTip toolTip = (ToolTip) errMsgTxt.getData();
+                toolTip.hide();
+                toolTip.deactivate();
+                errMsgTxt.setData(null);
+            }
+            if (messageLabelClipped) {
+                ToolTip tooltip = new ToolTip(errMsgTxt, ToolTip.NO_RECREATE, false) {
+
+                    @Override
+                    protected Composite createToolTipContentArea(Event event, Composite parent) {
+                        return createToolTipContent(parent);
+                    }
+
+                    @Override
+                    public Point getLocation(Point tipSize, Event event) {
+                        return errMsgTxt.getShell().toDisplay(messagePanel.getLocation());
+                    }
+                };
+                errMsgTxt.setData(tooltip);
+                tooltip.setPopupDelay(0);
+                tooltip.activate();
+            }
+        }
+    }
+
+    @Override
+    protected void setImageLabelVisible(boolean visible) {
+        super.setImageLabelVisible(visible);
+        if (useNewStyle()) {
+            messagePanel.setVisible(visible);
+            if (visible) {
+                errIcon.setImage(messageImageLabel.getImage());
+            } else {
+                errIcon.setImage(null);
+            }
+        }
+    }
+
+    private void sortPanelOrder() {
+        if (isHideMessageArea()) {
+            return;
+        }
+        if (this.topPanel == null) {
+            return;
+        }
+        this.titleImageLabel.moveAbove(null);
+        this.topPanel.moveBelow(this.titleImageLabel);
+        messagePanel.moveAbove(titleLabelWithAnimation);
+        if (!hasMessage()) {
+            messagePanel.setVisible(false);
+        }
+    }
+
+    @Override
+    protected void setLayoutsForNormalMessage(int verticalSpacing, int horizontalSpacing) {
+        if (isHideMessageArea()) {
+            return;
+        }
+        super.setLayoutsForNormalMessage(verticalSpacing, horizontalSpacing);
+        if (useNewStyle()) {
+            if (this.topPanel != null) {
+                onTitleAreaRefreshFrame(1.0, false);
+            }
+        }
+    }
+
+    private static Font getTitleBigFont() {
+        if (titleBigFont != null) {
+            return titleBigFont;
+        }
+        Font bannerFont = JFaceResources.getBannerFont();
+        FontData[] fontData = bannerFont.getFontData();
+        for (FontData fd : fontData) {
+            fd.setHeight(fd.getHeight() + 7);
+        }
+        titleBigFont = new Font(Display.getDefault(), fontData);
+        return titleBigFont;
+    }
+
+    @Override
+    protected void updateMessage(String newMessage) {
+        if (isHideMessageArea()) {
+            return;
+        }
+        boolean hadMsg = hasMessage();
+        super.updateMessage(newMessage);
+        this.errMsgTxt.setText(this.messageLabel.getText());
+        boolean hasMsg = hasMessage();
+        messagePanel.setVisible(hasMsg);
+        if (hadMsg != hasMsg) {
+            startAnimation();
+        }
+    }
+
+    @Override
+    public void setErrorMessage(String newErrorMessage) {
+        if (isHideMessageArea()) {
+            return;
+        }
+        if (StringUtils.isNotBlank(newErrorMessage)) {
+            this.pageMessageType = IMessageProvider.ERROR;
+            updateMsgPanelColor(this.pageMessageType);
+        }
+        super.setErrorMessage(newErrorMessage);
+    }
+
+    @Override
+    protected void showMessage(String newMessage, Image newImage) {
+        if (isHideMessageArea()) {
+            return;
+        }
+        super.showMessage(newMessage, newImage);
+    }
+
+    @Override
+    public void setMessage(String newMessage, int newType) {
+        if (isHideMessageArea()) {
+            return;
+        }
+        if (StringUtils.isNotBlank(newMessage)) {
+            updateMsgPanelColor(newType);
+        }
+        super.setMessage(newMessage, newType);
+    }
+
+    private void updateMsgPanelColor(int type) {
+        Color foreColor = getMsgPanelForegroundColor(type);
+        msgPanelColor = getMsgPanelBackgroundColor(type);
+        errIcon.setBackground(msgPanelColor);
+        errMsgTxt.setBackground(msgPanelColor);
+        errMsgTxt.setForeground(foreColor);
+        moreInfoLink.setBackground(msgPanelColor);
+//        moreInfoLink.setForeground(getMoreInfoLinkForegroundColor(type));
+        messagePanel.redraw();
+    }
+
+    private Color getMsgPanelBackgroundColor(int type) {
+        Color color = ColorConstants.INFO_COLOR;
+        switch (type) {
+        case IMessageProvider.NONE:
+        case IMessageProvider.INFORMATION:
+            color = ColorConstants.INFO_COLOR;
+            break;
+        case IMessageProvider.WARNING:
+            color = ColorConstants.WARN_COLOR;
+            break;
+        case IMessageProvider.ERROR:
+            color = ColorConstants.ERR_COLOR;
+            break;
+        }
+        return color;
+    }
+
+    private Color getMsgPanelForegroundColor(int type) {
+        Color color = ColorConstants.WHITE_COLOR;
+        switch (type) {
+        case IMessageProvider.WARNING:
+            color = org.eclipse.draw2d.ColorConstants.black;
+            break;
+        case IMessageProvider.NONE:
+        case IMessageProvider.INFORMATION:
+        case IMessageProvider.ERROR:
+            color = ColorConstants.WHITE_COLOR;
+            break;
+        }
+        return color;
+    }
+
+    private Color getMoreInfoLinkForegroundColor(int type) {
+        Color color = null;
+        switch (type) {
+        case IMessageProvider.NONE:
+        case IMessageProvider.INFORMATION:
+        case IMessageProvider.ERROR:
+            color = ColorConstants.WHITE_COLOR;
+            break;
+        default:
+            break;
+        }
+        return color;
+    }
+
+    private void startAnimation() {
+        boolean hasMsg = hasMessage();
+        if (this.titleAnimationSchedulerThread != null) {
+            if (hasMsg == threadShowingMsg) {
+                return;
+            } else {
+                this.titleAnimationSchedulerThread.interrupt();
+            }
+        }
+        threadShowingMsg = hasMsg;
+        titleAnimationSchedulerThread = createTitleAnimationSchedulerThread(threadShowingMsg);
+        titleAnimationSchedulerThread.start();
+    }
+
+    private boolean hasMessage() {
+        return StringUtils.isNotBlank(messageLabel.getText());
+    }
+
+    @Override
+    public void setTitle(String newTitle) {
+        super.setTitle(newTitle);
+        if (StringUtils.equals(newTitle, title) && this.bigTitleImg != null) {
+            return;
+        }
+        if (this.titleAnimationSchedulerThread != null) {
+            this.titleAnimationSchedulerThread.interrupt();
+        }
+        this.title = newTitle;
+        if (this.bigTitleImg != null) {
+            this.bigTitleImg.dispose();
+        }
+        this.bigTitleImg = createTitleImage(getTitleBigFont(), this.title);
+        if (this.smallTitleImg != null) {
+            this.smallTitleImg.dispose();
+        }
+        this.smallTitleImg = createTitleImage(JFaceResources.getBannerFont(), this.title);
+        this.titleLabelWithAnimation.redraw();
+    }
+
+    @Override
+    public void showMoreInfoLink(IDialogPage page, String name, String link) {
+        if (isHideMessageArea()) {
+            return;
+        }
+        if (getCurrentPage() != page) {
+            return;
+        }
+        if (StringUtils.isBlank(name)) {
+            moreInfoLink.setText("");
+            moreInfoLink.setEnabled(false);
+        } else {
+            moreInfoLink.setEnabled(true);
+            moreInfoLink.setText(name);
+        }
+        moreInfoUrl = link;
+        this.moreInfoLink.pack();
+        this.moreInfoLink.redraw();
+        this.messagePanel.layout();
+    }
+
+    @Override
+    public void setTitleImage(Image newTitleImage) {
+        super.setTitleImage(newTitleImage);
+        if (this.titleAreaImage != null) {
+            if (this.messageTopY < this.titleAreaImage.getBounds().height) {
+                FormData fd = (FormData) messagePanel.getLayoutData();
+                Rectangle imgBounds = this.titleAreaImage.getBounds();
+                fd.right = new FormAttachment(100, -getHorizonPadding() - imgBounds.width);
+                FormData panelFd = (FormData) this.topPanel.getLayoutData();
+                int imageY = imgBounds.height;
+                int topPanelY = panelFd.height;
+                if (topPanelY < imageY) {
+                    panelFd.height = imageY;
+//            fd.right = new FormAttachment(this.titleImageLabel, -getMargin(), SWT.LEFT);
+                    this.topPanel.getParent().layout();
+                } else {
+                }
+                this.topPanel.layout();
+            }
+        }
+    }
+
+    private Image createTitleImage(Font font, String title) {
+        Label tmpLabel = new Label(titleLabel.getParent(), SWT.NONE);
+        tmpLabel.setText(title);
+        tmpLabel.setFont(font);
+        tmpLabel.pack();
+        Point size = tmpLabel.getSize();
+        tmpLabel.dispose();
+
+        int width = size.x;
+        if (StringUtils.isEmpty(title)) {
+            width = 1;
+        }
+        Image tmpImg = new Image(Display.getDefault(), width, size.y);
+        GC gc = new GC(tmpImg);
+        gc.setAntialias(SWT.ON);
+        gc.setInterpolation(SWT.HIGH);
+        gc.setFont(font);
+        gc.setAlpha(0);
+        gc.drawRectangle(0, 0, width, size.y);
+        gc.setAlpha(255);
+        gc.drawText(title, 0, 0, true);
+        gc.dispose();
+
+        ImageData imageData = tmpImg.getImageData();
+        imageData.transparentPixel = imageData.getPixel(0, 0);
+        tmpImg.dispose();
+
+        return new Image(Display.getDefault(), imageData);
+    }
+
+    private void drawTitle(PaintEvent e) {
+        double p = percentage;
+        Rectangle sBounds = smallTitleImg.getBounds();
+        Rectangle bBounds = bigTitleImg.getBounds();
+        int width = bBounds.width - sBounds.width;
+        int height = bBounds.height - sBounds.height;
+        Rectangle baseBounds = sBounds;
+        Image finalImg = bigTitleImg;
+        finalImg = bigTitleImg;
+        int totalHight = e.height;
+        int middleY = (totalHight - bBounds.height) / 2;
+//        int startY = getMargin();
+        int startY = 0;
+        int baseY = startY;
+        int y = (int) (p * (middleY - startY));
+        if (hasMessage()) {
+            y = -y;
+            width = -width;
+            height = -height;
+            baseBounds = bBounds;
+            baseY = middleY;
+            finalImg = smallTitleImg;
+        }
+
+        Point newSize = new Point((int) (baseBounds.width + p * width), (int) (baseBounds.height + p * height));
+        GC gc = e.gc;
+        gc.setAntialias(SWT.ON);
+        gc.setInterpolation(SWT.HIGH);
+        if (p <= 1.0) {
+            gc.drawImage(bigTitleImg, 0, 0, bBounds.width, bBounds.height, 0, baseY + y, newSize.x, newSize.y);
+        } else {
+            Rectangle bounds = finalImg.getBounds();
+            gc.drawImage(finalImg, 0, 0, bounds.width, bounds.height, 0, baseY + y, bounds.width, bounds.height);
+        }
+    }
+
+    private void drawMessageBackground(PaintEvent e, Control ctrl) {
+        e.gc.setBackground(msgPanelColor);
+        e.gc.setAntialias(SWT.ON);
+        e.gc.setInterpolation(SWT.HIGH);
+        Point size = ctrl.getSize();
+        e.gc.fillRoundRectangle(0, 0, size.x, size.y, 15, 15);
+    }
+
+    private int getHorizonPadding() {
+        IWizard wizard = this.getWizard();
+        if (wizard instanceof ITalendWizard) {
+            return ((ITalendWizard) wizard).getHorizonPadding();
+        }
+        return 5;
+    }
+
+    private int getVerticalPadding() {
+        IWizard wizard = this.getWizard();
+        if (wizard instanceof ITalendWizard) {
+            return ((ITalendWizard) wizard).getVerticalPadding();
+        }
+        return 5;
+    }
+
+    private int getHorizonMargin() {
+        IWizard wizard = this.getWizard();
+        if (wizard instanceof ITalendWizard) {
+            return ((ITalendWizard) wizard).getHorizonMargin();
+        }
+        return 5;
+    }
+
+    private int getMargin() {
+        return 10;
+    }
+
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/TalendWizardDialog_backup.java

@@ -0,0 +1,244 @@
+// ============================================================================
+//
+// 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.dialogs;
+
+import java.lang.reflect.Field;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.resource.JFaceColors;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.jface.wizard.ProgressMonitorPart;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.ui.runtime.ColorConstants;
+
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public class TalendWizardDialog_backup extends WizardDialog {
+
+    private boolean useNewErrorStyle = false;
+
+    /**
+     * Warning color: #FCE6D9 <br/>
+     * info color: #CDE3F2
+     */
+
+    public TalendWizardDialog_backup(Shell parentShell, IWizard newWizard) {
+        super(parentShell, newWizard);
+        useNewErrorStyle = true;
+        this.setTitleAreaColor(new RGB(205, 227, 242));
+    }
+
+    public void setNewErrorStyle(boolean newErrStyle) {
+        this.useNewErrorStyle = newErrStyle;
+    }
+
+    @Override
+    protected Control createContents(Composite parent) {
+        parent.setBackground(ColorConstants.WHITE_COLOR);
+        Control panel = super.createContents(parent);
+        Display display = parent.getDisplay();
+        Color background = JFaceColors.getBannerBackground(display);
+        Color foreground = JFaceColors.getBannerForeground(display);
+        try {
+            Field workAreaField = TitleAreaDialog.class.getDeclaredField("workArea");
+            workAreaField.setAccessible(true);
+            Composite workArea = (Composite) workAreaField.get(this);
+            workArea.setBackground(ColorConstants.WHITE_COLOR);
+            Field pageContainerField = WizardDialog.class.getDeclaredField("pageContainer");
+            pageContainerField.setAccessible(true);
+            Composite pageContainer = (Composite) pageContainerField.get(this);
+            pageContainer.setBackground(ColorConstants.WHITE_COLOR);
+            if (useNewErrorStyle()) {
+                FormData formData = (FormData) workArea.getLayoutData();
+                formData.top = new FormAttachment(0);
+            }
+            Field bottomFillerLabelField = TitleAreaDialog.class.getDeclaredField("bottomFillerLabel");
+            bottomFillerLabelField.setAccessible(true);
+            Composite bottomFillerLabel = (Composite) bottomFillerLabelField.get(this);
+            bottomFillerLabel.setVisible(false);
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return panel;
+    }
+
+    @Override
+    public void setMessage(String newMessage) {
+        if (useNewErrorStyle()) {
+            ExceptionHandler.log(newMessage);
+        } else {
+            super.setMessage(newMessage);
+        }
+    }
+
+    @Override
+    public void setMessage(String newMessage, int newType) {
+        if (useNewErrorStyle()) {
+            ExceptionHandler.log(newMessage);
+        } else {
+            super.setMessage(newMessage, newType);
+        }
+    }
+
+    @Override
+    public void setErrorMessage(String newErrorMessage) {
+        if (useNewErrorStyle()) {
+            ExceptionHandler.log(newErrorMessage);
+        } else {
+            super.setErrorMessage(newErrorMessage);
+        }
+    }
+
+    private boolean useNewErrorStyle() {
+        return this.useNewErrorStyle;
+    }
+
+    @Override
+    protected Control createDialogArea(Composite parent) {
+        Composite panel = (Composite) super.createDialogArea(parent);
+        Control[] children = panel.getChildren();
+        for (Control child : children) {
+            child.setBackground(ColorConstants.WHITE_COLOR);
+            if (child instanceof Label) {
+                int style = child.getStyle();
+                if (0 < (style & SWT.HORIZONTAL) && 0 < (style & SWT.SEPARATOR)) {
+                    child.setVisible(false);
+                }
+            }
+        }
+        return panel;
+    }
+
+    @Override
+    protected ProgressMonitorPart createProgressMonitorPart(Composite composite, GridLayout pmlayout) {
+        ProgressMonitorPart progMonitor = super.createProgressMonitorPart(composite, pmlayout);
+        progMonitor.setBackground(ColorConstants.WHITE_COLOR);
+        return progMonitor;
+    }
+
+    @Override
+    protected Control createButtonBar(Composite parent) {
+        Composite composite = new Composite(parent, SWT.NONE);
+        composite.setBackground(ColorConstants.WHITE_COLOR);
+        GridLayout layout = new GridLayout();
+        layout.marginWidth = 0;
+        layout.marginHeight = 0;
+        layout.horizontalSpacing = 0;
+        composite.setLayout(layout);
+        composite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+        composite.setFont(parent.getFont());
+
+        Control helpControl = null;
+        // create help control if needed
+        if (isHelpAvailable()) {
+            helpControl = createHelpControl(composite);
+            ((GridData) helpControl.getLayoutData()).horizontalIndent = convertHorizontalDLUsToPixels(
+                    IDialogConstants.HORIZONTAL_MARGIN);
+        }
+        createButtonsForButtonBar(composite);
+
+        Button helpButton = getButton(IDialogConstants.HELP_ID);
+        Button finishButton = getButton(IDialogConstants.FINISH_ID);
+        Button cancelButton = getButton(IDialogConstants.CANCEL_ID);
+        Button backButton = getButton(IDialogConstants.BACK_ID);
+        Button nextButton = getButton(IDialogConstants.NEXT_ID);
+
+        FormLayout formLayout = new FormLayout();
+        formLayout.marginWidth = 10;
+        formLayout.marginHeight = 20;
+        composite.setLayout(formLayout);
+        final int HORIZON_ALIGN = 5;
+
+        FormData cancelData = new FormData();
+        cancelData.left = new FormAttachment(0);
+        cancelData.top = new FormAttachment(composite, 0, SWT.CENTER);
+        cancelData.width = getButtonWidth(cancelButton);
+        cancelButton.setLayoutData(cancelData);
+
+        Control tmpCtrl = cancelButton;
+
+        if (helpControl != null) {
+            FormData formData = new FormData();
+            formData.left = new FormAttachment(tmpCtrl, HORIZON_ALIGN, SWT.RIGHT);
+            formData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
+            helpControl.setLayoutData(formData);
+            tmpCtrl = helpControl;
+        }
+        if (helpButton != null) {
+            FormData formData = new FormData();
+            formData.left = new FormAttachment(tmpCtrl, HORIZON_ALIGN, SWT.RIGHT);
+            formData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
+            formData.width = getButtonWidth(helpButton);
+            helpButton.setLayoutData(formData);
+            tmpCtrl = helpButton;
+        }
+        FormData finishData = new FormData();
+        finishData.right = new FormAttachment(100);
+        finishData.top = new FormAttachment(composite, 0, SWT.CENTER);
+        finishData.width = getButtonWidth(finishButton);
+        finishButton.setLayoutData(finishData);
+        tmpCtrl = finishButton;
+
+        if (nextButton != null) {
+            FormData nextData = new FormData();
+            Composite nextParentCtrl = nextButton.getParent();
+            nextData.right = new FormAttachment(tmpCtrl, -HORIZON_ALIGN, SWT.LEFT);
+            nextData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
+            nextParentCtrl.setLayoutData(nextData);
+        }
+        if (false) {
+            if (nextButton != null) {
+                FormData nextData = new FormData();
+                nextData.right = new FormAttachment(tmpCtrl, -HORIZON_ALIGN, SWT.LEFT);
+                nextData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
+                nextData.width = getButtonWidth(nextButton);
+                nextButton.setLayoutData(nextData);
+            }
+            if (backButton != null) {
+                FormData backData = new FormData();
+                backData.right = new FormAttachment(tmpCtrl, -HORIZON_ALIGN, SWT.LEFT);
+                backData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
+                backData.width = getButtonWidth(backButton);
+                backButton.setLayoutData(backData);
+            }
+        }
+
+        return composite;
+    }
+
+    private int getButtonWidth(Button btn) {
+        int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
+        Point minSize = btn.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
+        return Math.max(widthHint, minSize.x);
+    }
+
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/TitleAreaDialog.java

@@ -0,0 +1,693 @@
+// ============================================================================
+//
+// 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.dialogs;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jface.dialogs.TrayDialog;
+import org.eclipse.jface.resource.JFaceColors;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.window.ToolTip;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.ACC;
+import org.eclipse.swt.accessibility.AccessibleAttributeAdapter;
+import org.eclipse.swt.accessibility.AccessibleAttributeEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * A dialog that has a title area for displaying a title and an image as well as a common area for displaying a
+ * description, a message, or an error message.
+ * <p>
+ * This dialog class may be subclassed.
+ */
+public class TitleAreaDialog extends TrayDialog {
+
+    /**
+     * Image registry key for error message image.
+     */
+    public static final String DLG_IMG_TITLE_ERROR = DLG_IMG_MESSAGE_ERROR;
+
+    /**
+     * Image registry key for banner image (value <code>"dialog_title_banner_image"</code>).
+     */
+    public static final String DLG_IMG_TITLE_BANNER = "dialog_title_banner_image";//$NON-NLS-1$
+
+    /**
+     * Message type constant used to display an info icon with the message.
+     *
+     * @since 2.0
+     * @deprecated
+     */
+    @Deprecated
+    public static final String INFO_MESSAGE = "INFO_MESSAGE"; //$NON-NLS-1$
+
+    /**
+     * Message type constant used to display a warning icon with the message.
+     *
+     * @since 2.0
+     * @deprecated
+     */
+    @Deprecated
+    public static final String WARNING_MESSAGE = "WARNING_MESSAGE"; //$NON-NLS-1$
+
+    // Space between an image and a label
+    private static final int H_GAP_IMAGE = 5;
+
+    // Minimum dialog width (in dialog units)
+    private static final int MIN_DIALOG_WIDTH = 350;
+
+    // Minimum dialog height (in dialog units)
+    private static final int MIN_DIALOG_HEIGHT = 150;
+
+    protected Label titleLabel;
+
+    protected Label titleImageLabel;
+
+    protected Label bottomFillerLabel;
+
+    protected Label leftFillerLabel;
+
+    private RGB titleAreaRGB;
+
+    Color titleAreaColor;
+
+    protected String message = ""; //$NON-NLS-1$
+
+    protected String errorMessage;
+
+    protected Label messageLabel;
+
+    protected Composite workArea;
+
+    protected Label messageImageLabel;
+
+    protected Image messageImage;
+
+    private boolean showingError = false;
+
+    private boolean titleImageLargest = true;
+
+    private int messageLabelHeight;
+
+    protected Image titleAreaImage;
+
+    /**
+     * Instantiate a new title area dialog.
+     *
+     * @param parentShell the parent SWT shell
+     */
+    public TitleAreaDialog(Shell parentShell) {
+        super(parentShell);
+    }
+
+    /*
+     * @see Dialog.createContents(Composite)
+     */
+    @Override
+    protected Control createContents(Composite parent) {
+        // create the overall composite
+        Composite contents = new Composite(parent, SWT.NONE);
+        contents.setLayoutData(new GridData(GridData.FILL_BOTH));
+        // initialize the dialog units
+        initializeDialogUnits(contents);
+        FormLayout layout = new FormLayout();
+        contents.setLayout(layout);
+        // Now create a work area for the rest of the dialog
+        workArea = new Composite(contents, SWT.NONE);
+//        workArea.setBackground(ColorConstants.RED_COLOR);
+        GridLayout childLayout = new GridLayout();
+        childLayout.marginHeight = 0;
+        childLayout.marginWidth = 0;
+        childLayout.verticalSpacing = 0;
+        workArea.setLayout(childLayout);
+        Control top = createTitleArea(contents);
+        resetWorkAreaAttachments(top);
+        workArea.setFont(JFaceResources.getDialogFont());
+        // initialize the dialog units
+        initializeDialogUnits(workArea);
+        // create the dialog area and button bar
+        dialogArea = createDialogArea(workArea);
+        buttonBar = createButtonBar(workArea);
+
+        // need to react to new size of title area
+        getShell().addListener(SWT.Resize, event -> layoutForNewMessage(true));
+        return contents;
+    }
+
+    /**
+     * Creates and returns the contents of the upper part of this dialog (above the button bar).
+     * <p>
+     * The <code>Dialog</code> implementation of this framework method creates and returns a new <code>Composite</code>
+     * with no margins and spacing. Subclasses should override.
+     * </p>
+     *
+     * @param parent The parent composite to contain the dialog area
+     * @return the dialog area control
+     */
+    @Override
+    protected Control createDialogArea(Composite parent) {
+        // create the top level composite for the dialog area
+        Composite composite = new Composite(parent, SWT.NONE);
+        GridLayout layout = new GridLayout();
+        layout.marginHeight = 0;
+        layout.marginWidth = 0;
+        layout.verticalSpacing = 0;
+        layout.horizontalSpacing = 0;
+        composite.setLayout(layout);
+        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+        composite.setFont(parent.getFont());
+        // Build the separator line
+        titleBarSeparator = new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
+        titleBarSeparator.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+        return composite;
+    }
+
+    protected Label titleBarSeparator;
+
+    /**
+     * Creates the dialog's title area.
+     *
+     * @param parent the SWT parent for the title area widgets
+     * @return Control with the highest x axis value.
+     */
+    protected Control createTitleArea(Composite parent) {
+
+        // Determine the background color of the title bar
+        Display display = parent.getDisplay();
+        Color background;
+        Color foreground;
+        if (titleAreaRGB != null) {
+            titleAreaColor = new Color(display, titleAreaRGB);
+            background = titleAreaColor;
+            foreground = null;
+        } else {
+            background = JFaceColors.getBannerBackground(display);
+            foreground = JFaceColors.getBannerForeground(display);
+        }
+
+        parent.setBackground(background);
+        int verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
+        int horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
+        // Dialog image @ right
+        titleImageLabel = new Label(parent, SWT.CENTER);
+        titleImageLabel.setBackground(background);
+        if (titleAreaImage == null || titleAreaImage.isDisposed())
+            titleImageLabel.setImage(JFaceResources.getImage(DLG_IMG_TITLE_BANNER));
+        else
+            titleImageLabel.setImage(titleAreaImage);
+
+        FormData imageData = new FormData();
+        imageData.top = new FormAttachment(0, 0);
+        // Note: do not use horizontalSpacing on the right as that would be a
+        // regression from
+        // the R2.x style where there was no margin on the right and images are
+        // flush to the right
+        // hand side. see reopened comments in 41172
+        imageData.right = new FormAttachment(100, 0); // horizontalSpacing
+        titleImageLabel.setLayoutData(imageData);
+        // Title label @ top, left
+        titleLabel = new Label(parent, SWT.LEFT);
+        JFaceColors.setColors(titleLabel, foreground, background);
+        titleLabel.setFont(JFaceResources.getBannerFont());
+        titleLabel.setText(" ");//$NON-NLS-1$
+        FormData titleData = new FormData();
+        titleData.top = new FormAttachment(0, verticalSpacing);
+        titleData.right = new FormAttachment(titleImageLabel);
+        titleData.left = new FormAttachment(0, horizontalSpacing);
+        titleLabel.setLayoutData(titleData);
+        // Message image @ bottom, left
+        messageImageLabel = new Label(parent, SWT.CENTER);
+        messageImageLabel.setBackground(background);
+        // Message label @ bottom, center
+        // messageLabel = new Text(parent, SWT.WRAP | SWT.READ_ONLY);
+        messageLabel = new Label(parent, SWT.WRAP);
+        JFaceColors.setColors(messageLabel, foreground, background);
+        messageLabel.setText(" \n "); // two lines//$NON-NLS-1$
+        messageLabel.setFont(JFaceResources.getDialogFont());
+        // Bug 248410 - This snippet will only work with Windows screen readers.
+        messageLabel.getAccessible().addAccessibleAttributeListener(new AccessibleAttributeAdapter() {
+
+            @Override
+            public void getAttributes(AccessibleAttributeEvent e) {
+                e.attributes = new String[] { "container-live", //$NON-NLS-1$
+                        "polite", "live", "polite", //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
+                        "container-live-role", "status", }; //$NON-NLS-1$ //$NON-NLS-2$
+            }
+        });
+        messageLabelHeight = messageLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
+        // Filler labels
+        leftFillerLabel = new Label(parent, SWT.CENTER);
+        leftFillerLabel.setBackground(background);
+        bottomFillerLabel = new Label(parent, SWT.CENTER);
+        bottomFillerLabel.setBackground(background);
+        setLayoutsForNormalMessage(verticalSpacing, horizontalSpacing);
+        determineTitleImageLargest();
+        if (titleImageLargest)
+            return titleImageLabel;
+        return messageLabel;
+    }
+
+    /**
+     * Determine if the title image is larger than the title message and message area. This is used for layout
+     * decisions.
+     */
+    private void determineTitleImageLargest() {
+        int titleY = titleImageLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
+        int verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
+        int labelY = titleLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
+        labelY += verticalSpacing;
+        labelY += messageLabelHeight;
+        labelY += verticalSpacing;
+        titleImageLargest = titleY > labelY;
+    }
+
+    /**
+     * Set the layout values for the messageLabel, messageImageLabel and fillerLabel for the case where there is a
+     * normal message.
+     *
+     * @param verticalSpacing int The spacing between widgets on the vertical axis.
+     * @param horizontalSpacing int The spacing between widgets on the horizontal axis.
+     */
+    protected void setLayoutsForNormalMessage(int verticalSpacing, int horizontalSpacing) {
+        FormData messageImageData = new FormData();
+        messageImageData.top = new FormAttachment(titleLabel, verticalSpacing);
+        messageImageData.left = new FormAttachment(0, H_GAP_IMAGE);
+        messageImageLabel.setLayoutData(messageImageData);
+        FormData messageLabelData = new FormData();
+        messageLabelData.top = new FormAttachment(titleLabel, verticalSpacing);
+        messageLabelData.right = new FormAttachment(titleImageLabel);
+        messageLabelData.left = new FormAttachment(messageImageLabel, horizontalSpacing);
+        messageLabelData.height = messageLabelHeight;
+        if (titleImageLargest)
+            messageLabelData.bottom = new FormAttachment(titleImageLabel, 0, SWT.BOTTOM);
+        messageLabel.setLayoutData(messageLabelData);
+        FormData fillerData = new FormData();
+        fillerData.left = new FormAttachment(0, horizontalSpacing);
+        fillerData.top = new FormAttachment(messageImageLabel, 0);
+        fillerData.bottom = new FormAttachment(messageLabel, 0, SWT.BOTTOM);
+        bottomFillerLabel.setLayoutData(fillerData);
+        FormData data = new FormData();
+        data.top = new FormAttachment(messageImageLabel, 0, SWT.TOP);
+        data.left = new FormAttachment(0, 0);
+        data.bottom = new FormAttachment(messageImageLabel, 0, SWT.BOTTOM);
+        data.right = new FormAttachment(messageImageLabel, 0);
+        leftFillerLabel.setLayoutData(data);
+    }
+
+    /**
+     * The <code>TitleAreaDialog</code> implementation of this <code>Window</code> methods returns an initial size which
+     * is at least some reasonable minimum.
+     *
+     * @return the initial size of the dialog
+     */
+    @Override
+    protected Point getInitialSize() {
+        Point shellSize = super.getInitialSize();
+        return new Point(Math.max(convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
+                Math.max(convertVerticalDLUsToPixels(MIN_DIALOG_HEIGHT), shellSize.y));
+    }
+
+    /**
+     * Retained for backward compatibility.
+     *
+     * Returns the title area composite. There is no composite in this implementation so the shell is returned.
+     *
+     * @return Composite
+     * @deprecated
+     */
+    @Deprecated
+    protected Composite getTitleArea() {
+        return getShell();
+    }
+
+    /**
+     * Returns the title image label.
+     *
+     * @return the title image label
+     */
+    protected Label getTitleImageLabel() {
+        return titleImageLabel;
+    }
+
+    /**
+     * Display the given error message. The currently displayed message is saved and will be redisplayed when the error
+     * message is set to <code>null</code>.
+     *
+     * @param newErrorMessage the newErrorMessage to display or <code>null</code>
+     */
+    public void setErrorMessage(String newErrorMessage) {
+        // Any change?
+        if (errorMessage == null ? newErrorMessage == null : errorMessage.equals(newErrorMessage))
+            return;
+        errorMessage = newErrorMessage;
+
+        // Clear or set error message.
+        if (errorMessage == null) {
+            if (showingError) {
+                // we were previously showing an error
+                showingError = false;
+            }
+            // show the message
+            // avoid calling setMessage in case it is overridden to call
+            // setErrorMessage,
+            // which would result in a recursive infinite loop
+            if (message == null) // this should probably never happen since
+                // setMessage does this conversion....
+                message = ""; //$NON-NLS-1$
+            updateMessage(message);
+            messageImageLabel.setImage(messageImage);
+            setImageLabelVisible(messageImage != null);
+        } else {
+            // Add in a space for layout purposes but do not
+            // change the instance variable
+            String displayedErrorMessage = " " + errorMessage; //$NON-NLS-1$
+            updateMessage(displayedErrorMessage);
+            if (!showingError) {
+                // we were not previously showing an error
+                showingError = true;
+                messageImageLabel.setImage(JFaceResources.getImage(DLG_IMG_TITLE_ERROR));
+                setImageLabelVisible(true);
+            }
+        }
+        layoutForNewMessage(false);
+    }
+
+    /**
+     * Re-layout the labels for the new message.
+     *
+     * @param forceLayout <code>true</code> to force a layout of the shell
+     */
+    protected void layoutForNewMessage(boolean forceLayout) {
+        int verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
+        int horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
+        // If there are no images then layout as normal
+        if (errorMessage == null && messageImage == null) {
+            setImageLabelVisible(false);
+            setLayoutsForNormalMessage(verticalSpacing, horizontalSpacing);
+        } else {
+            messageImageLabel.setVisible(true);
+            bottomFillerLabel.setVisible(true);
+            leftFillerLabel.setVisible(true);
+            /**
+             * Note that we do not use horizontalSpacing here as when the background of the messages changes there will
+             * be gaps between the icon label and the message that are the background color of the shell. We add a
+             * leading space elsewhere to compendate for this.
+             */
+            FormData data = new FormData();
+            data.left = new FormAttachment(0, H_GAP_IMAGE);
+            data.top = new FormAttachment(titleLabel, verticalSpacing);
+            messageImageLabel.setLayoutData(data);
+            data = new FormData();
+            data.top = new FormAttachment(messageImageLabel, 0);
+            data.left = new FormAttachment(0, 0);
+            data.bottom = new FormAttachment(messageLabel, 0, SWT.BOTTOM);
+            data.right = new FormAttachment(messageImageLabel, 0, SWT.RIGHT);
+            bottomFillerLabel.setLayoutData(data);
+            data = new FormData();
+            data.top = new FormAttachment(messageImageLabel, 0, SWT.TOP);
+            data.left = new FormAttachment(0, 0);
+            data.bottom = new FormAttachment(messageImageLabel, 0, SWT.BOTTOM);
+            data.right = new FormAttachment(messageImageLabel, 0);
+            leftFillerLabel.setLayoutData(data);
+            FormData messageLabelData = new FormData();
+            messageLabelData.top = new FormAttachment(titleLabel, verticalSpacing);
+            messageLabelData.right = new FormAttachment(titleImageLabel);
+            messageLabelData.left = new FormAttachment(messageImageLabel, 0);
+            messageLabelData.height = messageLabelHeight;
+            if (titleImageLargest)
+                messageLabelData.bottom = new FormAttachment(titleImageLabel, 0, SWT.BOTTOM);
+            messageLabel.setLayoutData(messageLabelData);
+        }
+
+        if (forceLayout) {
+            getShell().layout();
+        } else {
+            // Do not layout before the dialog area has been created
+            // to avoid incomplete calculations.
+            if (dialogArea != null)
+                workArea.getParent().layout(true);
+        }
+
+        Point messageSize = messageLabel.getSize();
+        int messageLabelUnclippedHeight = messageLabel.computeSize(messageSize.x, SWT.DEFAULT, true).y;
+        boolean messageLabelClipped = messageLabelUnclippedHeight > messageSize.y;
+        if (messageLabel.getData() instanceof ToolTip) {
+            ToolTip toolTip = (ToolTip) messageLabel.getData();
+            toolTip.hide();
+            toolTip.deactivate();
+            messageLabel.setData(null);
+        }
+        if (messageLabelClipped) {
+            ToolTip tooltip = new ToolTip(messageLabel, ToolTip.NO_RECREATE, false) {
+
+                @Override
+                protected Composite createToolTipContentArea(Event event, Composite parent) {
+                    Composite result = new Composite(parent, SWT.NONE);
+                    result.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+                    result.setLayout(new GridLayout());
+                    Text text = new Text(result, SWT.WRAP);
+                    text.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+                    text.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_FOREGROUND));
+                    text.setText(messageLabel.getText());
+                    GridData gridData = new GridData();
+                    gridData.widthHint = messageSize.x;
+                    text.setLayoutData(gridData);
+                    Dialog.applyDialogFont(result);
+                    return result;
+                }
+
+                @Override
+                public Point getLocation(Point tipSize, Event event) {
+                    return messageLabel.getShell().toDisplay(messageLabel.getLocation());
+                }
+            };
+            messageLabel.setData(tooltip);
+            tooltip.setPopupDelay(0);
+            tooltip.activate();
+        }
+    }
+
+    /**
+     * Set the message text. If the message line currently displays an error, the message is saved and will be
+     * redisplayed when the error message is set to <code>null</code>.
+     * <p>
+     * Shortcut for <code>setMessage(newMessage, IMessageProvider.NONE)</code>
+     * </p>
+     * This method should be called after the dialog has been opened as it updates the message label immediately.
+     *
+     * @param newMessage the message, or <code>null</code> to clear the message
+     */
+    public void setMessage(String newMessage) {
+        setMessage(newMessage, IMessageProvider.NONE);
+    }
+
+    /**
+     * Sets the message for this dialog with an indication of what type of message it is.
+     * <p>
+     * The valid message types are one of <code>NONE</code>, <code>INFORMATION</code>,<code>WARNING</code>, or
+     * <code>ERROR</code>.
+     * </p>
+     * <p>
+     * Note that for backward compatibility, a message of type <code>ERROR</code> is different than an error message
+     * (set using <code>setErrorMessage</code>). An error message overrides the current message until the error message
+     * is cleared. This method replaces the current message and does not affect the error message.
+     * </p>
+     *
+     * @param newMessage the message, or <code>null</code> to clear the message
+     * @param newType the message type
+     * @since 2.0
+     */
+    public void setMessage(String newMessage, int newType) {
+        Image newImage = null;
+        if (newMessage != null) {
+            switch (newType) {
+            case IMessageProvider.NONE:
+                break;
+            case IMessageProvider.INFORMATION:
+                newImage = JFaceResources.getImage(DLG_IMG_MESSAGE_INFO);
+                break;
+            case IMessageProvider.WARNING:
+                newImage = JFaceResources.getImage(DLG_IMG_MESSAGE_WARNING);
+                break;
+            case IMessageProvider.ERROR:
+                newImage = JFaceResources.getImage(DLG_IMG_MESSAGE_ERROR);
+                break;
+            }
+        }
+        showMessage(newMessage, newImage);
+    }
+
+    /**
+     * Show the new message and image.
+     *
+     * @param newMessage
+     * @param newImage
+     */
+    protected void showMessage(String newMessage, Image newImage) {
+        // https://bugs.eclipse.org/bugs/show_bug.cgi?id=249915
+        if (newMessage == null)
+            newMessage = ""; //$NON-NLS-1$
+
+        // Any change?
+        if (message.equals(newMessage) && messageImage == newImage) {
+            return;
+        }
+        message = newMessage;
+
+        // Message string to be shown - if there is an image then add in
+        // a space to the message for layout purposes
+        String shownMessage = (newImage == null) ? message : " " + message; //$NON-NLS-1$
+        messageImage = newImage;
+        if (!showingError) {
+            // we are not showing an error
+            updateMessage(shownMessage);
+            messageImageLabel.setImage(messageImage);
+            setImageLabelVisible(messageImage != null);
+            layoutForNewMessage(false);
+        }
+    }
+
+    /**
+     * Update the contents of the messageLabel.
+     *
+     * @param newMessage the message to use
+     */
+    protected void updateMessage(String newMessage) {
+        String oldMessage = messageLabel.getText();
+        messageLabel.setText(newMessage);
+        // Bug 248410 - This snippet will only work with Windows screen readers.
+        messageLabel.getAccessible().sendEvent(ACC.EVENT_ATTRIBUTE_CHANGED, null);
+        messageLabel.getAccessible().sendEvent(ACC.EVENT_TEXT_CHANGED, new Object[] { Integer.valueOf(ACC.TEXT_DELETE),
+                Integer.valueOf(0), Integer.valueOf(oldMessage.length()), oldMessage });
+        messageLabel.getAccessible().sendEvent(ACC.EVENT_TEXT_CHANGED, new Object[] { Integer.valueOf(ACC.TEXT_INSERT),
+                Integer.valueOf(0), Integer.valueOf(newMessage.length()), newMessage });
+    }
+
+    /**
+     * Sets the title to be shown in the title area of this dialog.
+     *
+     * @param newTitle the title show
+     */
+    public void setTitle(String newTitle) {
+        if (titleLabel == null)
+            return;
+        String title = newTitle;
+        if (title == null)
+            title = "";//$NON-NLS-1$
+        titleLabel.setText(title);
+    }
+
+    /**
+     * Sets the title bar color for this dialog.
+     *
+     * @param color the title bar color
+     */
+    public void setTitleAreaColor(RGB color) {
+        titleAreaRGB = color;
+    }
+
+    /**
+     * Sets the title image to be shown in the title area of this dialog.
+     *
+     * @param newTitleImage the title image to be shown
+     */
+    public void setTitleImage(Image newTitleImage) {
+
+        titleAreaImage = newTitleImage;
+        if (titleImageLabel != null) {
+            titleImageLabel.setImage(newTitleImage);
+            determineTitleImageLargest();
+            Control top;
+            if (titleImageLargest)
+                top = titleImageLabel;
+            else
+                top = messageLabel;
+            resetWorkAreaAttachments(top);
+        }
+    }
+
+    /**
+     * Make the label used for displaying error images visible depending on boolean.
+     *
+     * @param visible If <code>true</code> make the image visible, if not then make it not visible.
+     */
+    protected void setImageLabelVisible(boolean visible) {
+        messageImageLabel.setVisible(visible);
+        bottomFillerLabel.setVisible(visible);
+        leftFillerLabel.setVisible(visible);
+    }
+
+    /**
+     * Reset the attachment of the workArea to now attach to top as the top control.
+     *
+     * @param top
+     */
+    protected void resetWorkAreaAttachments(Control top) {
+        FormData childData = new FormData();
+        childData.top = new FormAttachment(top);
+        childData.right = new FormAttachment(100, 0);
+        childData.left = new FormAttachment(0, 0);
+        childData.bottom = new FormAttachment(100, 0);
+        workArea.setLayoutData(childData);
+    }
+
+    /**
+     * Returns the current message text for this dialog. This message is displayed in the message line of the dialog
+     * when the error message is <code>null</code>. If there is a non-null error message, this message is not shown, but
+     * is stored so that it can be shown in the message line whenever {@link #setErrorMessage(String)} is called with a
+     * <code>null</code> parameter.
+     *
+     * @return the message text, which is never <code>null</code>.
+     *
+     * @see #setMessage(String)
+     * @see #setErrorMessage(String)
+     *
+     * @since 3.6
+     */
+
+    public String getMessage() {
+        return message;
+    }
+
+    /**
+     * Returns the current error message being shown in the dialog, or <code>null</code> if there is no error message
+     * being shown.
+     *
+     * @return the error message, which may be <code>null</code>.
+     *
+     * @see #setErrorMessage(String)
+     * @see #setMessage(String)
+     *
+     * @since 3.6
+     */
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/extended/table/AbstractExtendedTableViewer.java

@@ -20,12 +20,14 @@ import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.RowLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Table;
+import org.talend.commons.ui.runtime.ITalendThemeService;
 import org.talend.commons.ui.runtime.swt.tableviewer.TableViewerCreatorNotModifiable.LAYOUT_MODE;
 import org.talend.commons.ui.runtime.swt.tableviewer.selection.ILineSelectionListener;
 import org.talend.commons.ui.runtime.swt.tableviewer.selection.LineSelectionEvent;
@@ -156,6 +158,7 @@ public abstract class AbstractExtendedTableViewer<B> extends AbstractExtendedCon
         final Table table = getTableViewerCreator().getTable();
         final ILineSelectionListener beforeLineSelectionListener = new ILineSelectionListener() {
 
+            @Override
             public void handle(LineSelectionEvent e) {
                 if (e.selectionByMethod && !selectionHelper.isMouseSelectionning() && !forceExecuteSelectionEvent) {
                     executeSelectionEvent = false;
@@ -166,6 +169,7 @@ public abstract class AbstractExtendedTableViewer<B> extends AbstractExtendedCon
         };
         final ILineSelectionListener afterLineSelectionListener = new ILineSelectionListener() {
 
+            @Override
             public void handle(LineSelectionEvent e) {
                 executeSelectionEvent = true;
             }
@@ -175,6 +179,7 @@ public abstract class AbstractExtendedTableViewer<B> extends AbstractExtendedCon
 
         DisposeListener disposeListener = new DisposeListener() {
 
+            @Override
             public void widgetDisposed(DisposeEvent e) {
                 selectionHelper.removeBeforeSelectionListener(beforeLineSelectionListener);
                 selectionHelper.removeAfterSelectionListener(afterLineSelectionListener);
@@ -185,6 +190,7 @@ public abstract class AbstractExtendedTableViewer<B> extends AbstractExtendedCon
 
         table.addListener(SWT.KeyUp, new Listener() {
 
+            @Override
             public void handleEvent(Event event) {
 
                 if (event.character == '\u0001') { // CTRL + A
@@ -251,7 +257,9 @@ public abstract class AbstractExtendedTableViewer<B> extends AbstractExtendedCon
         newTableViewerCreator.setLazyLoad(TableViewerCreator.getRecommandLazyLoad());
         newTableViewerCreator.setFirstVisibleColumnIsSelection(false);
         newTableViewerCreator.setCheckboxInFirstColumn(false);
-        newTableViewerCreator.setBgColorForEmptyArea(getParentComposite().getDisplay().getSystemColor(SWT.COLOR_WHITE));
+        Color bgColorForEmptyArea = ITalendThemeService.getColor("org.talend.commons.ui.BgColorForEmptyArea")
+                .orElse(getParentComposite().getDisplay().getSystemColor(SWT.COLOR_WHITE));
+        newTableViewerCreator.setBgColorForEmptyArea(bgColorForEmptyArea);
     }
 
     /**
@@ -271,6 +279,7 @@ public abstract class AbstractExtendedTableViewer<B> extends AbstractExtendedCon
 
             getExtendedTableModel().addBeforeOperationListListener(1, new IListenableListListener() {
 
+                @Override
                 public void handleEvent(ListenableListEvent event) {
                     handleBeforeListenableListOperationEvent(event);
                 }
@@ -279,6 +288,7 @@ public abstract class AbstractExtendedTableViewer<B> extends AbstractExtendedCon
 
             getExtendedTableModel().addAfterOperationListListener(1, new IListenableListListener() {
 
+                @Override
                 public void handleEvent(ListenableListEvent event) {
                     handleAfterListenableListOperationEvent(event);
                 }
@@ -287,6 +297,7 @@ public abstract class AbstractExtendedTableViewer<B> extends AbstractExtendedCon
 
             getExtendedTableModel().addAfterOperationListListener(100, new IListenableListListener<B>() {
 
+                @Override
                 public void handleEvent(ListenableListEvent<B> event) {
                     if (tableViewerCreator.getTable() != null && !tableViewerCreator.getTable().isDisposed()) {
                         // tableViewerCreator.getTable().forceFocus();
@@ -368,6 +379,7 @@ public abstract class AbstractExtendedTableViewer<B> extends AbstractExtendedCon
                 tableViewerCreator.setInputList(getBeansList());
                 new AsynchronousThreading(100, true, tableViewerCreator.getTable().getDisplay(), new Runnable() {
 
+                    @Override
                     public void run() {
                         tableViewerCreator.layout();
                     }