fix(TUP-18979):fix junit failure (#5494)

* feat(TUP-35644):tMap - possible simplified metrics to send to Pendo
https://jira.talendforge.org/browse/TUP-35644

* feat(TUP-35644):tMap - possible simplified metrics to send to Pendo
https://jira.talendforge.org/browse/TUP-35644

* feat(TUP-35644):tMap - possible simplified metrics to send to Pendo
https://jira.talendforge.org/browse/TUP-35644

* feat(TUP-35644):tMap - possible simplified metrics to send to Pendo
https://jira.talendforge.org/browse/TUP-35644

README.md

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

SECURITY.md

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.fragment.jars.common.feature"
       label="Fragment Jars in Common"
-      version="8.8.8.qualifier">
+      version="8.0.1.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -54,13 +54,7 @@
          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="false"/>
+         unpack="true"/>
 
 </feature>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="8.8.8.qualifier"> 
+<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="8.0.1.qualifier"> 
   <description url="http://www.example.com/description">This feature contains the Talend utilities plugin and its dependencies.</description>  
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license url="http://www.example.com/license">[Enter License Description here.]</license>  
   <requires>
+    <import plugin="org.bouncycastle.bcprov" version="1.69.0" match="greaterOrEqual"/>
     <import plugin="com.cedarsoftware.json-io" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="com.fasterxml.jackson.core.jackson-annotations" version="2.9.0" match="greaterOrEqual"/>
     <import plugin="com.fasterxml.jackson.core.jackson-core" version="2.9.8" match="greaterOrEqual"/>
@@ -20,11 +21,11 @@
     <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"/>
+    <import plugin="org.talend.studio.studio-utils" version="0.0.0" match="greaterOrEqual"/>
   </requires>  
   <plugin id="org.talend.daikon" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.daikon.exception" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.daikon.crypto.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.studio.studio-utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.platform.logging" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>

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

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

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common UI runtime Plug-in
 Bundle-SymbolicName: org.talend.common.ui.runtime;singleton:=true
-Bundle-Version: 8.8.8.qualifier
+Bundle-Version: 8.0.1.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.apache.commons.collections,
  org.talend.libraries.dom4j-jaxen,
@@ -11,12 +11,9 @@ Require-Bundle: org.eclipse.core.runtime,
  org.talend.libraries.apache,
  org.talend.commons.runtime,
  org.talend.libraries.ui,
- org.apache.ant,
- org.eclipse.jface,
- org.apache.commons.lang3
+ org.apache.ant
 Export-Package: 
  org.talend.commons.ui.runtime,
- org.talend.commons.ui.runtime.custom,
  org.talend.commons.ui.runtime.exception,
  org.talend.commons.ui.runtime.expressionbuilder,
  org.talend.commons.ui.runtime.geometry,
@@ -37,8 +34,7 @@ Export-Package:
  org.talend.commons.ui.runtime.update,
  org.talend.commons.ui.runtime.utils,
  org.talend.commons.ui.runtime.ws
-Import-Package: org.eclipse.gef.commands,
- org.eclipse.jface.bindings.keys,
+Import-Package: org.eclipse.jface.bindings.keys,
  org.eclipse.jface.dialogs,
  org.eclipse.jface.fieldassist,
  org.eclipse.jface.resource,

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

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

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

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

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

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

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

@@ -1,8 +0,0 @@
-/* ############################## 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

@@ -1,8 +0,0 @@
-/* ############################## 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,22 +12,14 @@
 // ============================================================================
 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);
@@ -37,8 +29,6 @@ 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);
 
@@ -55,19 +45,4 @@ 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,8 +23,6 @@ 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

@@ -1,154 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,108 +0,0 @@
-// ============================================================================
-//
-// 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();
-
-    }
-
-}

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

@@ -1,41 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,25 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,78 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,28 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,28 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,258 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,128 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,30 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,30 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,26 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,100 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,28 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,63 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,25 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,64 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,21 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,34 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,30 +0,0 @@
-// ============================================================================
-//
-// 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/IUIHandlerFactory.java

@@ -1,23 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,77 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,72 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,134 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,105 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,95 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,78 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,73 +0,0 @@
-// ============================================================================
-//
-// 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

@@ -1,96 +0,0 @@
-// ============================================================================
-//
-// 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,27 +72,12 @@ 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, boolean wrapMessage) {
+    public static void showMessage(Throwable ex, Shell shell) {
         if (ex.equals(lastShowedAction)) {
             return;
         }
@@ -100,14 +85,10 @@ public final class MessageBoxExceptionHandler {
 
         // TODO smallet use ErrorDialogWidthDetailArea ?
         String title = Messages.getString("commons.error"); //$NON-NLS-1$
-        String excepMsg = ex.getMessage();
+        String msg = Messages.getString("exception.errorOccured", ex.getMessage()); //$NON-NLS-1$
         //add for tup-19726/19790, as for exception detailMessage will show more details on log area.
         if(ex.getCause()!=null) {
-            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$
+        	msg = Messages.getString("exception.errorOccured", ex.getCause().getMessage()); //$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,7 +114,6 @@ 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,7 +114,6 @@ 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=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
+SaveAsGenericSchemaPushButton.saveAsSchema=\u6C4E\u7528\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,7 +114,6 @@ 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,7 +114,6 @@ 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/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,14 +16,8 @@ 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;
@@ -164,35 +158,8 @@ public class ImageUtils {
         return imageDes;
     }
 
-    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) {//
-                }
-            }
-        };
-    };
+    private static Map<byte[], ImageDataProvider> imageFromDataCachedImages = new HashMap<byte[], ImageDataProvider>();
 
-    static {
-        clearImageFromDataCachedImages.setDaemon(true);
-        clearImageFromDataCachedImages.start();
-    }
-    
     /**
      * By default, keep in memory the .
      *
@@ -202,17 +169,12 @@ public class ImageUtils {
      */
     public static ImageDescriptor createImageFromData(byte[] data, boolean... keepInMemory) {
         if (data != null) {
-            ImageDataProvider imageProvider = null;
-            Optional<byte[]> findKey = imageFromDataCachedImages.keySet().stream().filter(key->Arrays.equals(key, data)).findAny();
-            if(findKey.isPresent()) {
-                imageProvider = imageFromDataCachedImages.get(findKey.get());
-            }
+            ImageDataProvider imageProvider = imageFromDataCachedImages.get(data);
             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);
         }
@@ -221,9 +183,8 @@ public class ImageUtils {
 
     public static void disposeImages(byte[] data) {
         if (data != null) {
-            Optional<byte[]> findKey = imageFromDataCachedImages.keySet().stream().filter(key->Arrays.equals(key, data)).findAny();
-            if(findKey.isPresent()) {
-                imageFromDataCachedImages.remove(findKey.get());
+            if (imageFromDataCachedImages.get(data) != null) {
+                imageFromDataCachedImages.remove(data);
             }
         }
     }

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

@@ -57,8 +57,6 @@ 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;
@@ -293,8 +291,7 @@ public class TableViewerCreatorNotModifiable<B> {
     public TableViewerCreatorNotModifiable(Composite compositeParent) {
         super();
         this.compositeParent = compositeParent;
-        this.emptyZoneColor = ITalendThemeService.getColor("org.talend.commons.ui.BgColorForEmptyArea")
-                .orElse(compositeParent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+        this.emptyZoneColor = compositeParent.getDisplay().getSystemColor(SWT.COLOR_WHITE);
 
     }
 
@@ -672,22 +669,8 @@ public class TableViewerCreatorNotModifiable<B> {
             table.addListener(SWTFacade.Paint, paintListener);
         }
 
-        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);
+        setBackgroundColor(backgroundColor != null ? backgroundColor : table.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+        setForegroundColor(foregroundColor != null ? foregroundColor : table.getDisplay().getSystemColor(SWT.COLOR_BLACK));
 
         if (useCustomItemColoring) {
             setUseCustomItemColoring(true);

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

@@ -12,14 +12,9 @@
 // ============================================================================
 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;
 
 /**
@@ -107,16 +102,4 @@ 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,7 +24,6 @@ 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;
@@ -170,52 +169,8 @@ 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,13 +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,
+Bundle-Version: 8.0.1.qualifier
+Require-Bundle: org.apache.log4j;visibility:=reexport,
  org.apache.commons.commons-beanutils,
  org.apache.commons.collections,
  org.apache.commons.httpclient,
- org.apache.commons.lang,
+ org.apache.commons.lang;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore.xmi,
  org.talend.libraries.apache,
@@ -18,11 +17,7 @@ Require-Bundle: org.apache.log4j,
  org.eclipse.core.net,
  org.eclipse.m2e.core,
  org.eclipse.m2e.maven.runtime,
- org.eclipse.core.resources,
- org.talend.studio.studio-utils,
- org.talend.daikon,
- org.apache.commons.codec,
- org.apache.commons.lang3
+ org.eclipse.core.resources
 Export-Package: org.talend.commons,
  org.talend.commons.exception,
  org.talend.commons.i18n,

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

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

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

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

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

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

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

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

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

@@ -1,85 +0,0 @@
-// ============================================================================
-//
-// 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,7 +16,6 @@ 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;
@@ -264,12 +263,4 @@ 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/utils/OsgiServices.java

@@ -1,35 +0,0 @@
-// ============================================================================
-//
-// 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/database/DB2ForZosDataBaseMetadata.java

@@ -145,30 +145,7 @@ public class DB2ForZosDataBaseMetadata extends PackageFakeDatabaseMetadata {
      */
     @Override
     public ResultSet getPrimaryKeys(String catalog, String schema, String table) throws SQLException {
-        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;
+        return new DB2ForZosResultSet();
     }
 
     /*
@@ -197,6 +174,17 @@ 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/ITalendNexusPrefConstants.java

@@ -1,21 +1,18 @@
-// ============================================================================
-//
-// 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 {
-
-}
+// ============================================================================
+//
+// 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.utils.network;
+
+public interface ITalendNexusPrefConstants {
+
+    public static final String NEXUS_TIMEOUT = "NEXUS_TIMEOUT"; //$NON-NLS-1$
+}

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

@@ -33,7 +33,6 @@ 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;
 
@@ -56,11 +55,6 @@ public class NetworkUtil {
     private static final int DEFAULT_NEXUS_TIMEOUT = 20000;// same as preference value
 
     public static final String ORG_TALEND_DESIGNER_CORE = "org.talend.designer.core"; //$NON-NLS-1$
-    
-    /*
-     * see ITalendCorePrefConstants.PERFORMANCE_TAC_READ_TIMEOUT
-     */
-    private static final String PERFORMANCE_TAC_READ_TIMEOUT = "PERFORMANCE_TAC_READ_TIMEOUT"; //$NON-NLS-1$
 
     private static final String PROP_DISABLEDSCHEMES_USE_DEFAULT = "talend.studio.jdk.http.auth.tunneling.disabledSchemes.useDefault";
 
@@ -109,7 +103,6 @@ public class NetworkUtil {
                 return true;
             }
         } catch (Exception e) {
-            CommonExceptionHandler.process(e, getCheckUrl());
             return false;
         } finally {
             conn.disconnect();
@@ -122,7 +115,7 @@ public class NetworkUtil {
         if (StringUtils.isNotBlank(customUrl)) {
             return customUrl;
         } else {
-            return "https://talend-update.talend.com/nexus/content/groups/studio-libraries/";
+            return "https://talend-update.talend.com/nexus/content/repositories/libraries/";
         }
     }
 
@@ -146,7 +139,6 @@ 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;
@@ -157,10 +149,10 @@ public class NetworkUtil {
     }
 
     public static int getNexusTimeout() {
-        int timeout = Integer.getInteger("nexus.timeout.min", DEFAULT_NEXUS_TIMEOUT);
+        int timeout = DEFAULT_NEXUS_TIMEOUT;
         try {
             IEclipsePreferences node = InstanceScope.INSTANCE.getNode(ORG_TALEND_DESIGNER_CORE);
-            timeout = Math.max(timeout, node.getInt(PERFORMANCE_TAC_READ_TIMEOUT, 0) * 1000);
+            timeout = node.getInt(ITalendNexusPrefConstants.NEXUS_TIMEOUT, DEFAULT_NEXUS_TIMEOUT);
         } catch (Throwable e) {
             ExceptionHandler.process(e);
         }

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

@@ -88,17 +88,13 @@ public class EclipseCommandLine {
     static public final String TALEND_CONTINUE_LOGON = "-talendContinueLogon";
 
     static public final String TALEND_CONTINUE_UPDATE = "-talendContinueUpdate";
-    
-    static public final String TALEND_CLEAN_M2 = "-talendCleanM2";
 
     static public final String TALEND_CLEAN_UNINSTALLED_BUNDLES = "-talendCleanUninstalledBundles";
 
     static public final String PROP_KEY_PROFILE_ID = "eclipse.p2.profile";
 
     static public final String ARG_BRANCH = "-branch";
-    
-    static public final String ARG_PROJECT = "-project";
-    
+
     static public final String LOGIN_ONLINE_UPDATE = "--loginOnlineUpdate";
 
     static public final String ARG_TALEND_BUNDLES_CLEANED = "-talend.studio.bundles.cleaned"; //$NON-NLS-1$

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

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

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

@@ -2,8 +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
+Bundle-Version: 8.0.1.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.jface.text,
@@ -11,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.intro,
  org.eclipse.ui.ide,
  org.eclipse.gef,
- org.eclipse.jface,
+ org.eclipse.jface;visibility:=reexport,
  org.apache.log4j,
  org.apache.xalan,
  org.apache.commons.lang,
@@ -19,11 +18,9 @@ Require-Bundle: org.eclipse.core.runtime,
  org.talend.libraries.dom4j-jaxen,
  org.talend.utils,
  org.talend.commons.runtime,
- org.talend.common.ui.runtime,
- org.talend.libraries.ui,
- org.eclipse.ui.workbench,
- org.talend.studio.studio-utils,
- org.apache.commons.lang3
+ org.talend.common.ui.runtime;visibility:=reexport,
+ org.talend.libraries.ui;visibility:=reexport,
+ org.eclipse.ui.workbench
 Eclipse-LazyStart: true
 Bundle-Vendor: .Talend SA.
 Export-Package: org.talend.commons.ui.command,

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

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

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=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
+SaveAsGenericSchemaPushButton.saveAsSchema=\u6C4E\u7528\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/swt/advanced/dataeditor/button/ExportPushButtonForExtendedTable.java

@@ -130,10 +130,11 @@ 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 extendedTableModel != null || enabled;
+        return super.getEnabledState() && enabled;
     }
 
 }

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

@@ -19,7 +19,6 @@ 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/>
@@ -34,11 +33,4 @@ 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/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,19 +106,15 @@ public class ColorManager {
     }
 
     public Color getColor(String colorName) {
-        Color prefColor = getThemeColor(colorName);
-        if (colorMap.containsKey(colorName) && (colorMap.get(colorName)).equals(prefColor)) {
-            return colorMap.get(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);
         } else {
-            colorMap.put(colorName, prefColor);
+            color = new Color(Display.getDefault(), prefColor);
+            colorMap.put(colorName, color);
         }
-        return prefColor;
-    }
-
-    private static Color getThemeColor(String colorName) {
-        Color c = ITalendThemeService.getColor(colorName)
-                .orElse(Display.getDefault().getSystemColor(SWT.COLOR_INFO_FOREGROUND));
-        return c;
+        return color;
     }
 
     public void dispose() {
@@ -168,20 +164,20 @@ public class ColorManager {
     }
 
     public static void initDefaultColors(IPreferenceStore store) {
-        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()));
+        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));
 
         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,384 +1,368 @@
-// ============================================================================
-//
-// 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);
-                    }
-
-                });
-            }
-        }
-    };
-
-}
+// ============================================================================
+//
+// 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);
+                    }
+
+                });
+            }
+        }
+    };
+
+}

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

