[Pydev-cvs] org.python.pydev/src/org/python/pydev/ui/wizards/project IWizardNewProjectNameAndLocationPage.java, NONE, 1.1 PythonProjectWizard.java, 1.6, 1.7 CopiedWizardNewProjectNameAndLocationPage.java, 1.4, 1.5

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/ui/wizards/project
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16654/src/org/python/pydev/ui/wizards/project

Modified Files:
	PythonProjectWizard.java 
	CopiedWizardNewProjectNameAndLocationPage.java 
Added Files:
	IWizardNewProjectNameAndLocationPage.java 
Log Message:
Applied patch: Make PythonProjectWizard more suitable as a base

https://sourceforge.net/tracker/index.php?func=detail&aid=2005178&group_id=85796&atid=577329

Index: CopiedWizardNewProjectNameAndLocationPage.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/ui/wizards/project/CopiedWizardNewProjectNameAndLocationPage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CopiedWizardNewProjectNameAndLocationPage.java	24 Sep 2007 23:14:21 -0000	1.4
--- CopiedWizardNewProjectNameAndLocationPage.java	29 Jun 2008 14:48:25 -0000	1.5
***************
*** 58,62 ****
   */
  
! public class CopiedWizardNewProjectNameAndLocationPage extends WizardPage implements SelectionListener {
      // Whether to use default or custom project location
      private boolean useDefaults = true;
--- 58,64 ----
   */
  
! public class CopiedWizardNewProjectNameAndLocationPage extends WizardPage implements SelectionListener,
!         IWizardNewProjectNameAndLocationPage
! {
      // Whether to use default or custom project location
      private boolean useDefaults = true;
***************
*** 112,115 ****
--- 114,119 ----
      public CopiedWizardNewProjectNameAndLocationPage(String pageName) {
          super(pageName);
+         setTitle("Pydev Project");
+         setDescription("Create a new Pydev Project.");
          setPageComplete(false);
          initialLocationFieldValue = Platform.getLocation();
***************
*** 305,309 ****
       *   if no project location path is known
       */
!     /* package */IPath getLocationPath() {
          if (useDefaults)
              return initialLocationFieldValue;
--- 309,313 ----
       *   if no project location path is known
       */
!     public IPath getLocationPath() {
          if (useDefaults)
              return initialLocationFieldValue;
***************
*** 321,325 ****
       * @return the new project resource handle
       */
!     /* package */IProject getProjectHandle() {
          return ResourcesPlugin.getWorkspace().getRoot().getProject(
                  getProjectName());
--- 325,329 ----
       * @return the new project resource handle
       */
!     public IProject getProjectHandle() {
          return ResourcesPlugin.getWorkspace().getRoot().getProject(
                  getProjectName());

Index: PythonProjectWizard.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/ui/wizards/project/PythonProjectWizard.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PythonProjectWizard.java	19 Mar 2007 01:21:01 -0000	1.6
--- PythonProjectWizard.java	29 Jun 2008 14:48:25 -0000	1.7
***************
*** 62,66 ****
      WelcomePage welcomePage = new WelcomePage("Creating a new modelled Python Project");
  
!     CopiedWizardNewProjectNameAndLocationPage projectPage = new CopiedWizardNewProjectNameAndLocationPage("Setting project properties");
  
      WizardNewProjectReferencePage referencePage;
--- 62,66 ----
      WelcomePage welcomePage = new WelcomePage("Creating a new modelled Python Project");
  
!     IWizardNewProjectNameAndLocationPage projectPage;
  
      WizardNewProjectReferencePage referencePage;
***************
*** 78,81 ****
--- 78,89 ----
          this.selection = currentSelection;
          initializeDefaultPageImageDescriptor();
+         projectPage = createProjectPage();
+     }
+ 
+     /**
+      * Creates the project page.
+      */
+     protected IWizardNewProjectNameAndLocationPage createProjectPage(){
+         return new CopiedWizardNewProjectNameAndLocationPage("Setting project properties");
      }
  
***************
*** 91,94 ****
--- 99,109 ----
          }
          addPage(projectPage);
+         addProjectReferencePage();
+     }
+ 
+     /**
+      * Adds the project references page to the wizard.
+      */
+     protected void addProjectReferencePage(){
          // only add page if there are already projects in the workspace
          if (ResourcesPlugin.getWorkspace().getRoot().getProjects().length > 0) {
***************
*** 98,102 ****
              this.addPage(referencePage);
          }
- 
      }
  
--- 113,116 ----
***************
*** 149,153 ****
       * @return the created project resource, or <code>null</code> if the project was not created
       */
!     private IProject createNewProject() {
          // get a project handle
          final IProject newProjectHandle = projectPage.getProjectHandle();
--- 163,167 ----
       * @return the created project resource, or <code>null</code> if the project was not created
       */
!     protected IProject createNewProject() {
          // get a project handle
          final IProject newProjectHandle = projectPage.getProjectHandle();

--- NEW FILE: IWizardNewProjectNameAndLocationPage.java ---
/**
 * 
 */
package org.python.pydev.ui.wizards.project;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jface.wizard.IWizardPage;

/**
 * The first page in the New Project wizard must implement this interface.
 */
public interface IWizardNewProjectNameAndLocationPage extends IWizardPage
{
    /**
     * Returns a flag indicating whether the default python src folder
     * should be created.
     */
    public boolean shouldCreatSourceFolder();

    /**
     * Returns the project type.
     */
    public String getProjectType();

    /**
     * Returns a handle to the new project.
     */
    public IProject getProjectHandle();

    /**
     * Gets the location path for the new project.
     */
    public IPath getLocationPath();

}