475011: SWTException in MarketplaceDiscoveryResources.getImage (107)
- log a warning when image creation fails
Bug: 475011
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=475011
diff --git a/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/MarketplaceDiscoveryResources.java b/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/MarketplaceDiscoveryResources.java
index 4b91005..51e8cb4 100644
--- a/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/MarketplaceDiscoveryResources.java
+++ b/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/MarketplaceDiscoveryResources.java
@@ -154,7 +154,15 @@
@Override
protected IStatus run(IProgressMonitor monitor) {
if (!display.isDisposed()) {
- final Image image = getImage(discoverySource, imagePath);
+ final Image image;
+ try {
+ image = getImage(discoverySource, imagePath);
+ } catch (Exception e) {
+ MarketplaceClientUi.log(IStatus.WARNING,
+ Messages.MarketplaceDiscoveryResources_FailedCreatingImage, imagePath,
+ discoverySource.getId(), e);
+ return Status.CANCEL_STATUS;//we don't want any additional logging or error popups...
+ }
if (image != null) {
display.asyncExec(new Runnable() {
public void run() {
diff --git a/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/Messages.java b/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/Messages.java
index 6ecf6f1..83aaf56 100644
--- a/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/Messages.java
+++ b/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/Messages.java
@@ -122,6 +122,7 @@
public static String MarketplaceClientService_noProvisioningOperation;
public static String MarketplaceDiscoveryResources_LoadImageError;
+ public static String MarketplaceDiscoveryResources_FailedCreatingImage;
public static String MarketplaceDiscoveryResources_retrievingImage;
diff --git a/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/messages.properties b/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/messages.properties
index c3b16d5..51df14c 100644
--- a/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/messages.properties
+++ b/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/messages.properties
@@ -62,6 +62,7 @@
MarketplaceClientService_ExecuteError=Error opening Marketplace Client
MarketplaceClientService_noProvisioningOperation=No provisioning operations specified
MarketplaceDiscoveryResources_LoadImageError=Unable to load image {0}
+MarketplaceDiscoveryResources_FailedCreatingImage=Failed to create image {0} from catalog source {1}
MarketplaceDiscoveryResources_retrievingImage=Retrieving catalog image
MarketplaceDropAdapter_0=Marketplace DND Initialization
MarketplacePage_DefaultNewsTitle=News
