jprdonnelly/tcommon-studio-se
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

https://jira.talendforge.org/browse/TUP-2107 : Add exception checking for updates factory.

Browse Source
This commit is contained in:
GGu
2014-07-17 16:55:26 +08:00
parent c746af63ca
commit 984ada2d13
5 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/engine/ExtraFeaturesUpdatesFactory.java
View File

@@ -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);
}
}

3
main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/engine/factory/AbstractExtraUpdatesFactory.java
View File

@@ -24,7 +24,8 @@ import org.talend.updates.runtime.model.ExtraFeature;
*/
public abstract class AbstractExtraUpdatesFactory {
public abstract void retrieveUninstalledExtraFeatures(IProgressMonitor monitor, Set<ExtraFeature> uninstalledExtraFeatures);
public abstract void retrieveUninstalledExtraFeatures(IProgressMonitor monitor, Set<ExtraFeature> uninstalledExtraFeatures)
throws Exception;
// after update studio, will do this.
public void afterUpdate() {

3
main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/engine/factory/PluginOptionalMissingJarsExtraUpdatesFactory.java
View File

@@ -45,7 +45,8 @@ public class PluginOptionalMissingJarsExtraUpdatesFactory extends AbstractExtraU
* .runtime.IProgressMonitor, java.util.Set)
*/
@Override
public void retrieveUninstalledExtraFeatures(IProgressMonitor monitor, Set<ExtraFeature> uninstalledExtraFeatures) {
public void retrieveUninstalledExtraFeatures(IProgressMonitor monitor, Set<ExtraFeature> uninstalledExtraFeatures)
throws Exception {
SubMonitor mainSubMonitor = SubMonitor.convert(monitor, 2);
List<ModuleNeeded> unistalledModulesNeeded = ModulesNeededProvider

3
main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/engine/factory/PluginRequiredMissingJarsExtraUpdatesFactory.java
View File

@@ -45,7 +45,8 @@ public class PluginRequiredMissingJarsExtraUpdatesFactory extends AbstractExtraU
* .runtime.IProgressMonitor, java.util.Set)
*/
@Override
public void retrieveUninstalledExtraFeatures(IProgressMonitor monitor, Set<ExtraFeature> uninstalledExtraFeatures) {
public void retrieveUninstalledExtraFeatures(IProgressMonitor monitor, Set<ExtraFeature> uninstalledExtraFeatures)
throws Exception {
SubMonitor mainSubMonitor = SubMonitor.convert(monitor, 2);

3
main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/ui/UpdateStudioWizard.java
View File

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