feat(TUP-38544): fix pommissing=true issue

* fix(TUP-40250):Replace GAV from org.talend.libraries with official GAV.

* fix(TUP-40590): Type in mvn uri has higher priority than pom.xml.

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.core.feature/feature.xml

@@ -26,9 +26,8 @@
     <import feature="org.talend.utils.feature" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="javax.activation" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="javax.mail" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="javax.xml.bind" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="javax.xml.soap" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="javax.xml.ws" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="jakarta.xml.bind" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="jakarta.xml.soap-api" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="net.jeeeyul.eclipse.themes" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="net.jeeeyul.swtend" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.apache.commons.collections" version="0.0.0" match="greaterOrEqual"/>

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

@@ -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.platform.feature/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.talend.platform.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

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

@@ -18,508 +18,8 @@
    </license>
 
    <includes
-         id="org.eclipse.rcp"
-         version="4.20.0.v20210611-1600"/>
-
-   <includes
-         id="org.eclipse.equinox.p2.user.ui"
-         version="2.4.1200.v20210507-0825"
+         id="org.eclipse.platform"
+         version="0.0.0"
          optional="true"/>
 
-   <includes
-         id="org.eclipse.help"
-         version="2.3.600.v20210611-1600"/>
-
-   <plugin
-         id="org.apache.ant"
-         download-size="3025"
-         install-size="3540"
-         version="1.10.10.v20210426-1926"/>
-
-   <plugin
-         id="org.eclipse.ant.core"
-         download-size="105"
-         install-size="186"
-         version="3.6.0.v20210415-1314"
-         unpack="false"/>
-
-   <plugin
-         id="com.jcraft.jsch"
-         download-size="297"
-         install-size="539"
-         version="0.1.55.v20190404-1902"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.compare.core"
-         download-size="66"
-         install-size="127"
-         version="3.6.1000.v20201020-1107"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.compare"
-         download-size="789"
-         install-size="1572"
-         version="3.8.0.v20210415-0713"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.compare.win32"
-         os="win32"
-         download-size="43"
-         install-size="77"
-         version="1.2.800.v20200127-1343"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filebuffers"
-         download-size="113"
-         install-size="244"
-         version="3.7.0.v20210512-1543"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem"
-         download-size="68"
-         install-size="128"
-         version="1.9.0.v20210419-1155"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.net"
-         download-size="64"
-         install-size="124"
-         version="1.3.1100.v20210424-0724"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.net.linux"
-         os="linux"
-         download-size="14"
-         install-size="22"
-         version="1.0.0.v20210424-0724"
-         fragment="true"
-         unpack="false"/>
-   
-   <plugin
-         id="org.eclipse.core.net.linux.x86_64"
-         os="linux"
-         arch="x86_64"
-         download-size="7"
-         install-size="11"
-         version="1.2.500.v20210510-1619"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.net.win32.x86_64"
-         os="win32"
-         arch="x86_64"
-         download-size="34"
-         install-size="63"
-         version="1.1.500.v20190925-1337"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.resources"
-         download-size="877"
-         install-size="1912"
-         version="3.15.0.v20210521-0722"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.osgi.util"
-         download-size="71"
-         install-size="148"
-         version="3.6.0.v20210212-1137"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.debug.core"
-         download-size="387"
-         install-size="807"
-         version="3.18.100.v20210511-0446"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.debug.ui"
-         download-size="2979"
-         install-size="6065"
-         version="3.15.0.v20210525-1810"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.e4.ui.ide"
-         download-size="11"
-         install-size="15"
-         version="3.15.200.v20210108-1832"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.event"
-         download-size="32"
-         install-size="58"
-         version="1.6.0.v20210212-1143"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ltk.core.refactoring"
-         download-size="335"
-         install-size="757"
-         version="3.11.400.v20210427-0555"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ltk.ui.refactoring"
-         download-size="461"
-         install-size="953"
-         version="3.11.400.v20210320-1132"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.platform"
-         download-size="637"
-         install-size="959"
-         version="4.20.0.v20210611-1600"/>
-
-   <plugin
-         id="org.eclipse.platform.doc.user"
-         download-size="6712"
-         install-size="9296"
-         version="4.20.0.v20210530-2150"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.search"
-         download-size="533"
-         install-size="1043"
-         version="3.13.200.v20210419-1029"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.text.quicksearch"
-         download-size="94"
-         install-size="184"
-         version="1.1.100.v20210426-1601"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.team.core"
-         download-size="395"
-         install-size="847"
-         version="3.9.0.v20210510-1748"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.team.ui"
-         download-size="1428"
-         install-size="3017"
-         version="3.9.0.v20210426-0837"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.text"
-         download-size="288"
-         install-size="577"
-         version="3.12.0.v20210512-1644"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jface.text"
-         download-size="1021"
-         install-size="2137"
-         version="3.18.0.v20210512-1640"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jsch.core"
-         download-size="40"
-         install-size="75"
-         version="1.3.900.v20200422-1935"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jsch.ui"
-         download-size="91"
-         install-size="180"
-         version="1.4.0.v20210426-0843"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.console"
-         download-size="205"
-         install-size="378"
-         version="3.11.0.v20210510-1914"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.intro"
-         download-size="337"
-         install-size="661"
-         version="3.6.200.v20210409-1747"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.intro.universal"
-         download-size="2144"
-         install-size="2741"
-         version="3.4.200.v20210409-1747"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.cheatsheets"
-         download-size="379"
-         install-size="733"
-         version="3.7.300.v20210507-0822"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.browser"
-         download-size="203"
-         install-size="337"
-         version="3.6.1100.v20210118-1327"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.genericeditor"
-         download-size="143"
-         install-size="341"
-         version="1.2.0.v20210129-1224"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.monitoring"
-         download-size="59"
-         install-size="110"
-         version="1.2.0.v20210111-1353"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.navigator"
-         download-size="416"
-         install-size="876"
-         version="3.10.100.v20210415-0924"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.navigator.resources"
-         download-size="169"
-         install-size="348"
-         version="3.8.100.v20210319-0848"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.net"
-         download-size="45"
-         install-size="84"
-         version="1.4.0.v20210426-0838"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.workbench.texteditor"
-         download-size="653"
-         install-size="1376"
-         version="3.16.100.v20210512-1009"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.views"
-         download-size="104"
-         install-size="187"
-         version="3.11.0.v20210111-1351"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.editors"
-         download-size="607"
-         install-size="1344"
-         version="3.14.100.v20210513-1110"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.externaltools"
-         download-size="143"
-         install-size="275"
-         version="3.5.0.v20210510-1849"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.ide"
-         download-size="2421"
-         install-size="4780"
-         version="3.18.200.v20210523-1724"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.ide.application"
-         download-size="110"
-         install-size="214"
-         version="1.4.100.v20210506-1050"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.win32"
-         ws="win32"
-         download-size="22"
-         install-size="41"
-         version="3.4.400.v20200414-1247"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.linux.x86_64"
-         os="linux"
-         arch="x86_64"
-         download-size="11"
-         install-size="21"
-         version="1.2.300.v20180828-0158"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.macosx"
-         os="macosx"
-         download-size="25"
-         install-size="160"
-         version="1.3.300.v20210427-1937"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.resources.win32.x86_64"
-         os="win32"
-         arch="x86_64"
-         download-size="57"
-         install-size="109"
-         version="3.5.400.v20190812-0909"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.win32.x86_64"
-         os="win32"
-         arch="x86_64"
-         download-size="37"
-         install-size="73"
-         version="1.4.200.v20190812-0909"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.variables"
-         download-size="35"
-         install-size="64"
-         version="3.5.0.v20210510-1945"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.forms"
-         download-size="323"
-         install-size="642"
-         version="3.11.100.v20210108-1139"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.views.properties.tabbed"
-         download-size="107"
-         install-size="217"
-         version="3.9.100.v20201223-1348"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.security"
-         download-size="110"
-         install-size="230"
-         version="1.3.600.v20210126-1005"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.security.ui"
-         download-size="167"
-         install-size="318"
-         version="1.3.0.v20210121-0947"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.security.win32.x86_64"
-         os="win32"
-         arch="x86_64"
-         download-size="40"
-         install-size="74"
-         version="1.1.200.v20190812-0919"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.security.macosx"
-         os="macosx"
-         download-size="28"
-         install-size="165"
-         version="1.101.400.v20210427-1958"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.security.linux"
-         os="linux"
-         download-size="23"
-         install-size="35"
-         version="1.0.100.v20210419-1942"
-         fragment="true"
-         unpack="false"/>
-   
-   <plugin
-         id="org.eclipse.equinox.security.linux.x86_64"
-         os="linux"
-         arch="x86_64"
-         download-size="7"
-         install-size="11"
-         version="1.1.500.v20210125-1508"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.externaltools"
-         download-size="42"
-         install-size="80"
-         version="1.2.0.v20210510-1841"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.runtime"
-         download-size="69"
-         install-size="149"
-         version="3.22.0.v20210506-1025"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.intro.quicklinks"
-         download-size="23"
-         install-size="43"
-         version="1.1.100.v20210315-0954"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.team.genericeditor.diff.extension"
-         download-size="16"
-         install-size="23"
-         version="1.1.0.v20210426-0951"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.urischeme"
-         download-size="51"
-         install-size="98"
-         version="1.1.400.v20210407-1558"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.views.log"
-         download-size="169"
-         install-size="292"
-         version="1.2.1500.v20210315-1034"
-         unpack="false"/>
-
 </feature>

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

@@ -5,7 +5,6 @@
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license url="http://www.example.com/license">[Enter License Description here.]</license>  
   <requires>
-    <import plugin="org.bouncycastle.bcprov" version="1.70.0" match="greaterOrEqual"/>
     <import plugin="com.cedarsoftware.json-io" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="com.fasterxml.jackson.core.jackson-annotations" version="2.9.0" match="greaterOrEqual"/>
     <import plugin="com.fasterxml.jackson.core.jackson-core" version="2.9.8" match="greaterOrEqual"/>
@@ -17,7 +16,7 @@
     <import plugin="org.apache.commons.lang" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.apache.commons.lang3" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.apache.log4j" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.apache.servicemix.bundles.avro" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="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.binding.log4j12" version="0.0.0" match="greaterOrEqual"/>

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

@@ -9,4 +9,7 @@
   </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

@@ -11,9 +11,12 @@ Require-Bundle: org.eclipse.core.runtime,
  org.talend.libraries.apache,
  org.talend.commons.runtime,
  org.talend.libraries.ui,
- org.apache.ant
+ org.apache.ant,
+ org.eclipse.jface,
+ org.apache.commons.lang3
 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,
@@ -34,7 +37,8 @@ Export-Package:
  org.talend.commons.ui.runtime.update,
  org.talend.commons.ui.runtime.utils,
  org.talend.commons.ui.runtime.ws
-Import-Package: org.eclipse.jface.bindings.keys,
+Import-Package: org.eclipse.gef.commands,
+ org.eclipse.jface.bindings.keys,
  org.eclipse.jface.dialogs,
  org.eclipse.jface.fieldassist,
  org.eclipse.jface.resource,
