diff --git a/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/engine/ExtraFeaturesUpdatesFactory.java b/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/engine/ExtraFeaturesUpdatesFactory.java index 27b90999c8..9c87950596 100644 --- a/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/engine/ExtraFeaturesUpdatesFactory.java +++ b/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/engine/ExtraFeaturesUpdatesFactory.java @@ -16,6 +16,7 @@ import java.util.Set; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IProgressMonitor; +import org.talend.commons.exception.ExceptionHandler; import org.talend.updates.runtime.engine.factory.AbstractExtraUpdatesFactory; import org.talend.updates.runtime.model.ExtraFeature; @@ -42,10 +43,14 @@ public class ExtraFeaturesUpdatesFactory { Assert.isNotNull(uninstalledExtraFeatures); } AbstractExtraUpdatesFactory[] updatesFactories = updatesFactoryReader.getUpdatesFactories(); - if (updatesFactories != null) { - for (AbstractExtraUpdatesFactory factory : updatesFactories) { - factory.retrieveUninstalledExtraFeatures(monitor, uninstalledExtraFeatures); + try { + if (updatesFactories != null) { + for (AbstractExtraUpdatesFactory factory : updatesFactories) { + factory.retrieveUninstalledExtraFeatures(monitor, uninstalledExtraFeatures); + } } + } catch (Exception e) { + ExceptionHandler.process(e); } } diff --git a/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/engine/factory/AbstractExtraUpdatesFactory.java b/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/engine/factory/AbstractExtraUpdatesFactory.java index 15d089545a..cc36d3f2fa 100644 --- a/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/engine/factory/AbstractExtraUpdatesFactory.java +++ b/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/engine/factory/AbstractExtraUpdatesFactory.java @@ -24,7 +24,8 @@ import org.talend.updates.runtime.model.ExtraFeature; */ public abstract class AbstractExtraUpdatesFactory { - public abstract void retrieveUninstalledExtraFeatures(IProgressMonitor monitor, Set uninstalledExtraFeatures); + public abstract void retrieveUninstalledExtraFeatures(IProgressMonitor monitor, Set uninstalledExtraFeatures) + throws Exception; // after update studio, will do this. public void afterUpdate() { diff --git a/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/engine/factory/PluginOptionalMissingJarsExtraUpdatesFactory.java b/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/engine/factory/PluginOptionalMissingJarsExtraUpdatesFactory.java index a428ec07e3..7b7dddf912 100644 --- a/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/engine/factory/PluginOptionalMissingJarsExtraUpdatesFactory.java +++ b/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/engine/factory/PluginOptionalMissingJarsExtraUpdatesFactory.java @@ -45,7 +45,8 @@ public class PluginOptionalMissingJarsExtraUpdatesFactory extends AbstractExtraU * .runtime.IProgressMonitor, java.util.Set) */ @Override - public void retrieveUninstalledExtraFeatures(IProgressMonitor monitor, Set uninstalledExtraFeatures) { + public void retrieveUninstalledExtraFeatures(IProgressMonitor monitor, Set uninstalledExtraFeatures) + throws Exception { SubMonitor mainSubMonitor = SubMonitor.convert(monitor, 2); List unistalledModulesNeeded = ModulesNeededProvider diff --git a/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/engine/factory/PluginRequiredMissingJarsExtraUpdatesFactory.java b/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/engine/factory/PluginRequiredMissingJarsExtraUpdatesFactory.java index d8507fd77b..9cc09b9a7b 100644 --- a/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/engine/factory/PluginRequiredMissingJarsExtraUpdatesFactory.java +++ b/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/engine/factory/PluginRequiredMissingJarsExtraUpdatesFactory.java @@ -45,7 +45,8 @@ public class PluginRequiredMissingJarsExtraUpdatesFactory extends AbstractExtraU * .runtime.IProgressMonitor, java.util.Set) */ @Override - public void retrieveUninstalledExtraFeatures(IProgressMonitor monitor, Set uninstalledExtraFeatures) { + public void retrieveUninstalledExtraFeatures(IProgressMonitor monitor, Set uninstalledExtraFeatures) + throws Exception { SubMonitor mainSubMonitor = SubMonitor.convert(monitor, 2); diff --git a/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/ui/UpdateStudioWizard.java b/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/ui/UpdateStudioWizard.java index 2aa5c29cd5..dc75cbb16b 100644 --- a/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/ui/UpdateStudioWizard.java +++ b/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/ui/UpdateStudioWizard.java @@ -34,6 +34,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; import org.osgi.service.prefs.BackingStoreException; import org.talend.commons.exception.ExceptionHandler; +import org.talend.updates.runtime.UpdatesRuntimePlugin; import org.talend.updates.runtime.engine.ExtraFeaturesUpdatesFactory; import org.talend.updates.runtime.engine.InstallNewFeatureJob; import org.talend.updates.runtime.i18n.Messages; @@ -55,7 +56,7 @@ public class UpdateStudioWizard extends Wizard { /** * preference node for the org.talend.updates plugin. */ - public static final String ORG_TALEND_UPDATES_PREF_NODE = "org.talend.updates"; //$NON-NLS-1$ + public static final String ORG_TALEND_UPDATES_PREF_NODE = UpdatesRuntimePlugin.PLUGIN_ID; UpdateWizardModel updateWizardModel;// model that hold all the parameters set in the wizard