diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewHeaderFileCreationWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewHeaderFileCreationWizardPage.java index 719d5487739..99b1feb7f28 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewHeaderFileCreationWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewHeaderFileCreationWizardPage.java @@ -27,6 +27,7 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil; import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField; import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; @@ -193,12 +194,15 @@ public class NewHeaderFileCreationWizardPage extends AbstractFileCreationWizardP public String getDefaultTemplateName() { String name = getDialogSettings().get(KEY_LAST_USED_TEMPLATE); if (name == null) { - String contentType = CProject.hasCCNature(getCurrentProject()) ? - CCorePlugin.CONTENT_TYPE_CXXHEADER : CCorePlugin.CONTENT_TYPE_CHEADER; - Template[] templates = - StubUtility.getFileTemplatesForContentTypes(new String[] { contentType }, null); - if (templates.length != 0) { - name = templates[0].getName(); + IProject project = getCurrentProject(); + if (project != null) { + String contentType = CProject.hasCCNature(project) ? + CCorePlugin.CONTENT_TYPE_CXXHEADER : CCorePlugin.CONTENT_TYPE_CHEADER; + Template[] templates = + StubUtility.getFileTemplatesForContentTypes(new String[] { contentType }, null); + if (templates.length != 0) { + name = templates[0].getName(); + } } } return name; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewSourceFileCreationWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewSourceFileCreationWizardPage.java index 919e1bd6ada..0e52f43e172 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewSourceFileCreationWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewSourceFileCreationWizardPage.java @@ -13,6 +13,7 @@ package org.eclipse.cdt.internal.ui.wizards.filewizard; import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; @@ -194,12 +195,15 @@ public class NewSourceFileCreationWizardPage extends AbstractFileCreationWizardP public String getDefaultTemplateName() { String name = getDialogSettings().get(KEY_LAST_USED_TEMPLATE); if (name == null) { - String contentType = CProject.hasCCNature(getCurrentProject()) ? - CCorePlugin.CONTENT_TYPE_CXXHEADER : CCorePlugin.CONTENT_TYPE_CHEADER; - Template[] templates = - StubUtility.getFileTemplatesForContentTypes(new String[] { contentType }, null); - if (templates.length != 0) { - name = templates[0].getName(); + IProject project = getCurrentProject(); + if (project != null) { + String contentType = CProject.hasCCNature(project) ? + CCorePlugin.CONTENT_TYPE_CXXHEADER : CCorePlugin.CONTENT_TYPE_CHEADER; + Template[] templates = + StubUtility.getFileTemplatesForContentTypes(new String[] { contentType }, null); + if (templates.length != 0) { + name = templates[0].getName(); + } } } return name;