From ee74a4275224e0b82373628128e857947458c634 Mon Sep 17 00:00:00 2001
From: Szymon Brandys
Date: Mon, 27 Sep 2010 16:09:17 +0000
Subject: bug 300007 - NullPointerException importing project set

---
 .../eclipse/team/internal/ui/actions/ImportProjectSetAction.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'bundles/org.eclipse.team.ui')

diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/ImportProjectSetAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/ImportProjectSetAction.java
index 033124426..eff765b8a 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/ImportProjectSetAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/ImportProjectSetAction.java
@@ -17,7 +17,6 @@ import java.util.Iterator;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.*;
 import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -28,6 +27,7 @@ import org.eclipse.team.internal.ui.wizards.ImportProjectSetOperation;
 import org.eclipse.ui.*;
 import org.eclipse.ui.actions.ActionDelegate;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.statushandlers.StatusManager;
 
 public class ImportProjectSetAction extends ActionDelegate implements IObjectActionDelegate {
 
@@ -51,7 +51,12 @@ public class ImportProjectSetAction extends ActionDelegate implements IObjectAct
 				}
 			});
 		} catch (InvocationTargetException exception) {
-			ErrorDialog.openError(shell, null, null, new Status(IStatus.ERROR, TeamUIPlugin.PLUGIN_ID, IStatus.ERROR, TeamUIMessages.ImportProjectSetAction_0, exception.getTargetException()));
+			StatusManager.getManager().handle(
+					new Status(IStatus.ERROR, TeamUIPlugin.PLUGIN_ID,
+							IStatus.ERROR,
+							TeamUIMessages.ImportProjectSetAction_0,
+							exception.getTargetException()),
+					StatusManager.LOG | StatusManager.SHOW);
 		} catch (InterruptedException exception) {
 		}
 	}
-- 
cgit v1.2.3