feat(TUP-32562): Merge branch 'master' into bhe/feat/TUP-32562

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

@@ -15,6 +15,7 @@ package org.talend.core.service;
 import java.net.URI;
 import java.util.Collection;
 import java.util.List;
+import java.util.Set;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -80,6 +81,17 @@ public interface IStudioLiteP2Service extends IService {
 
     int installRequiredFeatures(IProgressMonitor monitor, ValidateRequiredFeaturesHook hook, Project proj) throws Exception;
 
+    ValidateMergingFeaturesHook validateMergingFeatures(IProgressMonitor monitor, Project proj, Set<String> backupedFeaturesTempFiles) throws Exception;
+    
+    /**
+     * show merging features wizard
+     * 
+     * @return {@link IStudioLiteP2Service#RESULT_DONE}<br/>
+     * {@link IStudioLiteP2Service#RESULT_SKIP}<br/>
+     * {@link IStudioLiteP2Service#RESULT_CANCEL}<br/>
+     */
+    int showMergingFeaturesWizard(ValidateMergingFeaturesHook hook, Project proj) throws Exception;
+    
     /**
      * selected features will be write into the required feature list of project
      * 
@@ -149,6 +161,15 @@ public interface IStudioLiteP2Service extends IService {
         List<IInstallableUnitInfo> getMissingRequiredFeatures();
 
     }
+    
+    public static interface ValidateMergingFeaturesHook {
+
+        boolean showWizard();
+
+        Set<IInstallableUnitInfo> getNewlyActivatedFeatures();
+        Set<IInstallableUnitInfo> getDeActivatedFeatures();
+
+    }
 
     public static interface UpdateSiteConfig {