@@ -53,3 +57,4 @@ Import-Package: org.eclipse.jface.bindings.keys,
 Bundle-Activator: org.talend.commons.ui.runtime.CommonUIPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: .Talend SA.
+Automatic-Module-Name: org.talend.common.ui.runtime

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/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);
@@ -29,6 +37,8 @@ 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 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);
 
@@ -45,4 +55,19 @@ public interface ColorConstants {
 
     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,114 @@
+// ============================================================================
+//
+// 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;
+    }
+
+    /**
+     * should try to refactor them to different fragment
+     */
+    @Deprecated
+    public <T extends IBusinessHandler> T run(IStudioRunnable<T> studioRun, ICustomUI<T> stigmaRun) {
+        if (isStudio()) {
+            return run(studioRun);
+        } else {
+            return run(stigmaRun);
+        }
+    }
+
+    /**
+     * should try to refactor them to different fragment
+     */
+    @Deprecated
+    public <T extends IBusinessHandler> T run(IStudioRunnable<T> run) {
+        return run.run();
+    }
+
+    public <T extends IBusinessHandler> T run(ICustomUI<T> ui) {
+        if (ui == null) {
+            throw new RuntimeException("Custom ui is not defined!");
+        }
+        return stigmaUIEngine.run(ui);
+    }
+
+    @Deprecated
+    public static interface IStudioRunnable<T extends IBusinessHandler> {
+
+        T run();
+
+    }
+
+    @Deprecated
+    public static abstract class AbsStudioRunnable<T extends IBusinessHandler> implements IStudioRunnable<T> {
+
+        @Override
+        public T run() {
+            return doRun();
+        }
+
+        abstract public T doRun();
+
+    }
+
+    public static class Events {
+
+        public static final String EVENT_UPDATE = "TalendUI.update";
+
+    }
+
+}

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

@@ -0,0 +1,41 @@
+// ============================================================================
+//
+// 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;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public abstract class AbsBusinessHandler implements IBusinessHandler {
+
+    private Object openResult = Dialog.CANCEL;
+
+    public AbsBusinessHandler() {
+    }
+
+    @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/AbsUIHandler.java

@@ -0,0 +1,28 @@
+// ============================================================================
+//
+// 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.runtime.custom;
+
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public abstract class AbsUIHandler implements IUIHandler {
+
+    /**
+     * DOC cmeng AbsUIHandler constructor comment.
+     */
+    public AbsUIHandler() {
+        // TODO Auto-generated constructor stub
+    }
+
+}

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

@@ -0,0 +1,28 @@
+// ============================================================================
+//
+// 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.runtime.custom;
+
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public abstract class AbsUIHandlerFactory implements IUIHandlerFactory {
+
+    /**
+     * DOC cmeng AbsUIHandlerFactory constructor comment.
+     */
+    public AbsUIHandlerFactory() {
+        // TODO Auto-generated constructor stub
+    }
+
+}

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

@@ -0,0 +1,258 @@
+// ============================================================================
+//
+// 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.Arrays;
+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> {
+
+    public static final String NONE = "none";
+
+    public static final String UI_OK = "ok";
+
+    public static final String UI_APPLY = "apply";
+
+    public static final String UI_CANCEL = "cancel";
+
+    public static final String UI_CLOSE = "close";
+
+    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<>();
+
+    private String selectedButton = NONE;
+
+    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)) {
+            setSelectedButton(UI_OK);
+            closeDialog = onOk(event);
+        } else if (BuiltinEvent.apply.name().equals(eventKey)) {
+            setSelectedButton(UI_APPLY);
+            closeDialog = onApply(event);
+        } else if (BuiltinEvent.close.name().equals(eventKey)) {
+            setSelectedButton(UI_CLOSE);
+            closeDialog = onClose(event);
+        } else if (BuiltinEvent.cancel.name().equals(eventKey)) {
+            setSelectedButton(UI_CANCEL);
+            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();
+        } else {
+            setSelectedButton(NONE);
+        }
+    }
+
+    protected int getOpenResult() {
+        if (isCancelled()) {
+            return CANCEL;
+        } else {
+            return OK;
+        }
+    }
+
+    @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() {
+    }
+
+    public String getSelectedButton() {
+        return selectedButton;
+    }
+
+    public void setSelectedButton(String selectedButton) {
+        this.selectedButton = selectedButton;
+    }
+
+    public boolean isCancelled() {
+        return Arrays.asList(UI_CANCEL, UI_CLOSE).contains(getSelectedButton());
+    }
+
+    protected boolean onOk(IUIEvent event) {
+        return onApply(event);
+    }
+
+    protected boolean onApply(IUIEvent event) {
+        return true;
+    }
+
+    protected boolean onClose(IUIEvent event) {
+        return onCancel(event);
+    }
+
+    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,128 @@
+// ============================================================================
+//
+// 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) {
+        if (StringUtils.equals(uiData.getType(), IUIEvent.TYPE_GLOBAL)) {
+            Set<IUIEventHandler> handlers = globalUIEventHandlers.get(uiData.getKey());
+            if (handlers != null) {
+                for (IUIEventHandler handler : handlers) {
+                    if (handler.canHandle(uiData)) {
+                        return handler.provideUIData(uiData);
+                    }
+                }
+            }
+        } else {
+            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,26 @@
+// ============================================================================
+//
+// 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 IBusinessHandler {
+
+    String getUiKey();
+
+    boolean isModalDialog();
+
+    Object getOpenResult();
+
+}

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

@@ -0,0 +1,100 @@
+// ============================================================================
+//
+// 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.runtime.custom;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public interface ICommonUIHandler extends IUIHandler {
+
+    /**
+     * Constant for no image (value 0).
+     *
+     * @see #MessageDialog(Shell, String, Image, String, int, int, String...)
+     */
+    static final int NONE = 0;
+
+    /**
+     * Constant for the error image, or a simple dialog with the error image and
+     * a single OK button (value 1).
+     *
+     * @see #MessageDialog(Shell, String, Image, String, int, int, String...)
+     * @see #open(int, Shell, String, String, int)
+     */
+    static final int ERROR = 1;
+
+    /**
+     * Constant for the info image, or a simple dialog with the info image and a
+     * single OK button (value 2).
+     *
+     * @see #MessageDialog(Shell, String, Image, String, int, int, String...)
+     * @see #open(int, Shell, String, String, int)
+     */
+    static final int INFORMATION = 2;
+
+    /**
+     * Constant for the question image, or a simple dialog with the question
+     * image and Yes/No buttons (value 3).
+     *
+     * @see #MessageDialog(Shell, String, Image, String, int, int, String...)
+     * @see #open(int, Shell, String, String, int)
+     */
+    static final int QUESTION = 3;
+
+    /**
+     * Constant for the warning image, or a simple dialog with the warning image
+     * and a single OK button (value 4).
+     *
+     * @see #MessageDialog(Shell, String, Image, String, int, int, String...)
+     * @see #open(int, Shell, String, String, int)
+     */
+    static final int WARNING = 4;
+
+    /**
+     * Constant for a simple dialog with the question image and OK/Cancel buttons (value 5).
+     *
+     * @see #open(int, Shell, String, String, int)
+     * @since 3.5
+     */
+    static final int CONFIRM = 5;
+
+    /**
+     * Constant for a simple dialog with the question image and Yes/No/Cancel buttons (value 6).
+     *
+     * @see #open(int, Shell, String, String, int)
+     * @since 3.5
+     */
+    static final int QUESTION_WITH_CANCEL = 6;
+
+    static final String CONTEXT_COMMAND_STACK = "COMMAND_STACK";
+
+    boolean execute(Command cmd);
+
+    boolean openQuestion(String title, String msg);
+
+    boolean openConfirm(String title, String msg);
+
+    void openWarning(String title, String msg);
+
+    MessageDialogWithToggleBusinessHandler openToggle(MessageDialogWithToggleBusinessHandler bh);
+
+    void openError(String title, String msg);
+
+    static ICommonUIHandler get() {
+        return UIHandlerFactories.inst().getUIHandler(ICommonUIHandler.class);
+    }
+
+}

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

@@ -0,0 +1,28 @@
+// ============================================================================
+//
+// 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.runtime.custom;
+
+
+public interface ICrossPlatformPreferenceStore {
+
+    boolean getBoolean(String key);
+
+    boolean getDefaultBoolean(String key);
+
+    void setValue(String key, boolean value);
+
+    void setValue(String key, String value);
+
+    Object getOriginStore();
+
+}

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

