[jbosstools-commits] JBoss Tools SVN: r7028 - trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2008-03-19 23:07:31 -0400 (Wed, 19 Mar 2008)
New Revision: 7028

Modified:
   trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java
Log:
Commit for NPE.  Display is not always available. 

Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java	2008-03-20 02:59:05 UTC (rev 7027)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java	2008-03-20 03:07:31 UTC (rev 7028)
@@ -28,13 +28,11 @@
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.dialogs.IOverwriteQuery;
 import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
 import org.eclipse.ui.wizards.datatransfer.ImportOperation;
@@ -67,7 +65,10 @@
 					Arrays.asList(new File(tplPrjLcStr).listFiles()));
 
 		op.setCreateContainerStructure(false);
-		op.setContext(Display.getCurrent().getActiveShell());
+		if( Display.getCurrent() == null || Display.getCurrent().getActiveShell() == null )
+			op.setContext(new Shell());
+		else
+			op.setContext(Display.getCurrent().getActiveShell());
 		op.run(monitor);
 		return importedPrj;
 	}