# HG changeset patch
# User Alexander Simon <alexvsimon@netbeans.org>
# Date 1429111930 -10800
#      Wed Apr 15 18:32:10 2015 +0300
# Node ID 7515ccb7d9b0956de3b7b9654bbe3d18c876c652
# Parent  c2065aecd05641be9178a3fae1bf6e330dc7961e
partial fix for C/C++ files (bug #251631)

diff --git a/cnd/src/org/netbeans/modules/cnd/resources/mf-layer.xml b/cnd/src/org/netbeans/modules/cnd/resources/mf-layer.xml
--- a/cnd/src/org/netbeans/modules/cnd/resources/mf-layer.xml
+++ b/cnd/src/org/netbeans/modules/cnd/resources/mf-layer.xml
@@ -101,6 +101,8 @@
             <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.cnd.resources.Bundle"/>
             <attr name="position" intvalue="450"/>
             <attr name="templateWizardURL" urlvalue="nbresloc:/org/netbeans/modules/cnd/resources/cFiles.html"/>
+            <attr name="templateWizardIterator" newvalue="org.netbeans.modules.cnd.editor.filecreation.CCFSrcFileIterator"/>
+            <attr name="templateCategory" stringvalue="c-types"/>
             
             <file name="file.c" url="templates/c/empty-c.template">
                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.cnd.resources.Bundle"/>
@@ -136,6 +138,8 @@
             <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.cnd.resources.Bundle"/>
             <attr name="position" intvalue="550"/>
             <attr name="templateWizardURL" urlvalue="nbresloc:/org/netbeans/modules/cnd/resources/cppFiles.html"/>
+            <attr name="templateWizardIterator" newvalue="org.netbeans.modules.cnd.editor.filecreation.CCFSrcFileIterator"/>
+            <attr name="templateCategory" stringvalue="cpp-types"/>
                        
             <file name="file.cc" url="templates/cpp/empty-cc.template">
                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.cnd.resources.Bundle"/>
@@ -291,6 +295,8 @@
             <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.cnd.resources.Bundle"/>
             <attr name="position" intvalue="650"/>
             <attr name="templateWizardURL" urlvalue="nbresloc:/org/netbeans/modules/cnd/resources/fortranFiles.html"/>
+            <attr name="templateWizardIterator" newvalue="org.netbeans.modules.cnd.editor.filecreation.CCFSrcFileIterator"/>
+            <attr name="templateCategory" stringvalue="fortran-types"/>
             
             <file name="fortranEmptyFile.f90" url="templates/fortran/empty-f90.template">
                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.cnd.resources.Bundle"/>
diff --git a/openide.loaders/src/org/openide/loaders/TemplateWizard.java b/openide.loaders/src/org/openide/loaders/TemplateWizard.java
--- a/openide.loaders/src/org/openide/loaders/TemplateWizard.java
+++ b/openide.loaders/src/org/openide/loaders/TemplateWizard.java
@@ -706,6 +706,9 @@
         Object unknownIterator = obj.getPrimaryFile ().getAttribute(CUSTOM_ITERATOR);
         if (unknownIterator == null) {
             unknownIterator = obj.getPrimaryFile ().getAttribute(EA_ITERATOR);
+            if (unknownIterator == null) {
+                unknownIterator = obj.getPrimaryFile ().getParent().getAttribute(EA_ITERATOR);
+            }
         }
         Iterator it = null;
         if (unknownIterator instanceof Iterator) {