@@ -12,8 +12,6 @@
 // ============================================================================
 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;
@@ -31,7 +29,5 @@ 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

@@ -1,66 +0,0 @@
-// ============================================================================
-//
-// 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,10 +62,6 @@ 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,14 +20,12 @@ 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;
@@ -158,7 +156,6 @@ 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;
@@ -169,7 +166,6 @@ public abstract class AbstractExtendedTableViewer<B> extends AbstractExtendedCon
         };
         final ILineSelectionListener afterLineSelectionListener = new ILineSelectionListener() {
 
-            @Override
             public void handle(LineSelectionEvent e) {
                 executeSelectionEvent = true;
             }
@@ -179,7 +175,6 @@ public abstract class AbstractExtendedTableViewer<B> extends AbstractExtendedCon
 
         DisposeListener disposeListener = new DisposeListener() {
 
-            @Override
             public void widgetDisposed(DisposeEvent e) {
                 selectionHelper.removeBeforeSelectionListener(beforeLineSelectionListener);
                 selectionHelper.removeAfterSelectionListener(afterLineSelectionListener);
@@ -190,7 +185,6 @@ 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
@@ -257,9 +251,7 @@ public abstract class AbstractExtendedTableViewer<B> extends AbstractExtendedCon
         newTableViewerCreator.setLazyLoad(TableViewerCreator.getRecommandLazyLoad());
         newTableViewerCreator.setFirstVisibleColumnIsSelection(false);
         newTableViewerCreator.setCheckboxInFirstColumn(false);
-        Color bgColorForEmptyArea = ITalendThemeService.getColor("org.talend.commons.ui.BgColorForEmptyArea")
-                .orElse(getParentComposite().getDisplay().getSystemColor(SWT.COLOR_WHITE));
-        newTableViewerCreator.setBgColorForEmptyArea(bgColorForEmptyArea);
+        newTableViewerCreator.setBgColorForEmptyArea(getParentComposite().getDisplay().getSystemColor(SWT.COLOR_WHITE));
     }
 
     /**
@@ -279,7 +271,6 @@ public abstract class AbstractExtendedTableViewer<B> extends AbstractExtendedCon
 
             getExtendedTableModel().addBeforeOperationListListener(1, new IListenableListListener() {
 
-                @Override
                 public void handleEvent(ListenableListEvent event) {
                     handleBeforeListenableListOperationEvent(event);
                 }
@@ -288,7 +279,6 @@ public abstract class AbstractExtendedTableViewer<B> extends AbstractExtendedCon
 
             getExtendedTableModel().addAfterOperationListListener(1, new IListenableListListener() {
 
-                @Override
                 public void handleEvent(ListenableListEvent event) {
                     handleAfterListenableListOperationEvent(event);
                 }
@@ -297,7 +287,6 @@ 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();
@@ -379,7 +368,6 @@ 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/tableviewer/celleditor/DialogErrorForCellEditorListener.java

@@ -16,10 +16,8 @@ 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;
@@ -41,8 +39,6 @@ public abstract class DialogErrorForCellEditorListener implements ICellEditorLis
     protected TableViewerCreatorColumn column;
 
     protected TableViewerCreator tableViewerCreator;
-    
-    private Color tableBackground = ColorConstants.getTableBackgroundColor();
 
     /**
      * DOC amaumont CellEditorListener constructor comment.
@@ -93,7 +89,7 @@ public abstract class DialogErrorForCellEditorListener implements ICellEditorLis
         final String errorMessage = validateValue(newValue, beanPosition);
         if (errorMessage == null) {
             newValidValueTyped(beanPosition, lastValidValue, newValue, state);
-            text.setBackground(tableBackground);
+            text.setBackground(text.getDisplay().getSystemColor(SWT.COLOR_WHITE));
             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,7 +31,6 @@ 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/>
@@ -78,8 +77,6 @@ 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.
@@ -265,8 +262,6 @@ public class SimpleHtmlFigure extends Figure {
             label.setFont(fontToUse);
             if (colorStack.size() > 0) {
                 label.setForegroundColor(colorStack.get(colorStack.size() - 1));
-            } else {
-                label.setForegroundColor(DEFAULT_LABEL_COLOR); // Set label default foreground color
             }
             horizContainer.add(label);
         }

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

@@ -3,7 +3,7 @@ Automatic-Module-Name: org.talend.core.repository
 Bundle-ManifestVersion: 2
 Bundle-Name: Core Repository Plug-in
 Bundle-SymbolicName: org.talend.core.repository;singleton:=true
-Bundle-Version: 8.8.8.qualifier
+Bundle-Version: 8.0.1.qualifier
 Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.ide,
  org.apache.commons.collections,
@@ -15,26 +15,7 @@ Require-Bundle: org.eclipse.ui,
  org.talend.libraries.apache,
  org.eclipse.osgi.services,
  org.eclipse.ui.navigator,
- 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
+ org.talend.libraries.jackson
 Export-Package: org.talend.core.repository,
  org.talend.core.repository.constants,
  org.talend.core.repository.document,

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

@@ -285,30 +285,6 @@
                 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"

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

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

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

@@ -39,18 +39,6 @@ public final class Constant {
      */
     public static final String ITEM_EVENT_PROPERTY_KEY = "item"; //$NON-NLS-1$
 
-    /**
-     * key used to get/set the property of an event related to an item (REPOSITORY_ITEM_EVENT_PREFIX). The value is the
-     * cloudVersion string.
-     */
-    public static final String VERSION_EVENT_CLOUD_KEY = "cloudVersion"; //$NON-NLS-1$
-
-    /**
-     * key used to get/set the property of an event related to an item (REPOSITORY_ITEM_EVENT_PREFIX). The value is the
-     * cloudName string.
-     */
-    public static final String VERSION_EVENT_CLOUD_NAME = "cloudName"; //$NON-NLS-1$
-
     /**
      * key used to get/set the property of an event related to a list of files modified in the repository
      * (REPOSITORY_ITEM_EVENT_PREFIX). The value is the Collection of String (list of all files modified).
@@ -74,9 +62,4 @@ public final class Constant {
      * (REPOSITORY_ITEM_EVENT_PREFIX). The value is the Collection of String (list of all files modified).
      */
     public static final String PROJECT_RELOAD_PROPERTY_KEY = "project"; //$NON-NLS-1$
-    
-    /**
-     * suffix used when issuing an event on the OSGI event bus when published to cloud.
-     */
-    public static final String CLOUD_PUBLISH_EVENT_SUFFIX = "cloud"; //$NON-NLS-1$
 }