[jbosstools-commits] JBoss Tools SVN: r41313 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action.

[jbosstools-commits at lists.jboss.org]

Author: xcoulon
Date: 2012-05-23 15:55:29 -0400 (Wed, 23 May 2012)
New Revision: 41313

Modified:
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java
Log:
Fixed - JBIDE-11842
NPE when removing Jenkins app

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java	2012-05-23 19:48:52 UTC (rev 41312)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java	2012-05-23 19:55:29 UTC (rev 41313)
@@ -25,8 +25,8 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
 import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
-import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
 
 import com.openshift.client.IApplication;
 import com.openshift.client.OpenShiftException;
@@ -89,11 +89,9 @@
 							try {
 								application.destroy();
 							} catch (OpenShiftException e) {
-								MessageDialog.openError(Display.getCurrent().getActiveShell(), NLS.bind("Failed to delete application \"{0}\"", appName), e.getMessage());
-								Logger.error(NLS.bind("Failed to delete application \"{0}\"", appName), e);
+								return OpenShiftUIActivator.createErrorStatus(NLS.bind("Failed to delete application \"{0}\"", appName), e);
 							} catch (SocketTimeoutException e) {
-								MessageDialog.openError(Display.getCurrent().getActiveShell(), NLS.bind("Failed to delete application \"{0}\"", appName), e.getMessage());
-								Logger.error(NLS.bind("Failed to delete application \"{0}\"", appName), e);
+								return OpenShiftUIActivator.createErrorStatus(NLS.bind("Failed to delete application \"{0}\"", appName), e);
 							}
 						}
 					} finally {