X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/PHPFileWizardPage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/PHPFileWizardPage.java
index c84715c..cb4cb35 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/PHPFileWizardPage.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/PHPFileWizardPage.java
@@ -9,14 +9,10 @@ package net.sourceforge.phpeclipse.wizards;
 
  Contributors:
  IBM Corporation - Initial implementation
- Klaus Hartlage - www.eclipseproject.de
+ www.phpeclipse.de
  **********************************************************************/
 
-import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
-
 import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
@@ -45,7 +41,9 @@ import org.eclipse.ui.dialogs.ContainerSelectionDialog;
  */
 
 public class PHPFileWizardPage extends WizardPage {
-  private Text containerText;
+  private static final String INITIAL_FILENAME = "file.php";
+
+private Text containerText;
 
   private Text fileText;
 
@@ -125,9 +123,10 @@ public class PHPFileWizardPage extends WizardPage {
         else
           container = ((IResource) obj).getParent();
         containerText.setText(container.getFullPath().toString());
+        fileText.setFocus();
       }
     }
-    fileText.setText("*.php");
+    fileText.setText(INITIAL_FILENAME);
   }
 
   /**
@@ -140,10 +139,13 @@ public class PHPFileWizardPage extends WizardPage {
         ResourcesPlugin.getWorkspace().getRoot(), false, PHPWizardMessages
             .getString("WizardPage.selectNewFileContainer"));
     if (dialog.open() == ContainerSelectionDialog.OK) {
-      Object[] result = dialog.getResult();
-      if (result.length == 1) {
-        IContainer container = (IContainer) result[0];
-        containerText.setText(container.getFullPath().toString());
+      Object[] results = dialog.getResult();
+      if (results.length == 1) {
+    	  Object result=results[0];
+    	  if (result instanceof IPath) {
+    		  IPath ipath = (IPath) result;
+    		  containerText.setText(ipath.toString());
+    	  }
       }
     }
   }
@@ -165,10 +167,6 @@ public class PHPFileWizardPage extends WizardPage {
       return;
     }
 
-//    if (!PHPFileUtil.isPHPFileName(fileName)) {
-//      updateStatus(PHPWizardMessages.getString("WizardPage.mustBePHP"));
-//      return;
-//    }
     updateStatus(null);
   }
 
@@ -193,43 +191,54 @@ public class PHPFileWizardPage extends WizardPage {
   }
 
   /**
-   * Finds the current directory where the file should be created
-   */
-  protected boolean checkFolderForExistingFile() {
-    boolean result = false;
-
-    if (containerText.getText() != null) {
-      IPath containerPath = new Path(containerText.getText().trim());
-      if (containerPath.segmentCount() > 1) {
-        IFolder container = ResourcesPlugin.getWorkspace().getRoot().getFolder(
-            containerPath);
-        if (container != null && container.exists()) {
-          IResource file = container.getFile(fileText.getText().trim());
-          if (file != null && file.exists()) {
-            this.setErrorMessage(PHPWizardMessages
-                .getString("WizardPage.fileAlreadyExists"));
-            result = true;
-          }
-        }
-      } else {
-        // this is a project
-        IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
-            containerText.getText().trim());
-        if (project != null && project.exists()) {
-          IResource file = project.getFile(fileText.getText().trim());
-          if (file != null && file.exists()) {
-            this.setErrorMessage(PHPWizardMessages
-                .getString("WizardPage.fileAlreadyExists"));
-            result = true;
-          }
-        }
-      }
-    }
-
-    if (!result)
-      ((PHPFileWizard) this.getWizard()).setFileName(fileText.getText().trim());
-
-    return result;
-  }
+	 * Finds the current directory where the file should be created
+	 */
+	protected boolean checkFolderForExistingFile() {
+		IContainer container = getFileContainer();
+		if (container != null) {
+			IResource file = container.getFile(new Path(fileText.getText()
+					.trim()));
+			if (file != null && file.exists()) {
+				this.setErrorMessage(PHPWizardMessages
+						.getString("WizardPage.fileAlreadyExists"));
+				return true;
+			}
+
+			((PHPFileWizard) this.getWizard()).setFileName(fileText.getText()
+					.trim());
+		}
+		return false;
+	}
+
+	private IContainer getFileContainer() {
+		if (containerText.getText() != null) {
+			IPath containerPath = new Path(containerText.getText().trim());
+			IContainer container;
+			if (containerPath.segmentCount() > 1) {
+				container = ResourcesPlugin.getWorkspace().getRoot().getFolder(
+						containerPath);
+			} else {
+				// this is a project
+				container = ResourcesPlugin.getWorkspace().getRoot()
+						.getProject(containerText.getText().trim());
+			}
+			if (container != null && container.exists()) {
+				return container;
+			}
+		}
+		return null;
+	}
+
+	public void setVisible(boolean visible) {
+		super.setVisible(visible);
+		if (visible) {
+			String fileName=fileText.getText().trim();
+			if (getFileContainer() != null && fileName.equalsIgnoreCase(INITIAL_FILENAME)) {
+				fileText.setFocus();
+				fileText.setText(fileName);
+				fileText.setSelection(0, fileName.length()-(new Path(INITIAL_FILENAME)).getFileExtension().length()-1);
+			}
+		}
+	}
 
 }
\ No newline at end of file