@@ -0,0 +1,63 @@
+// ============================================================================
+//
+// 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;
+
+import org.talend.commons.ui.runtime.TalendUI;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public interface ICustomUI<T extends IBusinessHandler> extends IUIEventHandler {
+
+    public static final int OK = 0;
+
+    public static final int CANCEL = 1;
+
+    String getId();
+
+    T getBusinessHandler();
+
+    T run();
+
+    default T open() {
+        return TalendUI.get().run(this);
+    }
+
+    /**
+     * 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,64 @@
+// ============================================================================
+//
+// 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 {
+
+    static final String CONTEXT_PROCESS = "PROCESS";
+
+    <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);
+
+    Object getThreadLocalContext(String key);
+
+    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/IUIHandler.java

@@ -0,0 +1,21 @@
+// ============================================================================
+//
+// 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.runtime.custom;
+
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public interface IUIHandler {
+
+}

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

@@ -0,0 +1,23 @@
+// ============================================================================
+//
+// 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.runtime.custom;
+
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public interface IUIHandlerFactory {
+
+    <T extends IUIHandler> T getUIHandler(Class<T> clz);
+
+}

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

@@ -0,0 +1,77 @@
+// ============================================================================
+//
+// 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.runtime.custom;
+
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.talend.commons.exception.ExceptionHandler;
+
+public class InputDialogBusinessCustomUI extends AbstractCustomUI<InputDialogBusinessHandler> {
+
+    public InputDialogBusinessCustomUI(InputDialogBusinessHandler businessHandler) {
+        super(businessHandler);
+    }
+
+    @Override
+    protected IUIEvent createOpenEvent() {
+        IUIEvent openEvent = super.createOpenEvent();
+        Map<String, Object> params = openEvent.getParams();
+        InputDialogBusinessHandler bh = getBusinessHandler();
+        params.put(BuiltinParams.title.name(), bh.getTitle());
+        params.put(BuiltinParams.message.name(), bh.getMessage());
+        params.put("defaultValue", bh.getDefaultValue());
+        return openEvent;
+    }
+
+    @Override
+    protected boolean onApply(IUIEvent event) {
+        DefaultUIData valueEvent = createUIDataEvent("value");
+        String errMsg = null;
+        try {
+            Object value = requestUIData(valueEvent).get();
+            InputDialogBusinessHandler bh = getBusinessHandler();
+            if (value == null) {
+                value = "";
+            }
+            errMsg = bh.getValidator().isValid((String) value);
+            if (StringUtils.isBlank(errMsg)) {
+                return true;
+            }
+        } catch (Exception e) {
+            errMsg = e.getLocalizedMessage();
+            ExceptionHandler.process(e);
+        }
+        DefaultUIEvent errorEvent = new DefaultUIEvent("error", getId());
+        errorEvent.getParams().put("message", errMsg);
+        dispatchUIEvent(errorEvent);
+        return false;
+    }
+
+    @Override
+    protected InputDialogBusinessHandler collectDialogData() {
+        DefaultUIData valueEvent = createUIDataEvent("value");
+        InputDialogBusinessHandler businessHandler = getBusinessHandler();
+        try {
+            Object value = requestUIData(valueEvent).get();
+            businessHandler.setOpenResult(getOpenResult());
+            if (value != null) {
+                businessHandler.setResult(value.toString());
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return businessHandler;
+    }
+
+}

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

@@ -0,0 +1,72 @@
+// ============================================================================
+//
+// 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.runtime.custom;
+
+public class InputDialogBusinessHandler extends AbsBusinessHandler {
+
+    private static final String UI_KEY = "InputDialog";
+
+    private String title;
+
+    private String message;
+
+    private String defaultValue;
+
+    private String result;
+
+    private IInputDialogInputValidator validator;
+
+    public InputDialogBusinessHandler(String title, String message, String defaultValue, IInputDialogInputValidator validator) {
+        super();
+        this.title = title;
+        this.message = message;
+        this.defaultValue = defaultValue;
+        this.validator = validator;
+    }
+
+    @Override
+    public String getUiKey() {
+        return UI_KEY;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public String getDefaultValue() {
+        return defaultValue;
+    }
+
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result;
+    }
+
+    public IInputDialogInputValidator getValidator() {
+        return validator;
+    }
+
+    public interface IInputDialogInputValidator {
+
+        public String isValid(String newText);
+
+    }
+
+}

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

@@ -0,0 +1,134 @@
+// ============================================================================
+//
+// 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.swt.widgets.Shell;
+
+/**
+ * DOC cmeng class global comment. Detailled comment
+ */
+public class MessageDialogBusinessHandler extends AbsBusinessHandler {
+
+    /**
+     * Constant for no image (value 0).
+     *
+     * @see #MessageDialog(Shell, String, Image, String, int, int, String...)
+     */
+    public static final int NONE = ICommonUIHandler.NONE;
+
+    /**
+     * Constant for the error image, or a simple dialog with the error image and
+     * a single OK button (value 1).
+     *
+     * @see #MessageDialog(Shell, String, Image, String, int, int, String...)
+     * @see #open(int, Shell, String, String, int)
+     */
+    public static final int ERROR = ICommonUIHandler.ERROR;
+
+    /**
+     * Constant for the info image, or a simple dialog with the info image and a
+     * single OK button (value 2).
+     *
+     * @see #MessageDialog(Shell, String, Image, String, int, int, String...)
+     * @see #open(int, Shell, String, String, int)
+     */
+    public static final int INFORMATION = ICommonUIHandler.INFORMATION;
+
+    /**
+     * Constant for the question image, or a simple dialog with the question
+     * image and Yes/No buttons (value 3).
+     *
+     * @see #MessageDialog(Shell, String, Image, String, int, int, String...)
+     * @see #open(int, Shell, String, String, int)
+     */
+    public static final int QUESTION = ICommonUIHandler.QUESTION;
+
+    /**
+     * Constant for the warning image, or a simple dialog with the warning image
+     * and a single OK button (value 4).
+     *
+     * @see #MessageDialog(Shell, String, Image, String, int, int, String...)
+     * @see #open(int, Shell, String, String, int)
+     */
+    public static final int WARNING = ICommonUIHandler.WARNING;
+
+    /**
+     * Constant for a simple dialog with the question image and OK/Cancel buttons (value 5).
+     *
+     * @see #open(int, Shell, String, String, int)
+     * @since 3.5
+     */
+    public static final int CONFIRM = ICommonUIHandler.CONFIRM;
+
+    /**
+     * Constant for a simple dialog with the question image and Yes/No/Cancel buttons (value 6).
+     *
+     * @see #open(int, Shell, String, String, int)
+     * @since 3.5
+     */
+    public static final int QUESTION_WITH_CANCEL = ICommonUIHandler.QUESTION_WITH_CANCEL;
+
+    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;
+    }
+
+    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,105 @@
+// ============================================================================
+//
+// 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> {
+
+    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() {
+        MessageDialogBusinessHandler businessHandler = getBusinessHandler();
+        try {
+            businessHandler.setOpenResult(getDialogOpenResult());
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return businessHandler;
+    }
+
+    private Object getDialogOpenResult() {
+        Object result = null;
+        boolean isCancelled = isCancelled();
+        switch (getBusinessHandler().getDialogType()) {
+        case MessageDialog.CONFIRM:
+        case MessageDialog.ERROR:
+        case MessageDialog.INFORMATION:
+        case MessageDialog.WARNING:
+            if (isCancelled) {
+                result = Boolean.FALSE;
+            } else {
+                result = Boolean.TRUE;
+            }
+            break;
+        case MessageDialog.QUESTION:
+            if (isCancelled) {
+                result = Boolean.FALSE;
+            } else {
+                result = Boolean.TRUE;
+            }
+            break;
+        case MessageDialog.QUESTION_WITH_CANCEL:
+            if (isCancelled) {
+                result = Boolean.FALSE;
+            } else {
+                result = Boolean.TRUE;
+            }
+            break;
+        default:
+            result = getOpenResult();
+            break;
+        }
+        return result;
+    }
+
+}

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

@@ -0,0 +1,95 @@
+// ============================================================================
+//
+// 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.runtime.custom;
+
+public class MessageDialogWithToggleBusinessHandler extends MessageDialogBusinessHandler {
+
+    private static final String UI_KEY = "MessageDialogWithToggle";
+
+    private String toggleMessage;
+
+    private boolean toggleState;
+
+    private ICrossPlatformPreferenceStore preferenceStore;
+
+    private String prefKey;
+
+    private String[] buttonLabels;
+
+    private int defaultBtnIndex = 0;
+
+    public MessageDialogWithToggleBusinessHandler(int dialogType, String title, String message, String[] buttonLabels,
+            int defaultBtnIndex, String toggleMessage, boolean toggleState) {
+        super(dialogType);
+        this.setTitle(title);
+        this.setMessage(message);
+        this.buttonLabels = buttonLabels;
+        this.defaultBtnIndex = defaultBtnIndex;
+        this.toggleMessage = toggleMessage;
+        this.toggleState = toggleState;
+    }
+
+    @Override
+    public String getUiKey() {
+        return UI_KEY;
+    }
+
+    public String getToggleMessage() {
+        return toggleMessage;
+    }
+
+    public void setToggleMessage(String toggleMessage) {
+        this.toggleMessage = toggleMessage;
+    }
+
+    public boolean getToggleState() {
+        return toggleState;
+    }
+
+    public void setToggleState(boolean toggleState) {
+        this.toggleState = toggleState;
+    }
+
+    public ICrossPlatformPreferenceStore getPreferenceStore() {
+        return preferenceStore;
+    }
+
+    public void setPreferenceStore(ICrossPlatformPreferenceStore preferenceStore) {
+        this.preferenceStore = preferenceStore;
+    }
+
+    public String getPrefKey() {
+        return prefKey;
+    }
+
+    public void setPrefKey(String prefKey) {
+        this.prefKey = prefKey;
+    }
+
+    public String[] getButtonLabels() {
+        return buttonLabels;
+    }
+
+    public void setButtonLabels(String[] buttonLabels) {
+        this.buttonLabels = buttonLabels;
+    }
+
+    public int getDefaultBtnIndex() {
+        return defaultBtnIndex;
+    }
+
+    public void setDefaultBtnIndex(int defaultBtnIndex) {
+        this.defaultBtnIndex = defaultBtnIndex;
+    }
+
+}

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/custom/MessageDialogWithToggleCustomUI.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.runtime.custom;
+
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.talend.commons.exception.ExceptionHandler;
+
+public class MessageDialogWithToggleCustomUI extends AbstractCustomUI<MessageDialogWithToggleBusinessHandler> {
+
+    public MessageDialogWithToggleCustomUI(MessageDialogWithToggleBusinessHandler businessHandler) {
+        super(businessHandler);
+    }
+
+    @Override
+    protected IUIEvent createOpenEvent() {
+        IUIEvent openEvent = super.createOpenEvent();
+        Map<String, Object> params = openEvent.getParams();
+        MessageDialogWithToggleBusinessHandler bh = getBusinessHandler();
+        params.put(BuiltinParams.title.name(), bh.getTitle());
+        params.put(BuiltinParams.message.name(), bh.getMessage());
+        params.put("toggleMsg", bh.getToggleMessage());
+        params.put("toggleState", bh.getToggleState());
+        params.put("dialogImageType", mapDialogImageType(bh.getDialogType()));
+        params.put("buttons", bh.getButtonLabels());
+        params.put("defaultBtnIndex", bh.getDefaultBtnIndex());
+        return openEvent;
+    }
+
+    private String mapDialogImageType(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 MessageDialogWithToggleBusinessHandler collectDialogData() {
+        DefaultUIData toggleStateReq = createUIDataEvent("toggleState");
+        MessageDialogWithToggleBusinessHandler businessHandler = getBusinessHandler();
+        try {
+            CompletableFuture<Object> toggleStateResp = requestUIData(toggleStateReq);
+            businessHandler.setOpenResult(getOpenResult());
+            boolean toggleState = Boolean.valueOf(toggleStateResp.get().toString());
+            if (toggleState != businessHandler.getToggleState()) {
+                businessHandler.setToggleState(toggleState);
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return businessHandler;
+    }
+
+}

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

@@ -0,0 +1,73 @@
+// ============================================================================
+//
+// 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.runtime.custom;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+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 class UIHandlerFactories implements IUIHandlerFactory {
+
+    private static UIHandlerFactories inst;
+
+    private Collection<IUIHandlerFactory> factories;
+
+    public static UIHandlerFactories inst() {
+        if (inst == null) {
+            inst = new UIHandlerFactories();
+        }
+        return inst;
+    }
+
+    private UIHandlerFactories() {
+        factories = new HashSet<>();
+        init();
+    }
+
+    private void init() {
+        try {
+            BundleContext bc = FrameworkUtil.getBundle(UIHandlerFactories.class).getBundleContext();
+            Collection<ServiceReference<IUIHandlerFactory>> serviceReferences = bc.getServiceReferences(IUIHandlerFactory.class,
+                    null);
+            for (ServiceReference<IUIHandlerFactory> sr : serviceReferences) {
+                IUIHandlerFactory impl = bc.getService(sr);
+                factories.add(impl);
+            }
+        } catch (Throwable e) {
+            ExceptionHandler.process(e);
+        }
+    }
+
+    @Override
+    public <T extends IUIHandler> T getUIHandler(Class<T> clz) {
+        for (IUIHandlerFactory factory : factories) {
+            T ui = factory.getUIHandler(clz);
+            if (ui != null) {
+                return ui;
+            }
+        }
+        return null;
+    }
+
+    public ICommonUIHandler getCommonUIHandler() {
+        return getUIHandler(ICommonUIHandler.class);
+    }
+
+}

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

@@ -0,0 +1,96 @@
+// ============================================================================
+//
+// 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 {
+
+        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
+        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_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

@@ -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:
@@ -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

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

@@ -114,6 +114,7 @@ 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.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

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

@@ -115,6 +115,8 @@ public enum ECoreImage implements IImage {
 
     METADATA_SAPCONNECTION_ICON("/icons1/sapconnection.png"), //$NON-NLS-1$
     METADATA_SAPCONNECTION_WIZ("/icons1/connection_wiz.gif"), //$NON-NLS-1$
+    
+    METADATA_BIGQUERYCONNECTION_ICON("/icons1/bigqueryconnection.png"), //$NON-NLS-1$
 
     METADATA_HEADERFOOTER_ICON("/icons1/headerfooter_icon32.png"), //$NON-NLS-1$
 

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

@@ -40,8 +40,8 @@ public enum EImage implements IImage {
     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$
+    MOREINFO_ICON("/icons/moreInfo.png"), //$NON-NLS-1$
 
     CREATE_CONNECTION_ICON("/icons/connection.gif"), //$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/swt/tableviewer/TooltipPopup.java

@@ -55,7 +55,7 @@ public final class TooltipPopup {
         private boolean visible;
 
         public Popup(Shell parent) {
-            super(parent, SWT.ON_TOP, false, false, false, false, null, null);
+            super(parent, SWT.ON_TOP, false, false, false, false, false, null, null);
         }
 
         @Override

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

@@ -69,6 +69,10 @@ public class DefaultTableLabelProvider implements ITableLabelProvider, ITableCol
                     returnValue = defaultValue;
                 }
             } else {
+                if ("ID_COLUMN_ROW_NUM".equals(column.getId())) {
+                    int indexOf = this.tableViewerCreator.getInputList().indexOf(element);
+                    AccessorUtils.set(column, element, indexOf + 1);
+                }
                 Object value = AccessorUtils.get(element, column);
                 CellEditor cellEditor = column.getCellEditor();
                 CellEditorValueAdapter retrieverValue = column.getCellEditorValueAdapter();

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,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Runtime Plug-in
 Bundle-SymbolicName: org.talend.commons.runtime;singleton:=true
+Automatic-Module-Name: org.talend.commons.runtime
 Bundle-Version: 8.8.8.qualifier
-Require-Bundle: org.apache.log4j;visibility:=reexport,
+Require-Bundle: org.apache.log4j,
  org.apache.commons.commons-beanutils,
  org.apache.commons.collections,
- org.apache.commons.httpclient,
- org.apache.commons.lang;visibility:=reexport,
+ org.apache.commons.lang,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore.xmi,
  org.talend.libraries.apache,
@@ -17,7 +17,11 @@ Require-Bundle: org.apache.log4j;visibility:=reexport,
  org.eclipse.core.net,
  org.eclipse.m2e.core,
  org.eclipse.m2e.maven.runtime,
- org.eclipse.core.resources
+ org.eclipse.core.resources,
+ org.talend.studio.studio-utils,
+ org.talend.daikon,
+ org.apache.commons.codec,
+ org.apache.commons.lang3
 Export-Package: org.talend.commons,
  org.talend.commons.exception,
  org.talend.commons.i18n,

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_server.xml

@@ -92,12 +92,12 @@
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
-            <version>2.12.0</version>
+            <version>2.12.2</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.reload4j</groupId>
             <artifactId>reload4j</artifactId>
-            <version>1.2.19</version>
+            <version>1.2.22</version>
         </dependency>
     </dependencies>
 
@@ -125,7 +125,7 @@
                  <dependency>
                   <groupId>com.google.guava</groupId>
                   <artifactId>guava</artifactId>
-                  <version>30.0-jre</version>
+                  <version>32.0.1-jre</version>
                  </dependency>
                 </dependencies>
                 <configuration>

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

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

main/plugins/org.talend.commons.runtime/src/org/talend/commons/i18n/BabiliUpdateUtil.java

@@ -1,108 +0,0 @@
-// ============================================================================
-//
-// 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.i18n;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * DOC wzhang class global comment. Detailled comment
- */
-public class BabiliUpdateUtil {
-
-    private static final String REVERSION_LIST = "http://talendforge.org/babili/api/get_labels.php"; //$NON-NLS-1$
-
-    /**
-     *
-     * DOC wzhang Comment method "getBabiliList". get the list from Babili.
-     *
-     * @param language
-     * @param validated
-     * @param version
-     * @return
-     * @throws Exception
-     * @deprecated
-     */
-    public static List<BabiliInfo> getBabiliList(String language, boolean validated, String version, IProgressMonitor monitor)
-            throws Exception {
-        StringBuffer url = new StringBuffer();
-        url.append(REVERSION_LIST).append("?language=").append(language).append("&validated_only=").append(validated).append( //$NON-NLS-1$ //$NON-NLS-2$
-                "&release=").append(version); //$NON-NLS-1$
-        checkProcessCancel(monitor);
-        String jsonContent = sendGetRequest(url.toString());
-        checkProcessCancel(monitor);
-        return parseJsonObject(jsonContent, BabiliInfo.class, monitor);
-    }
-
-    /**
-     *
-     * DOC wzhang Comment method "sendGetRequest".
-     *
-     * @param url
-     * @return
-     * @throws Exception
-     * @deprecated
-     */
-    public static String sendGetRequest(String url) throws Exception {
-        HttpClient httpclient = new HttpClient();
-        GetMethod getMethod = new GetMethod(url);
-        httpclient.executeMethod(getMethod);
-        String response = getMethod.getResponseBodyAsString();
-        getMethod.releaseConnection();
-        return response;
-    }
-
-    /**
-     *
-     * DOC wzhang Comment method "parseJsonObject".
-     *
-     * @param jsonContent
-     * @param clazz
-     * @return
-     * @throws Exception
-     * @deprecated
-     */
-    public static List parseJsonObject(String jsonContent, Class clazz, IProgressMonitor monitor) throws Exception {
-        // need factory for creating parser to use
-        // JsonFactory jf = new JsonFactory();
-        // List result = (List) new JavaTypeMapper().read(jf.createJsonParser(new StringReader(jsonContent)));
-        // List objList = new ArrayList(result.size());
-        // for (int i = 0; i < result.size(); i++) {
-        // checkProcessCancel(monitor);
-        // Object obj = clazz.newInstance();
-        // Object source = result.get(i);
-        // BeanUtils.copyProperties(obj, source);
-        // objList.add(obj);
-        // }
-        // return objList;
-        return Collections.emptyList();
-    }
-
-    /**
-     *
-     * wzhang Comment method "checkProcessCancel".
-     *
-     * @param monitor
-     * @throws ImportBabiliCancelException
-     * @deprecated
-     */
-    public static void checkProcessCancel(IProgressMonitor monitor) throws ImportBabiliCancelException {
-        if (monitor != null && monitor.isCanceled()) {
-            throw new ImportBabiliCancelException();
-        }
-    }
-}

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

@@ -15,6 +15,7 @@ package org.talend.commons.runtime.service;
 import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -45,6 +46,10 @@ public interface ITaCoKitService {
     boolean isNeedMigration(String componentName, Map<String, String> properties);
 
     boolean isTaCoKitType(Object repoType);
+    
+    boolean isTaCoKitRepositoryNode(Object node);
+    
+    boolean isTaCoKitConnection(Object conn);
 
     Object getDatastoreFromDataset(Object repositoryViewObject);
 
@@ -52,6 +57,12 @@ public interface ITaCoKitService {
 
     boolean isValueSelectionParameter(Object parameter);
 
+    List<Map<String, Object>> convertToTable(String value);
+    
+    List<String> getValuesFromTableParameter(Object parameter, String... keys);
+    
+    List<String> getValuesFromTableParameterValue(String value, String ...keys);
+
     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/OsgiServices.java

@@ -0,0 +1,35 @@
+// ============================================================================
+//
+// 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.utils;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+import org.talend.commons.exception.ExceptionHandler;
+
+public class OsgiServices {
+
+    public static <T> T get(Class<T> clz) {
+        try {
+            BundleContext bc = FrameworkUtil.getBundle(OsgiServices.class).getBundleContext();
+            ServiceReference<T> serviceReference = bc.getServiceReference(clz);
+            if (serviceReference != null) {
+                return bc.getService(serviceReference);
+            }
+        } catch (Throwable e) {
+            ExceptionHandler.process(e);
+        }
+        return null;
+    }
+
+}

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

@@ -13,6 +13,7 @@
 package org.talend.commons.utils;
 
 import java.security.SecureRandom;
+import java.util.regex.Pattern;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
@@ -34,6 +35,8 @@ public class PasswordEncryptUtil {
 
     private static final SecureRandom SECURERANDOM = new SecureRandom();
 
+    private static final Pattern REG_ENCRYPTED_DATA = Pattern.compile("^enc\\:system\\.encryption\\.key\\.v\\d\\:\\p{Print}+");
+
     private static SecretKey getSecretKey() throws Exception {
         if (key == null) {
             byte rawKeyData[] = StudioEncryption

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;
 
@@ -108,6 +109,7 @@ public class NetworkUtil {
                 return true;
             }
         } catch (Exception e) {
+            CommonExceptionHandler.process(e, getCheckUrl());
             return false;
         } finally {
             conn.disconnect();
@@ -120,7 +122,7 @@ public class NetworkUtil {
         if (StringUtils.isNotBlank(customUrl)) {
             return customUrl;
         } else {
-            return "https://talend-update.talend.com/nexus/content/repositories/libraries/";
+            return "https://talend-update.talend.com/nexus/content/groups/studio-libraries/";
         }
     }
 
@@ -144,6 +146,7 @@ public class NetworkUtil {
             conn.setRequestMethod("HEAD"); //$NON-NLS-1$
             conn.getResponseMessage();
         } catch (Exception e) {
+            CommonExceptionHandler.process(e, urlString);
             // if not reachable , will throw exception(time out/unknown host) .So if catched exception, make it a
             // invalid server
             return false;

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

@@ -96,7 +96,9 @@ public class EclipseCommandLine {
     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$

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

@@ -2,6 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common UI Plug-in
 Bundle-SymbolicName: org.talend.commons.ui;singleton:=true
+Automatic-Module-Name: org.talend.commons.ui
 Bundle-Version: 8.8.8.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
@@ -10,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.intro,
  org.eclipse.ui.ide,
  org.eclipse.gef,
- org.eclipse.jface;visibility:=reexport,
+ org.eclipse.jface,
  org.apache.log4j,
  org.apache.xalan,
  org.apache.commons.lang,
@@ -18,9 +19,12 @@ Require-Bundle: org.eclipse.core.runtime,
  org.talend.libraries.dom4j-jaxen,
  org.talend.utils,
  org.talend.commons.runtime,
- org.talend.common.ui.runtime;visibility:=reexport,
- org.talend.libraries.ui;visibility:=reexport,
- org.eclipse.ui.workbench
+ org.talend.common.ui.runtime,
+ org.talend.libraries.ui,
+ org.eclipse.ui.workbench,
+ org.talend.studio.studio-utils,
+ org.apache.commons.lang3,
+ org.eclipse.jface.notifications
 Eclipse-LazyStart: true
 Bundle-Vendor: .Talend SA.
 Export-Package: org.talend.commons.ui.command,
@@ -28,6 +32,7 @@ Export-Package: org.talend.commons.ui.command,
  org.talend.commons.ui.gmf.util,
  org.talend.commons.ui.html,
  org.talend.commons.ui.i18n,
+ org.talend.commons.ui.nofitication,
  org.talend.commons.ui.swt.actions,
  org.talend.commons.ui.swt.advanced.composite,
  org.talend.commons.ui.swt.advanced.dataeditor,

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

@@ -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:

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/html/DynamicHtmlURL.java

@@ -12,10 +12,10 @@
 // ============================================================================
 package org.talend.commons.ui.html;
 
+import java.net.URLDecoder;
 import java.util.Properties;
 
 import org.eclipse.ui.internal.intro.impl.model.loader.ModelLoaderUtil;
-import org.eclipse.ui.internal.intro.impl.util.StringUtil;
 import org.eclipse.ui.intro.config.IIntroAction;
 import org.eclipse.ui.intro.config.IIntroURL;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
@@ -60,7 +60,7 @@ public class DynamicHtmlURL implements IIntroURL {
                     // we are told to decode the parameters of the url through
                     // the decode parameter. Assume that parameters are
                     // UTF-8 encoded.
-                    return StringUtil.decode(value, "UTF-8"); //$NON-NLS-1$
+                    return URLDecoder.decode(value, "UTF-8"); //$NON-NLS-1$
                 return value;
             } catch (Exception e) {
                 ExceptionHandler.process(e);

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/nofitication/ArrangedNotificationPopup.java

@@ -0,0 +1,133 @@
+// ============================================================================
+//
+// 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.nofitication;
+
+import java.util.List;
+
+import org.eclipse.jface.notifications.AbstractNotificationPopup;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Monitor;
+import org.eclipse.swt.widgets.Shell;
+
+public abstract class ArrangedNotificationPopup extends AbstractNotificationPopup {
+
+    protected static final int MAX_WIDTH = 400;
+
+    protected static final int MIN_HEIGHT = 100;
+
+    protected static final int PADDING_EDGE = 5;
+
+    private static NotificationManager manager;
+
+    public ArrangedNotificationPopup(Display display) {
+        super(display);
+    }
+
+    public ArrangedNotificationPopup(Display display, int style) {
+        super(display, style);
+    }
+
+    @Override
+    protected void createContentArea(Composite parent) {
+        createControl(parent);
+        afterCreate();
+    }
+
+    protected abstract void createControl(Composite parent);
+
+    @Override
+    protected Shell getParentShell() {
+        return getNotificationManager().getParentShell();
+    }
+
+    @Override
+    public void initializeBounds() {
+        Rectangle clArea = getPrimaryClientArea();
+        Point initialSize = getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT);
+        int height = Math.max(initialSize.y, MIN_HEIGHT);
+        int width = Math.min(initialSize.x, MAX_WIDTH);
+
+        Point size = new Point(width, height);
+        getShell().setLocation(clArea.width + clArea.x - size.x - PADDING_EDGE, clArea.height + clArea.y - size.y - PADDING_EDGE);
+        getShell().setSize(size);
+    }
+
+    private Rectangle getPrimaryClientArea() {
+        Shell parentShell = getParentShell();
+        if (parentShell != null) {
+            // calculate client area in display-relative coordinates
+            // (i.e. without window border / decorations)
+            Rectangle bounds = parentShell.getBounds();
+            Rectangle trim = parentShell.computeTrim(0, 0, 0, 0);
+            List<Window> toasts = getNotificationManager().getWindows();
+            Rectangle rect = new Rectangle(bounds.x - trim.x, bounds.y - trim.y, bounds.width - trim.width,
+                    bounds.height - trim.height);
+            if (!toasts.isEmpty()) {
+                int index = 0;
+                if (toasts.contains(this)) {
+                    // parent shell resize or move
+                    index = toasts.indexOf(this);
+                    if (index == 0) {
+                        // return parent shell rectangle if it's the first one at bottom
+                        return rect;
+                    }
+                    // the one under current toast
+                    index -= 1;
+                } else {
+                    // toast creation
+                    // the one on the top
+                    index = toasts.size() - 1;
+                }
+                Rectangle toastRect = toasts.get(index).getShell().getBounds();
+                rect = new Rectangle(rect.x, rect.y, rect.width, toastRect.y - rect.y);
+            }
+            return rect;
+        }
+        // else display on primary monitor
+        Monitor primaryMonitor = this.getShell().getDisplay().getPrimaryMonitor();
+        return (primaryMonitor != null) ? primaryMonitor.getClientArea() : this.getShell().getDisplay().getClientArea();
+    }
+
+    protected void afterCreate() {
+        //
+    }
+
+    @Override
+    public int open() {
+        int open = super.open();
+        // add after open
+        getNotificationManager().add(this);
+        return open;
+    }
+
+    @Override
+    public boolean close() {
+        boolean close = super.close();
+        getNotificationManager().remove(this);
+        getNotificationManager().refresh();
+        return close;
+    }
+
+    private NotificationManager getNotificationManager() {
+        if (manager == null) {
+            manager = NotificationManager.getInstance();
+        }
+        return manager;
+    }
+
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/nofitication/NotificationManager.java

@@ -0,0 +1,81 @@
+// ============================================================================
+//
+// 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.nofitication;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.window.WindowManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
+
+public class NotificationManager implements Listener {
+
+    private static NotificationManager notificationManager;
+
+    private WindowManager windowManager = new WindowManager();
+
+    private NotificationManager() {
+        Shell shell = getParentShell();
+        if (shell != null) {
+            shell.addListener(SWT.Resize, this);
+            shell.addListener(SWT.Move, this);
+        }
+    }
+
+    public static NotificationManager getInstance() {
+        if (notificationManager == null) {
+            notificationManager = new NotificationManager();
+        }
+        return notificationManager;
+    }
+
+    @Override
+    public void handleEvent(Event event) {
+        refresh();
+    }
+
+    public void refresh() {
+        Stream.of(windowManager.getWindows()).map(ArrangedNotificationPopup.class::cast)
+                .forEach(ArrangedNotificationPopup::initializeBounds);
+    }
+
+    public List<Window> getWindows() {
+        return Stream.of(windowManager.getWindows()).collect(Collectors.toList());
+    }
+
+    public void add(Window window) {
+        windowManager.add(window);
+    }
+
+    public void remove(Window window) {
+        windowManager.remove(window);
+    }
+
+    public Shell getParentShell() {
+        Shell shell = null;
+        if (PlatformUI.getWorkbench().getActiveWorkbenchWindow() != null) {
+            shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+            if (shell == null) {
+                shell = PlatformUI.getWorkbench().getDisplay().getActiveShell();
+            }
+        }
+        return shell;
+    }
+
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/button/ExportPushButtonForExtendedTable.java

@@ -130,11 +130,10 @@ public abstract class ExportPushButtonForExtendedTable extends ExportPushButton
         AbstractExtendedTableViewer extendedTableViewer = (AbstractExtendedTableViewer) extendedControlViewer;
         ExtendedTableModel extendedTableModel = extendedTableViewer.getExtendedTableModel();
         boolean enabled = false;
-        if (extendedTableModel != null && extendedTableModel.isDataRegistered()
-                && extendedTableModel.getBeansList().size() > 0) {
+        if (extendedTableModel != null && extendedTableModel.isDataRegistered() && extendedTableModel.getBeansList().size() > 0) {
             enabled = true;
         }
-        return super.getEnabledState() && enabled;
+        return extendedTableModel != null || enabled;
     }
 
 }

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/button/SaveAsGenericSchemaPushButton.java

@@ -19,6 +19,7 @@ import org.talend.commons.ui.runtime.image.EImage;
 import org.talend.commons.ui.runtime.image.ImageProvider;
 import org.talend.commons.ui.swt.advanced.dataeditor.control.ExtendedPushButton;
 import org.talend.commons.ui.swt.extended.table.AbstractExtendedTableViewer;
+import org.talend.commons.ui.swt.extended.table.ExtendedTableModel;
 
 /**
  * DOC Administrator class global comment. Detailled comment <br/>
@@ -33,4 +34,11 @@ public abstract class SaveAsGenericSchemaPushButton extends ExtendedPushButton {
 
     @Override
     protected abstract Command getCommandToExecute();
+
+    @Override
+    public boolean getEnabledState() {
+        AbstractExtendedTableViewer extendedTableViewer = (AbstractExtendedTableViewer) extendedControlViewer;
+        ExtendedTableModel extendedTableModel = extendedTableViewer.getExtendedTableModel();
+        return extendedTableModel != null;
+    }
 }

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/commands/ExtendedTableAddCommand.java

@@ -17,6 +17,7 @@ import java.util.List;
 
 import org.eclipse.gef.commands.Command;
 import org.talend.commons.ui.runtime.i18n.Messages;
+import org.talend.commons.ui.runtime.swt.tableviewer.TableViewerCreatorNotModifiable;
 import org.talend.commons.ui.swt.extended.table.ExtendedTableModel;
 
 /**
@@ -88,6 +89,11 @@ public class ExtendedTableAddCommand extends Command implements IExtendedTableCo
         // }
 
         extendedTable.addAll(indexStartAdd, beansToAdd);
+        // when not lazy load need to do refresh to refresh the row number
+        if (!TableViewerCreatorNotModifiable.getRecommandLazyLoad()
+                && !TableViewerCreatorNotModifiable.isLazyLoadingEnabled()) {
+            extendedTable.getTableViewer().refresh();
+        }
 
     }
 

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/commands/ExtendedTableRemoveCommand.java

@@ -20,6 +20,7 @@ import java.util.List;
 import org.apache.commons.lang.ArrayUtils;
 import org.eclipse.gef.commands.Command;
 import org.talend.commons.ui.runtime.i18n.Messages;
+import org.talend.commons.ui.runtime.swt.tableviewer.TableViewerCreatorNotModifiable;
 import org.talend.commons.ui.swt.extended.table.ExtendedTableModel;
 
 /**
@@ -130,6 +131,11 @@ public class ExtendedTableRemoveCommand extends Command implements IExtendedTabl
                 removedBeansIndices.add(index);
             }
         }
+        // when not lazy load need to do refresh to refresh the row number
+        if (!TableViewerCreatorNotModifiable.getRecommandLazyLoad()
+                && !TableViewerCreatorNotModifiable.isLazyLoadingEnabled()) {
+            extendedTable.getTableViewer().refresh();
+        }
 
     }
 

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/ModelSelectionBusinessHandler.java

@@ -0,0 +1,66 @@
+// ============================================================================
+//
+// 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.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 {
+
+    private static final String UI_KEY = "ModelSelectionDialog";
+
+    private ESelectionType selectionType;
+
+    private boolean isReadOnly;
+
+    private EEditSelection optionValue;
+
+    public ModelSelectionBusinessHandler(ESelectionType selectionType, boolean isReadOnly) {
+        this.selectionType = selectionType;
+        this.isReadOnly = isReadOnly;
+    }
+
+    @Override
+    public String getUiKey() {
+        return UI_KEY;
+    }
+
+    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, Shell parentShell) {
+        this(parentShell, 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/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();
                     }

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/proposal/ContentProposalAdapterExtended.java

@@ -573,7 +573,7 @@ public class ContentProposalAdapterExtended {
              * Construct an info-popup with the specified parent.
              */
             InfoPopupDialog(Shell parent) {
-                super(parent, PopupDialog.HOVER_SHELLSTYLE, false, false, false, false, null, null);
+                super(parent, PopupDialog.HOVER_SHELLSTYLE, false, false, false, false, false, null, null);
             }
 
             /*
@@ -707,7 +707,7 @@ public class ContentProposalAdapterExtended {
             // On platforms where SWT.ON_TOP overrides SWT.RESIZE, we will live
             // with this.
             // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=126138
-            super(control.getShell(), SWT.RESIZE | SWT.ON_TOP, false, false, false, false, null, infoText);
+            super(control.getShell(), SWT.RESIZE | SWT.ON_TOP, false, false, false, false, false, null, infoText);
             filterText = EMPTY;
             updateIntialFilterText();
             previousFilterText = filterText;

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

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

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

@@ -31,6 +31,7 @@ import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Display;
 import org.talend.commons.ui.gmf.util.DisplayUtils;
+import org.talend.commons.ui.runtime.ITalendThemeService;
 
 /**
  * Figure managing some simple HTML styles. <br/>
@@ -77,6 +78,8 @@ public class SimpleHtmlFigure extends Figure {
     private static Font boldFont = null;
 
     private static Font boldItalicFont = null;
+    
+    private static final Color DEFAULT_LABEL_COLOR = ITalendThemeService.getColor("NODE_FIGURE_LABEL_FORCEGROUND").orElse(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
 
     /**
      * Constructs a new SimpleHtmlFigure.
@@ -262,6 +265,8 @@ public class SimpleHtmlFigure extends Figure {
             label.setFont(fontToUse);
             if (colorStack.size() > 0) {
                 label.setForegroundColor(colorStack.get(colorStack.size() - 1));
+            } else {
+                label.setForegroundColor(DEFAULT_LABEL_COLOR); // Set label default foreground color
             }
             horizContainer.add(label);
         }
@@ -315,14 +320,13 @@ public class SimpleHtmlFigure extends Figure {
     @SuppressWarnings("unchecked")
     private Dimension computePreferedSize() {
         Dimension size = new Dimension();
-
         // Vertical path
-        List<IFigure> children = getChildren();
+        List<IFigure> children = (List<IFigure>) getChildren();
         for (IFigure fv : children) {
 
             // Horizontal path
             Dimension sizeH = new Dimension();
-            List<IFigure> childrenH = fv.getChildren();
+            List<IFigure> childrenH = (List<IFigure>) fv.getChildren();
             for (IFigure fh : childrenH) {
                 sizeH.width += fh.getPreferredSize().width;
                 sizeH.height = Math.max(sizeH.height, fh.getPreferredSize().height);

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

@@ -15,8 +15,26 @@ Require-Bundle: org.eclipse.ui,
  org.talend.libraries.apache,
  org.eclipse.osgi.services,
  org.eclipse.ui.navigator,
- org.eclipse.e4.ui.css.swt.theme,
- org.talend.libraries.jackson
+ org.talend.libraries.jackson,
+ org.eclipse.emf.ecore,
+ org.talend.commons.runtime,
+ org.eclipse.equinox.common,
+ org.eclipse.core.jobs,
+ org.eclipse.core.resources,
+ org.eclipse.osgi,
+ org.eclipse.emf.ecore.xmi,
+ org.eclipse.equinox.registry,
+ org.talend.common.ui.runtime,
+ org.talend.cwm.mip,
+ org.eclipse.swt,
+ org.talend.studio.studio-utils,
+ org.eclipse.core.runtime,
+ org.eclipse.gmf.runtime.notation,
+ org.talend.utils,
+ org.apache.commons.lang3,
+ com.fasterxml.jackson.core.jackson-annotations,
+ com.fasterxml.jackson.core.jackson-core,
+ com.fasterxml.jackson.core.jackson-databind
 Export-Package: org.talend.core.repository,
  org.talend.core.repository.constants,
  org.talend.core.repository.document,

main/plugins/org.talend.core.repository/plugin.xml

@@ -187,10 +187,10 @@
        <RepositoryComponent
              name="GENERAL_JDBC"
              withSchema="true"
-             input="tJDBCInput"
-             output="tJDBCOutput">
+             input="JDBCInput"
+             output="JDBCOutput">
           <Item
-                clazz="org.talend.core.model.properties.DatabaseConnectionItem">
+                clazz="org.talend.core.model.properties.TacokitDatabaseConnectionItem">
           </Item>
           <DBType
                 type="GENERAL_JDBC">
@@ -285,6 +285,30 @@
                 type="INFORMIX">
           </DBType>
        </RepositoryComponent>
+       <RepositoryComponent
+             name="INGRES"
+             withSchema="true"
+             input="tIngresInput"
+             output="tIngresOutput">
+          <Item
+                clazz="org.talend.core.model.properties.DatabaseConnectionItem">
+          </Item>
+          <DBType
+                type="INGRES">
+          </DBType>
+       </RepositoryComponent>
+       <RepositoryComponent
+             name="VECTORWISE"
+             withSchema="true"
+             input="tVectorWiseInput"
+             output="tVectorWiseOutput">
+          <Item
+                clazz="org.talend.core.model.properties.DatabaseConnectionItem">
+          </Item>
+          <DBType
+                type="VECTORWISE">
+          </DBType>
+       </RepositoryComponent>
        <RepositoryComponent
              name="JAVADB"
              withSchema="true"
@@ -396,18 +420,7 @@
                 type="ORACLESN">
           </DBType>
        </RepositoryComponent>
-       <RepositoryComponent
-             name="PLUSPSQL"
-             withSchema="true"
-             input="tPostgresPlusInput"
-             output="tPostgresPlusOutput">
-          <Item
-                clazz="org.talend.core.model.properties.DatabaseConnectionItem">
-          </Item>
-          <DBType
-                type="PLUSPSQL">
-          </DBType>
-       </RepositoryComponent>
+
        <RepositoryComponent
              name="PSQL"
              withSchema="true"

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/constants/FileConstants.java

@@ -19,6 +19,8 @@ import org.talend.repository.model.RepositoryConstants;
  */
 public interface FileConstants {
 
+    String DOT = ".";
+
     String OLD_TALEND_PROJECT_FILENAME = "talendProject"; //$NON-NLS-1$
 
     String LOCAL_PROJECT_FILENAME = "talend.project"; //$NON-NLS-1$
@@ -112,5 +114,4 @@ public interface FileConstants {
     String TALEND_FOLDER_NAME = "TALEND-INF"; //$NON-NLS-1$
     
     String MAVEN_FOLDER_NAME = "MAVEN-INF";
-
 }

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

@@ -127,14 +127,13 @@ JobletReferenceDialog.NodeTotalsTip=The totals of node reference
 JobletReferenceDialog.project=Project
 JobletReferenceDialog.ReferenceJob=Reference Job
 JobletReferenceDialog.Title=Delete the joblet failure
-ContextReferenceDialog.Title=Delete Context Group
+ContextReferenceDialog.DeleteContext.Title=Delete Context
 ContextReferenceDialog.Recycle=in Recycle Bin
 ContextReferenceDialog.ReferenceJob=Reference Objects
 ContextReferenceDialog.Types=Type
 ContextReferenceDialog.NodeTypeTip=The type of node reference
 ContextReferenceDialog.Messages=Context({0} {1}) is referenced from\:\n
-ContextReferenceDialog.kindMessages=The context group of {0} {1} is referred by the following list, if you really want to delete it, the context group is used in job will be changed to built-in when job is opened again. Would you still like to delete it?
-ContextReferenceDialog.kindMessages1=The context group of {0} {1} is referred by the following list, Would you still like to delete it?
+ContextReferenceDialog.kindMessages2=The context of {0} {1} is referred by the following list, would you still like to delete it?
 CopyToGenericSchemaHelper.cannotGenarateItem=Cannot generate pasted item label.
 ProxyRepositoryFactory.ReplaceJobHazardDescription=\nDependence on the original connection may be lost\!
 ItemReferenceDialog.title=Items which cannot be deleted
@@ -156,6 +155,7 @@ ProjectRepositoryNode.invalidItem=Invalid item
 ProjectRepositoryNode.columns=Columns
 ProjectRepositoryNode.validationRules=Validation Rules
 ProjectRepositoryNode.cdcFoundation=CDC Foundation
+ProjectRepositoryNode.cdcFoundation.deprecated=CDC Foundation (deprecated)
 ProjectRepositoryNode.genericSchema=Generic schemas
 ProjectRepositoryNode.queries=Queries
 ProjectRepositoryNode.synonymSchemas=Synonym schemas
@@ -175,6 +175,7 @@ ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
 ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
 ProjectRepositoryNode.sapBWInfoObject=SAP InfoObject
 ProjectRepositoryNode.sapContentExtractor=SAP BI Content Extractor
+ProjectRepositoryNode.sapCDSView=SAP CDS View
 RepositoryDropAdapter_copyingItems=Copying items...
 RepositoryDropAdapter_errorMsg=This directory contains the locked item,it can not be moved now
 RepositoryDropAdapter_lockedByOthers=This item is locked by other users, it can not be moved now.
@@ -204,3 +205,4 @@ RenameFolderAction.warning.cannotFind.title=Action not available
 ConvertJobsUtil.warning.title=Warning
 ConvertJobsUtil.warning.message=The target framework is not fully supported for this release.
 SyncLibrariesLoginTask.createStatsLogAndImplicitParamter=Create stats log and implicit parameters
+WizardPageAPIDefinition_operationIdMissing=API is missing operationIds. operationIds are used to initialize tRESTRequest/cRest output flows. See tRESTRequest/cRest online help.

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

@@ -127,14 +127,13 @@ JobletReferenceDialog.NodeTotalsTip=Total des r\u00E9f\u00E9rences des noeuds
 JobletReferenceDialog.project=Projet
 JobletReferenceDialog.ReferenceJob=Job de r\u00E9f\u00E9rence
 JobletReferenceDialog.Title=Supprimer l'\u00E9chec du Joblet
-ContextReferenceDialog.Title=Supprimer le groupe de contextes
+ContextReferenceDialog.DeleteContext.Title=Supprimer le contexte
 ContextReferenceDialog.Recycle=dans la Corbeille
 ContextReferenceDialog.ReferenceJob=Objets de r\u00E9f\u00E9rence
 ContextReferenceDialog.Types=Type
 ContextReferenceDialog.NodeTypeTip=Type de r\u00E9f\u00E9rences du n\u0153ud
 ContextReferenceDialog.Messages=Le contexte({0} {1}) est r\u00E9f\u00E9renc\u00E9 dans :\n
-ContextReferenceDialog.kindMessages=Le groupe de contextes de {0} {1} est r\u00E9f\u00E9renc\u00E9 par la liste suivante. Si vous souhaitez le supprimer, le groupe de contextes du Job sera chang\u00E9 en Built-In \u00E0 la prochaine ouverture du Job. Le supprimer malgr\u00E9 tout ?
-ContextReferenceDialog.kindMessages1=Le groupe de contextes {0} {1} est r\u00E9f\u00E9renc\u00E9 par la liste suivante. Le supprimer malgr\u00E9 tout ?
+ContextReferenceDialog.kindMessages2=Les \u00E9l\u00E9ments de la liste suivante font r\u00E9f\u00E9rence au contexte de {0} {1} . Souhaitez-vous quand m\u00EAme le supprimer\u00A0?
 CopyToGenericSchemaHelper.cannotGenarateItem=Impossible de g\u00E9n\u00E9rer le libell\u00E9 de l'\u00E9l\u00E9ment coll\u00E9.
 ProxyRepositoryFactory.ReplaceJobHazardDescription=\nLes d\u00E9pendances envers la connexion originale peuvent \u00EAtre perdues.
 ItemReferenceDialog.title=\u00C9lements ne pouvant \u00EAtre supprim\u00E9s
@@ -156,6 +155,7 @@ ProjectRepositoryNode.invalidItem=\u00C9l\u00E9ment invalide
 ProjectRepositoryNode.columns=Colonnes
 ProjectRepositoryNode.validationRules=R\u00E8gles de validation
 ProjectRepositoryNode.cdcFoundation=Fondation CDC
+ProjectRepositoryNode.cdcFoundation.deprecated=Fondation CDC (d\u00E9pr\u00E9ci\u00E9)
 ProjectRepositoryNode.genericSchema=Sch\u00E9mas g\u00E9n\u00E9riques
 ProjectRepositoryNode.queries=Requ\u00EAtes
 ProjectRepositoryNode.synonymSchemas=Sch\u00E9mas synonymes
@@ -175,6 +175,7 @@ ProjectRepositoryNode.sapBWDataStoreObject=Objet Data Store SAP
 ProjectRepositoryNode.sapBWInfoCube=InfoCube SAP
 ProjectRepositoryNode.sapBWInfoObject=InfoObject SAP
 ProjectRepositoryNode.sapContentExtractor=Extracteur SAP BI Content
+ProjectRepositoryNode.sapCDSView=Vue SAP CDS
 RepositoryDropAdapter_copyingItems=Copie des \u00E9l\u00E9ments...
 RepositoryDropAdapter_errorMsg=Ce r\u00E9pertoire contient l'\u00E9l\u00E9ment verrouill\u00E9, il ne peut \u00EAtre d\u00E9plac\u00E9
 RepositoryDropAdapter_lockedByOthers=Cet \u00E9l\u00E9ment est verrouill\u00E9 par d'autres utilisateurs, impossible de le d\u00E9placer.
@@ -204,3 +205,4 @@ RenameFolderAction.warning.cannotFind.title=Action non disponible
 ConvertJobsUtil.warning.title=Avertissement
 ConvertJobsUtil.warning.message=Le framework cible n'est pas totalement support\u00E9 dans cette version.
 SyncLibrariesLoginTask.createStatsLogAndImplicitParamter=Cr\u00E9er des logs de stat et des param\u00E8tres implicites.
+WizardPageAPIDefinition_operationIdMissing=Des operationIds manquent dans l'API. Ces operationIds sont utilis\u00E9s pour initialiser les flux de sortie du tRESTRequest/cRest. Consultez l'aide en ligne des composants tRESTRequest/cRest.

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

@@ -56,7 +56,7 @@ PropertiesWizardPage.Locker=\u30ED\u30C3\u30AF\u4FDD\u6301\u8005
 PropertiesWizardPage.Description=\u8AAC\u660E
 PropertiesWizardPage.EmptyDescWarning=\u8AAC\u660E\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u5165\u529B\u3092\u63A8\u5968\u3057\u307E\u3059\u3002
 PropertiesWizardPage.EmptyPurposeWarning=\u76EE\u7684\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u5165\u529B\u3092\u63A8\u5968\u3057\u307E\u3059
-PropertiesWizardPage.ItemExistsError=\u30A2\u30A4\u30C6\u30E0\u304C\u5B58\u5728\u3057\u307E\u3059\u3002\u3054\u307F\u7BB1\u3092\u78BA\u8A8D\u3057\u3066\u7A7A\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+PropertiesWizardPage.ItemExistsError=\u9805\u76EE\u304C\u5B58\u5728\u3057\u307E\u3059\u3002\u3054\u307F\u7BB1\u3092\u78BA\u8A8D\u3057\u3066\u7A7A\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 PropertiesWizardPage.KeywordsError=\u540D\u524D\u304C\u6709\u52B9\u306AID\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
 PropertiesWizardPage.Name=\u540D\u524D
 PropertiesWizardPage.NameEmptyError=\u540D\u524D\u304C\u7A7A\u3067\u3059\u3002
@@ -127,14 +127,13 @@ JobletReferenceDialog.NodeTotalsTip=\u30CE\u30FC\u30C9\u53C2\u7167\u306E\u5408\u
 JobletReferenceDialog.project=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
 JobletReferenceDialog.ReferenceJob=\u53C2\u7167\u30B8\u30E7\u30D6
 JobletReferenceDialog.Title=\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8\u306E\u5931\u6557\u3092\u524A\u9664
-ContextReferenceDialog.Title=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30B0\u30EB\u30FC\u30D7\u3092\u524A\u9664
+ContextReferenceDialog.DeleteContext.Title=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u306E\u524A\u9664
 ContextReferenceDialog.Recycle=\u3054\u307F\u7BB1\u5185
 ContextReferenceDialog.ReferenceJob=\u53C2\u7167\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8
 ContextReferenceDialog.Types=\u30BF\u30A4\u30D7
 ContextReferenceDialog.NodeTypeTip=\u30CE\u30FC\u30C9\u53C2\u7167\u306E\u30BF\u30A4\u30D7
 ContextReferenceDialog.Messages=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8({0} {1})\u306E\u53C2\u7167\u5143:\n
-ContextReferenceDialog.kindMessages={0} {1}\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30B0\u30EB\u30FC\u30D7\u306F\u6B21\u306E\u30EA\u30B9\u30C8\u306B\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u524A\u9664\u3057\u305F\u3044\u5834\u5408\u306F\u3001\u30B8\u30E7\u30D6\u304C\u3082\u3046\u4E00\u5EA6\u958B\u304B\u308C\u305F\u6642\u306B\u3001\u30B8\u30E7\u30D6\u3067\u4F7F\u7528\u3055\u308C\u308B\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30B0\u30EB\u30FC\u30D7\u306F\u7D44\u307F\u8FBC\u307F\u306B\u5909\u63DB\u3055\u308C\u307E\u3059\u3002\u524A\u9664\u3057\u307E\u3059\u304B?
-ContextReferenceDialog.kindMessages1={0} {1}\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30B0\u30EB\u30FC\u30D7\u304C\u4EE5\u4E0B\u306E\u30EA\u30B9\u30C8\u306B\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u524A\u9664\u3057\u307E\u3059\u304B?
+ContextReferenceDialog.kindMessages2={0}{1}\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u304C\u6B21\u306E\u30EA\u30B9\u30C8\u306B\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u524A\u9664\u3057\u307E\u3059\u304B?
 CopyToGenericSchemaHelper.cannotGenarateItem=\u8CBC\u4ED8\u3051\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u30E9\u30D9\u30EB\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093\u3002
 ProxyRepositoryFactory.ReplaceJobHazardDescription=\n\u5143\u306E\u63A5\u7D9A\u3078\u306E\u4F9D\u5B58\u304C\u5931\u308F\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059!
 ItemReferenceDialog.title=\u524A\u9664\u3067\u304D\u306A\u3044\u30A2\u30A4\u30C6\u30E0
@@ -156,7 +155,8 @@ ProjectRepositoryNode.invalidItem=\u7121\u52B9\u306A\u30A2\u30A4\u30C6\u30E0
 ProjectRepositoryNode.columns=\u30AB\u30E9\u30E0
 ProjectRepositoryNode.validationRules=\u691C\u8A3C\u30EB\u30FC\u30EB
 ProjectRepositoryNode.cdcFoundation=CDC Foundation
-ProjectRepositoryNode.genericSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE
+ProjectRepositoryNode.cdcFoundation.deprecated=CDC Foundation (\u975E\u63A8\u5968)
+ProjectRepositoryNode.genericSchema=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE
 ProjectRepositoryNode.queries=\u30AF\u30A8\u30EA\u30FC
 ProjectRepositoryNode.synonymSchemas=\u30B7\u30CE\u30CB\u30E0\u30B9\u30AD\u30FC\u30DE
 ProjectRepositoryNode.calculationViewSchemas=\u8A08\u7B97\u30D3\u30E5\u30FC\u30B9\u30AD\u30FC\u30DE
@@ -175,6 +175,7 @@ ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
 ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
 ProjectRepositoryNode.sapBWInfoObject=SAP InfoObject
 ProjectRepositoryNode.sapContentExtractor=SAP BI\u30B3\u30F3\u30C6\u30F3\u30C4\u30A8\u30AF\u30B9\u30C8\u30E9\u30AF\u30BF\u30FC
+ProjectRepositoryNode.sapCDSView=SAP CDS\u30D3\u30E5\u30FC
 RepositoryDropAdapter_copyingItems=\u30A2\u30A4\u30C6\u30E0\u3092\u30B3\u30D4\u30FC\u4E2D...
 RepositoryDropAdapter_errorMsg=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306B\u30ED\u30C3\u30AF\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\u73FE\u5728\u3001\u79FB\u52D5\u3067\u304D\u307E\u305B\u3093,
 RepositoryDropAdapter_lockedByOthers=\u3053\u306E\u30A2\u30A4\u30C6\u30E0\u304C\u4ED6\u306E\u30E6\u30FC\u30B6\u30FC\u306B\u3088\u3063\u3066\u30ED\u30C3\u30AF\u3055\u308C\u307E\u3057\u305F\u3002\u73FE\u5728\u3001\u79FB\u52D5\u3067\u304D\u307E\u305B\u3093\u3002
@@ -204,3 +205,4 @@ RenameFolderAction.warning.cannotFind.title=\u4F7F\u7528\u3067\u304D\u306A\u3044
 ConvertJobsUtil.warning.title=\u8B66\u544A
 ConvertJobsUtil.warning.message=\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u306F\u3001\u30BF\u30FC\u30B2\u30C3\u30C8\u30D5\u30EC\u30FC\u30E0\u30EF\u30FC\u30AF\u304C\u5B8C\u5168\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 SyncLibrariesLoginTask.createStatsLogAndImplicitParamter=\u7D71\u8A08\u30ED\u30B0\u3068\u6697\u9ED9\u7684\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u4F5C\u6210
+WizardPageAPIDefinition_operationIdMissing=API\u3067operationIds\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002operationIds\u306F\u3001tRESTRequest/cRest\u51FA\u529B\u30D5\u30ED\u30FC\u3092\u521D\u671F\u5316\u3059\u308B\u305F\u3081\u306B\u4F7F\u308F\u308C\u307E\u3059\u3002tRESTRequest/cRest\u306E\u30AA\u30F3\u30E9\u30A4\u30F3\u30D8\u30EB\u30D7\u3092\u3054\u89A7\u304F\u3060\u3055\u3044\u3002

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

@@ -127,14 +127,13 @@ JobletReferenceDialog.NodeTotalsTip=\u8282\u70B9\u5F15\u7528\u603B\u6570
 JobletReferenceDialog.project=\u5DE5\u7A0B
 JobletReferenceDialog.ReferenceJob=\u5F15\u7528\u4F5C\u4E1A
 JobletReferenceDialog.Title=\u5220\u9664\u5C0F\u4F5C\u4E1A\u5931\u8D25
-ContextReferenceDialog.Title=\u5220\u9664\u73AF\u5883\u7EC4
+ContextReferenceDialog.DeleteContext.Title=\u5220\u9664\u4E0A\u4E0B\u6587
 ContextReferenceDialog.Recycle=\u5728\u56DE\u6536\u7AD9
 ContextReferenceDialog.ReferenceJob=\u5F15\u7528\u5BF9\u8C61
 ContextReferenceDialog.Types=\u7C7B\u578B
 ContextReferenceDialog.NodeTypeTip=\u8282\u70B9\u5F15\u7528\u7684\u7C7B\u578B
 ContextReferenceDialog.Messages=\u4E0A\u4E0B\u6587 ({0} {1}) \u5F15\u7528\u81EA\uFF1A\n
-ContextReferenceDialog.kindMessages={0} {1} \u7684\u4E0A\u4E0B\u6587\u7EC4\u88AB\u4EE5\u4E0B\u5217\u8868\u5F15\u7528\uFF0C\u5982\u679C\u786E\u5B9E\u60F3\u8981\u5C06\u5176\u5220\u9664\uFF0C\u518D\u6B21\u6253\u5F00\u4F5C\u4E1A\u65F6\uFF0C\u4F5C\u4E1A\u4E2D\u6240\u7528\u7684\u4E0A\u4E0B\u6587\u7EC4\u5C06\u6539\u4E3A\u5185\u7F6E\u3002\u662F\u5426\u4ECD\u60F3\u5C06\u5176\u5220\u9664\uFF1F
-ContextReferenceDialog.kindMessages1={0} {1} \u7684\u4E0A\u4E0B\u6587\u7EC4\u88AB\u4EE5\u4E0B\u5217\u8868\u5F15\u7528\uFF0C\u662F\u5426\u4ECD\u60F3\u5C06\u5176\u5220\u9664\uFF1F
+ContextReferenceDialog.kindMessages2={0} {1} \u7684\u4E0A\u4E0B\u6587\u7EC4\u4EE5\u4E0B\u5217\u8868\u5F15\u7528\uFF0C\u662F\u5426\u4ECD\u60F3\u5C06\u5176\u5220\u9664\uFF1F
 CopyToGenericSchemaHelper.cannotGenarateItem=\u65E0\u6CD5\u751F\u6210\u7C98\u8D34\u9879\u76EE\u6807\u7B7E\u3002
 ProxyRepositoryFactory.ReplaceJobHazardDescription=\n\u5BF9\u539F\u59CB\u8FDE\u63A5\u7684\u4F9D\u8D56\u53EF\u80FD\u4F1A\u4E22\u5931\uFF01
 ItemReferenceDialog.title=\u65E0\u6CD5\u5220\u9664\u7684\u9879\u76EE
@@ -156,6 +155,7 @@ ProjectRepositoryNode.invalidItem=\u65E0\u6548\u9879\u76EE
 ProjectRepositoryNode.columns=\u5217
 ProjectRepositoryNode.validationRules=\u9A8C\u8BC1\u89C4\u5219
 ProjectRepositoryNode.cdcFoundation=CDC Foundation
+ProjectRepositoryNode.cdcFoundation.deprecated=CDC Foundation (\u5DF2\u5F03\u7528)
 ProjectRepositoryNode.genericSchema=\u901A\u7528 schema
 ProjectRepositoryNode.queries=\u67E5\u8BE2
 ProjectRepositoryNode.synonymSchemas=\u540C\u4E49\u5B57 schema
@@ -175,6 +175,7 @@ ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
 ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
 ProjectRepositoryNode.sapBWInfoObject=SAP InfoObject
 ProjectRepositoryNode.sapContentExtractor=SAP BI \u5185\u5BB9\u63D0\u53D6\u5668
+ProjectRepositoryNode.sapCDSView=SAP CDS \u89C6\u56FE
 RepositoryDropAdapter_copyingItems=\u6B63\u5728\u590D\u5236\u9879\u76EE...
 RepositoryDropAdapter_errorMsg=\u6B64\u76EE\u5F55\u5305\u542B\u9501\u5B9A\u7684\u9879\u76EE\uFF0C\u73B0\u5728\u65E0\u6CD5\u79FB\u52A8
 RepositoryDropAdapter_lockedByOthers=\u6B64\u9879\u76EE\u88AB\u5176\u4ED6\u7528\u6237\u9501\u5B9A\uFF0C\u73B0\u5728\u65E0\u6CD5\u79FB\u52A8\u3002
@@ -204,3 +205,4 @@ RenameFolderAction.warning.cannotFind.title=\u64CD\u4F5C\u4E0D\u53EF\u7528
 ConvertJobsUtil.warning.title=\u8B66\u544A
 ConvertJobsUtil.warning.message=\u6B64\u7248\u672C\u4E0D\u5B8C\u5168\u652F\u6301\u76EE\u6807\u6846\u67B6.
 SyncLibrariesLoginTask.createStatsLogAndImplicitParamter=\u521B\u5EFA\u7EDF\u8BA1\u65E5\u5FD7\u548C\u9690\u5F0F\u53C2\u6570
+WizardPageAPIDefinition_operationIdMissing=API \u7F3A\u5931 operationId \u53C2\u6570\uFF0C\u8FD9\u4E9B operationId \u53C2\u6570\u7528\u6765\u521D\u59CB\u5316 tRESTRequest \u6216 cRest \u8F93\u51FA\u6D41\u3002\u8BF7\u53C2\u89C1 tRESTRequest \u6216 cRest \u5728\u7EBF\u5E2E\u52A9\u6587\u6863\u3002

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

@@ -130,7 +130,7 @@ public abstract class AbstractEMFRepositoryFactory extends AbstractRepositoryFac
                 ERepositoryObjectType.METADATA_FILE_RULES, ERepositoryObjectType.METADATA_FILE_HL7,
                 ERepositoryObjectType.METADATA_FILE_FTP, ERepositoryObjectType.METADATA_FILE_BRMS,
                 ERepositoryObjectType.METADATA_MDMCONNECTION, ERepositoryObjectType.METADATA_HEADER_FOOTER,
-                ERepositoryObjectType.JOB_SCRIPT };
+                ERepositoryObjectType.JOB_SCRIPT, ERepositoryObjectType.METADATA_BIGQUERYCONNECTIONS };
 
         List<IRepositoryViewObject> deletedItems = new ArrayList<IRepositoryViewObject>();
         for (ERepositoryObjectType type : types) {
@@ -260,6 +260,7 @@ public abstract class AbstractEMFRepositoryFactory extends AbstractRepositoryFac
         if (type == ERepositoryObjectType.METADATA_CON_TABLE) {
             return false;
         }
+        
         boolean isAllowMultipleName = (type == ERepositoryObjectType.SQLPATTERNS || type == ERepositoryObjectType.METADATA_FILE_XML);
         String path = "";
         if (item.getState() != null) {
@@ -872,25 +873,38 @@ public abstract class AbstractEMFRepositoryFactory extends AbstractRepositoryFac
     @Override
     public IRepositoryViewObject getLastVersion(Project project, String id, String relativeFolder, ERepositoryObjectType type)
             throws PersistenceException {
-        List<IRepositoryViewObject> serializableAllVersion = null;
-        Object fullFolder = getFullFolder(project, type, relativeFolder);
-        serializableAllVersion = getSerializableFromFolder(project, fullFolder, id, type, false, false, true, true);
+        List<IRepositoryViewObject> serializableAllVersion = new ArrayList<>();
+        if (lastFolderForItemMap.containsKey(id)) {
+            ERepositoryObjectType itemType = lastRepositoryTypeForItemMap.get(id);
+            String currentPath = lastFolderForItemMap.get(id);
+            Object fullFolder = getFullFolder(project, itemType, currentPath);
+            try {
+                if (fullFolder != null && (fullFolder instanceof FolderItem || ((IFolder) fullFolder).exists())) {
+                    serializableAllVersion.addAll(getSerializableFromFolder(project, fullFolder, id, itemType, false, false, true, true));
+                }
+            } catch (PersistenceException e) {
+                // do nothing.
+                // if any exception happen or can't find the item, just try to look for it everywhere.
+            }
+        }
         if (serializableAllVersion.isEmpty()) {
-            // look in all folders for this item type
-            serializableAllVersion = getSerializableFromFolder(project, fullFolder, id, type, false, true, true, true, true);
+            Object fullFolder = getFullFolder(project, type, relativeFolder);
+            serializableAllVersion = getSerializableFromFolder(project, fullFolder, id, type, false, false, true, true);
+            if (serializableAllVersion.isEmpty()) {
+                // look in all folders for this item type
+                serializableAllVersion = getSerializableFromFolder(project, fullFolder, id, type, false, true, true, true, true);
+            }
         }
         int size = serializableAllVersion.size();
-
         if (size > 1) {
             String message = getItemsMessages(serializableAllVersion, size);
-
             throw new PersistenceException(Messages.getString(
                     "AbstractEMFRepositoryFactory.presistenceException.OnlyOneOccurenceMustbeFound", message)); //$NON-NLS-1$
-        } else if (size == 1) {
-            return serializableAllVersion.get(0);
-        } else {
-            return null;
         }
+        if (size == 1) {
+            return serializableAllVersion.get(0);
+        }
+        return null;
     }
 
     protected void computePropertyMaxInformationLevel(Property property) {

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

@@ -184,6 +184,7 @@ public abstract class AbstractRepositoryFactory implements IRepositoryFactory {
         collect(getMetadata(project, ERepositoryObjectType.METADATA_FILE_LDIF), result);
         collect(getMetadata(project, ERepositoryObjectType.METADATA_CONNECTIONS), result);
         collect(getMetadata(project, ERepositoryObjectType.METADATA_SAPCONNECTIONS), result);
+        collect(getMetadata(project, ERepositoryObjectType.METADATA_BIGQUERYCONNECTIONS), result);
         collect(getMetadata(project, ERepositoryObjectType.METADATA_HEADER_FOOTER), result);
         collect(getMetadata(project, ERepositoryObjectType.METADATA_LDAP_SCHEMA), result);
         collect(getMetadata(project, ERepositoryObjectType.METADATA_GENERIC_SCHEMA), result);