committing phphelp to Plug-ins for feature to fix build dependence for phpmanual.

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / wizards / NewProjectCreationWizard.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/NewProjectCreationWizard.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/NewProjectCreationWizard.java
index 0601e03..28ce603 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/NewProjectCreationWizard.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/NewProjectCreationWizard.java
@@ -1,6 +1,7 @@
 package net.sourceforge.phpeclipse.wizards;
 
 import java.lang.reflect.InvocationTargetException;
+import java.net.URI;
 
 import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.ui.actions.OpenPHPPerspectiveAction;
@@ -8,13 +9,13 @@ import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.ui.INewWizard;
@@ -66,15 +67,15 @@ public class NewProjectCreationWizard extends BasicNewResourceWizard implements
                                                                remainingWorkUnits);
 
                                IWorkspace workspace = PHPeclipsePlugin.getWorkspace();
-                               newProject = projectPage.getProjectHandle();
-
+                               String projectName = projectPage.getProjectHandle().getName();
+                               newProject = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
                                IProjectDescription description = workspace
-                                               .newProjectDescription(newProject.getName());
-                               IPath path = Platform.getLocation();
-                               IPath customPath = projectPage.getLocationPath();
-                               if (!path.equals(customPath)) {
-                                       path = customPath;
-                                       description.setLocation(path);
+                                               .newProjectDescription(projectName);
+                               
+                               URI uriPath = (!projectPage.useDefaults()) ? projectPage
+                               .getLocationURI() : null;
+                               if (uriPath != null) {                              
+                                       description.setLocationURI(uriPath);
                                }
 
                                try {
@@ -84,12 +85,14 @@ public class NewProjectCreationWizard extends BasicNewResourceWizard implements
                                                remainingWorkUnits--;
                                        }
                                        if (!newProject.isOpen()) {
-                                               newProject.open(new SubProgressMonitor(monitor, 1));
+                                           newProject.open(IResource.BACKGROUND_REFRESH, new SubProgressMonitor(monitor, 1));
                                                remainingWorkUnits--;
                                        }
                                        JavaCore.addPHPNature(newProject, new SubProgressMonitor(
                                                        monitor, remainingWorkUnits));
+
                                } catch (CoreException e) {
+                                   System.out.println(e);
                                        throw new InvocationTargetException(e);
                                } finally {
                                        monitor.done();