Added patch from #1437426: error in assign template

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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/HTMLFileWizard.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/HTMLFileWizard.java
index c699b5e..0f9c718 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/HTMLFileWizard.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/HTMLFileWizard.java
@@ -24,6 +24,7 @@ import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -55,12 +56,10 @@ public class HTMLFileWizard extends Wizard implements INewWizard {
 
   private ISelection selection;
 
-  // the name of the file to create
-  private String fFileName;
-
   public HTMLFileWizard() {
     super();
     setNeedsProgressMonitor(true);
+    setWindowTitle(PHPWizardMessages.getString("WizardNewProjectCreationPage.html.windowTitle"));
   }
 
   /**
@@ -115,9 +114,11 @@ public class HTMLFileWizard extends Wizard implements INewWizard {
     }
     IContainer container = (IContainer) resource;
     final IFile file = container.getFile(new Path(fileName));
+    IProject project = file.getProject();
+    String projectName = project.getName();
     try {
       InputStream stream;
-      stream = openContentStream(fileName);
+      stream = openContentStream(fileName, projectName);
       if (file.exists()) {
         file.setContents(stream, true, true, monitor);
       } else {
@@ -143,7 +144,7 @@ public class HTMLFileWizard extends Wizard implements INewWizard {
   /**
    * We will initialize file contents with a sample text.
    */
-  private InputStream openContentStream(String fileName) {
+  private InputStream openContentStream(String fileName, String projectname) {
     try {
       Template template = PHPeclipsePlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.NEWHTML);
       if (template == null) {
@@ -151,7 +152,7 @@ public class HTMLFileWizard extends Wizard implements INewWizard {
       }
       String lineDelimiter = System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
       CodeTemplateContext context = new CodeTemplateContext(template.getContextTypeId(), null, lineDelimiter);
-      context.setFileNameVariable(fileName);
+      context.setFileNameVariable(fileName, projectname);
       return new ByteArrayInputStream(StubUtility.evaluateTemplate(context, template).getBytes());
     } catch (CoreException e) {
       e.printStackTrace();
@@ -166,17 +167,11 @@ public class HTMLFileWizard extends Wizard implements INewWizard {
 
   /**
    * We will accept the selection in the workbench to see if we can initialize from it.
-   * 
+   *
    * @see IWorkbenchWizard#init(IWorkbench, IStructuredSelection)
    */
   public void init(IWorkbench workbench, IStructuredSelection selection) {
     this.selection = selection;
   }
 
-  /**
-   * Sets the name of the file to create (used to set the class name in the new file)
-   */
-  public void setFileName(String name) {
-    fFileName = name;
-  }
 }
\ No newline at end of file