Attachment #14670 for bug #42192

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 42192
Collapse All | Expand All




            <!-- Add template for the J2SE project -->
            <file name="emptyJ2SE.xml">
                <attr name="template" boolvalue="true"/>
                <attr name="instantiatingIterator" newvalue="org.netbeans.modules.java.j2seproject.ui.wizards.NewJ2SEProjectWizardIterator"/>
                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.java.j2seproject.ui.wizards.Bundle"/>
                <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/java/j2seproject/ui/resources/j2seProject.gif"/>
                <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/java/j2seproject/ui/resources/emptyProject.html"/>
            </file>
        
            <file name="emptyJ2SElibrary.xml">
                <attr name="template" boolvalue="true"/>
                <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.java.j2seproject.ui.wizards.NewJ2SEProjectWizardIterator.library"/>
                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.java.j2seproject.ui.wizards.Bundle"/>
                <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/java/j2seproject/ui/resources/j2seProject.gif"/>
                <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/java/j2seproject/ui/resources/emptyLibrary.html"/>
            </file>
            
        </folder>




import org.openide.WizardDescriptor;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.loaders.TemplateWizard;
import org.openide.util.HelpCtx;

/**


    public void readSettings( Object settings ) {
        
        WizardDescriptor wizard = (WizardDescriptor) settings;
        
        if ( gui != null ) {
            
            Project project = Templates.getProject( wizard );
            
            // Try to preselect a folder
            // XXX The test should be rewritten if external project dirs are supported
            
            FileObject preselectedTarget = Templates.getTargetFolder( wizard );
            String targetFolder = null;
            if ( preselectedTarget != null && FileUtil.isParentOf( project.getProjectDirectory(), preselectedTarget ) ) {
                targetFolder = FileUtil.getRelativePath( project.getProjectDirectory(), preselectedTarget );
            }
                        
            // Init values
            gui.initValues( project, folders, Templates.getTemplate( wizard ), targetFolder );
        }
    }





import org.openide.filesystems.Repository;
import org.openide.loaders.DataFolder;
import org.openide.loaders.DataObject;
import org.openide.loaders.TemplateWizard;
import org.openide.nodes.Node;

/**
 * Wizard to create a new J2SE project.
 * @author Jesse Glick
 */
public class NewJavaFileWizardIterator implements WizardDescriptor.InstantiatingIterator {
    
    private static final long serialVersionUID = 1L;
    

        };
    }
        
    public Set/*<DataObject>*/ instantiate (/*WizardDescriptor wizardDescriptor*/) throws IOException {
        FileObject dir = Templates.getTargetFolder( wiz );
        
        DataFolder df = DataFolder.findFolder( dir );

        
    private transient int index;
    private transient WizardDescriptor.Panel[] panels;
    private transient WizardDescriptor wiz;
    
    public void initialize(WizardDescriptor wiz) {
        this.wiz = wiz;
        index = 0;
        panels = createPanels( wiz );

            }
        }
    }
    public void uninitialize (WizardDescriptor wiz) {
        this.wiz = null;
        panels = null;
    }




    </folder -->
    
    <file name="Package" url="nbres:/org/netbeans/modules/java/resources/templates/Package.template">
        <!-- attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" /> -->
        <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/spi/java/project/support/ui/package.gif"/>
    </file>
        

      <!-- XXX Remove the URLs after issue #41716 is fixed -->
    
      <file name="Applet.java" url="nbres:/org/netbeans/modules/java/resources/templates/Applet.template">
         <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
      </file>
      <file name="JApplet.java" url="nbres:/org/netbeans/modules/java/resources/templates/JApplet.template">
         <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
      </file>
      <file name="Class.java" url="nbres:/org/netbeans/modules/java/resources/templates/Class.template">
         <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
      </file>
      <file name="Main.java" url="nbres:/org/netbeans/modules/java/resources/templates/Main.template">
         <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
      </file>
      <file name="Empty.java" url="nbres:/org/netbeans/modules/java/resources/templates/Empty.template">
        <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
      </file>
      <file name="Interface.java" url="nbres:/org/netbeans/modules/java/resources/templates/Interface.template">
         <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
      </file>
      <file name="Exception.java" url="nbres:/org/netbeans/modules/java/resources/templates/Exception.template">
         <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
      </file>
    </folder>
    





import org.netbeans.api.project.Project;
import org.netbeans.modules.java.project.JavaTargetChooserPanel;
import org.netbeans.modules.java.project.NewJavaFileWizardIterator;
import org.netbeans.spi.project.SourceGroup;
import org.netbeans.spi.project.ui.templates.support.Templates;
import org.openide.WizardDescriptor;
import org.openide.filesystems.FileObject;
import org.openide.loaders.TemplateWizard;

/**
 * Default implementations of Java-specific template UI.

     */
    public static WizardDescriptor.Panel createPackageChooser(Project project, SourceGroup[] folders) {       
        return new JavaTargetChooserPanel(project, folders);
    }
    
    public static WizardDescriptor.InstantiatingIterator createJavaTemplatesIterator () {
        return new NewJavaFileWizardIterator ();
    }
    
}

Lines 47-53 Link Here

(-)projects/projectui/nbproject/project.xml (-1 / +1 lines)
47	<compile-dependency/>	47	<compile-dependency/>
48	<run-dependency>	48	<run-dependency>
49	<release-version>1</release-version>	49	<release-version>1</release-version>
50	<specification-version>4.13</specification-version>	50	<specification-version>4.29</specification-version>
51	</run-dependency>	51	</run-dependency>
52	</dependency>	52	</dependency>
53	<dependency>	53	<dependency>

Lines 37-43 Link Here

(-)projects/projectui/src/org/netbeans/modules/project/ui/NewFileWizard.java (-2 / +2 lines)
37	import org.openide.loaders.TemplateWizard;	37	import org.openide.loaders.TemplateWizard;
38	import org.openide.util.HelpCtx;	38	import org.openide.util.HelpCtx;
39		39
40	public final class NewFileWizard extends TemplateWizard {	40	public final class NewFileWizard extends TemplateWizard {
41		41
42	private Project p;	42	private Project p;
43	private String[] recommendedTypes;	43	private String[] recommendedTypes;
Lines 64-70 Link Here
64	}	64	}
65		65
66	}	66	}
67		67
68	/** Old impl might be usefull later in Wizards API	68	/** Old impl might be usefull later in Wizards API
69		69
70	///** Wizard for creating new files in a project.	70	///** Wizard for creating new files in a project.




import org.openide.WizardDescriptor;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.loaders.TemplateWizard;
import org.openide.util.HelpCtx;

/**


    public void readSettings( Object settings ) {
        
        WizardDescriptor wd = (WizardDescriptor)settings;
        
        if ( gui != null ) {
            
            Project project = Templates.getProject( wd );
            
            // Try to preselect a folder
            // XXX The test should be rewritten if external project dirs are supported
            
            FileObject preselectedTarget = Templates.getTargetFolder( wd );
            String targetFolder = null;
            if ( preselectedTarget != null && FileUtil.isParentOf( project.getProjectDirectory(), preselectedTarget ) ) {
                targetFolder = FileUtil.getRelativePath( project.getProjectDirectory(), preselectedTarget );
            }
                        
            // Init values
            gui.initValues( project, Templates.getTemplate( wd ), targetFolder );
        }
    }





import org.netbeans.api.project.Project;
import org.netbeans.modules.project.uiapi.ProjectChooserFactory;
import org.netbeans.spi.project.SourceGroup;
import org.netbeans.spi.project.ui.templates.support.Templates;
import org.openide.NotifyDescriptor;
import org.openide.WizardDescriptor;
import org.openide.filesystems.FileObject;

            gui.initValues( p );
        }
        
        WizardDescriptor wd = (WizardDescriptor)settings;
        wd.setTitle( "New File - Choose File Type" );
        wd.putProperty( "WizardPanel_contentData", new String[] { "Choose Template", "..." } ); // NOI18N
        wd.putProperty( "WizardPanel_contentSelectedIndex", new Integer( 0 ) ); // NOI18N


    public void storeSettings(Object settings) {
            
        WizardDescriptor wd = (WizardDescriptor)settings;
        
        Object value = wd.getValue();
        
        if ( NotifyDescriptor.CANCEL_OPTION != value &&
             NotifyDescriptor.CLOSED_OPTION != value ) {        
            try { 

                wd.putProperty( ProjectChooserFactory.WIZARD_KEY_PROJECT, gui.getProject() );
                
                if (wd instanceof TemplateWizard) {
                    ((TemplateWizard)wd).setTemplate( DataObject.find( gui.getTemplate() ) );
                } else {
                    wd.putProperty( ProjectChooserFactory.WIZARD_KEY_TEMPLATE, gui.getTemplate () );
                }
            }
            catch( DataObjectNotFoundException e ) {
                // XXX

Lines 24-30 Link Here

(-)projects/projectui/src/org/netbeans/modules/project/ui/actions/NewFile.java (-2 / +1 lines)
24	import org.netbeans.modules.project.ui.OpenProjectList;	24	import org.netbeans.modules.project.ui.OpenProjectList;
25	import org.openide.loaders.DataFolder;	25	import org.openide.loaders.DataFolder;
26	import org.openide.loaders.DataObject;	26	import org.openide.loaders.DataObject;
27	import org.openide.loaders.TemplateWizard;
28	import org.openide.util.Lookup;	27	import org.openide.util.Lookup;
29	import org.openide.util.NbBundle;	28	import org.openide.util.NbBundle;
30	import org.openide.util.Utilities;	29	import org.openide.util.Utilities;
Lines 56-62 Link Here
56		55
57	protected void actionPerformed( Lookup context ) {	56	protected void actionPerformed( Lookup context ) {
58		57
59	TemplateWizard wd = new NewFileWizard( preselectedProject( context ), null ); //wizardIterator );	58	NewFileWizard wd = new NewFileWizard( preselectedProject( context ), null );
60		59
61	DataFolder preselectedFolder = preselectedFolder( context );	60	DataFolder preselectedFolder = preselectedFolder( context );
62	if ( preselectedFolder != null ) {	61	if ( preselectedFolder != null ) {

Lines 46-52 Link Here

(-)projects/projectui/src/org/netbeans/modules/project/ui/actions/NewProject.java (-1 / +1 lines)
46	public void actionPerformed( ActionEvent evt ) {	46	public void actionPerformed( ActionEvent evt ) {
47		47
48	if ( wizard == null ) {	48	if ( wizard == null ) {
49	wizard = new TemplateWizard();	49	wizard = new TemplateWizard(); // XXX Create NewProjectWizard instead of TemplateWizard
50	FileObject fo = Repository.getDefault().getDefaultFileSystem().findResource( "Templates/Project" ); //NOI18N	50	FileObject fo = Repository.getDefault().getDefaultFileSystem().findResource( "Templates/Project" ); //NOI18N
51		51
52	DataFolder templates = DataFolder.findFolder( fo );	52	DataFolder templates = DataFolder.findFolder( fo );

Lines 24-31 Link Here

(-)projects/projectuiapi/src/org/netbeans/spi/project/ui/templates/support/Templates.java (-2 / +3 lines)
24	import org.netbeans.api.project.Project;	24	import org.netbeans.api.project.Project;
25	import org.netbeans.modules.project.uiapi.ProjectChooserFactory;	25	import org.netbeans.modules.project.uiapi.ProjectChooserFactory;
26	import org.netbeans.modules.project.uiapi.Utilities;	26	import org.netbeans.modules.project.uiapi.Utilities;
27	import org.netbeans.api.project.Sources;	27	import org.netbeans.spi.project.Sources;
28	import org.netbeans.api.project.SourceGroup;	28	import org.netbeans.spi.project.SourceGroup;
		29	import org.netbeans.spi.project.support.GenericSources;
29	import org.openide.WizardDescriptor;	30	import org.openide.WizardDescriptor;
30	import org.openide.filesystems.FileObject;	31	import org.openide.filesystems.FileObject;
31	import org.openide.loaders.DataFolder;	32	import org.openide.loaders.DataFolder;

Lines 47-58 Link Here

(-)openide/loaders/src/org/openide/loaders/TemplateWizard.java (-4 / +74 lines)
47	public class TemplateWizard extends WizardDescriptor {	47	public class TemplateWizard extends WizardDescriptor {
48	/** EA that defines the wizards description */	48	/** EA that defines the wizards description */
49	private static final String EA_DESCRIPTION = "templateWizardURL"; // NOI18N	49	private static final String EA_DESCRIPTION = "templateWizardURL"; // NOI18N
50	/** EA that defines custom iterator */	50	/** EA that defines custom iterator*/
51	private static final String EA_ITERATOR = "templateWizardIterator"; // NOI18N	51	private static final String EA_ITERATOR = "templateWizardIterator"; // NOI18N
52	/** EA that defines resource string to the description instead of raw URL	52	/** EA that defines resource string to the description instead of raw URL
53	* @deprecated	53	* @deprecated
54	*/	54	*/
55	private static final String EA_DESC_RESOURCE = "templateWizardDescResource"; // NOI18N	55	private static final String EA_DESC_RESOURCE = "templateWizardDescResource"; // NOI18N
		56
		57	/** Defines the wizards description */
		58	private static final String CUSTOM_DESCRIPTION = "instantiatingWizardURL"; // NOI18N
		59	/** Defines custom iterator */
		60	private static final String CUSTOM_ITERATOR = "instantiatingIterator"; // NOI18N
56		61
57	/** See org.openide.WizardDescriptor.PROP_CONTENT_SELECTED_INDEX	62	/** See org.openide.WizardDescriptor.PROP_CONTENT_SELECTED_INDEX
58	*/	63	*/
Lines 537-542 Link Here
537	*/	542	*/
538	public static void setDescription (DataObject obj, URL url) throws IOException {	543	public static void setDescription (DataObject obj, URL url) throws IOException {
539	obj.getPrimaryFile().setAttribute(EA_DESCRIPTION, url);	544	obj.getPrimaryFile().setAttribute(EA_DESCRIPTION, url);
		545	obj.getPrimaryFile().setAttribute(CUSTOM_DESCRIPTION, url);
540	}	546	}
541		547
542	/** Method to get a description for a data object.	548	/** Method to get a description for a data object.
Lines 544-550 Link Here
544	* @return the url with description or null	550	* @return the url with description or null
545	*/	551	*/
546	public static URL getDescription (DataObject obj) {	552	public static URL getDescription (DataObject obj) {
547	URL desc = (URL)obj.getPrimaryFile().getAttribute(EA_DESCRIPTION);	553	URL desc = (URL)obj.getPrimaryFile().getAttribute(CUSTOM_DESCRIPTION);
		554	if (desc != null) return desc;
		555	desc = (URL)obj.getPrimaryFile().getAttribute(EA_DESCRIPTION);
548	if (desc != null) return desc;	556	if (desc != null) return desc;
549	// Backwards compatibility:	557	// Backwards compatibility:
550	String rsrc = (String) obj.getPrimaryFile ().getAttribute (EA_DESC_RESOURCE);	558	String rsrc = (String) obj.getPrimaryFile ().getAttribute (EA_DESC_RESOURCE);
Lines 603-608 Link Here
603	*/	611	*/
604	public static void setIterator (DataObject obj, Iterator iter)	612	public static void setIterator (DataObject obj, Iterator iter)
605	throws IOException {	613	throws IOException {
		614	obj.getPrimaryFile().setAttribute(CUSTOM_ITERATOR, iter);
606	obj.getPrimaryFile().setAttribute(EA_ITERATOR, iter);	615	obj.getPrimaryFile().setAttribute(EA_ITERATOR, iter);
607	}	616	}
608		617
Lines 615-621 Link Here
615	* @return custom iterator or null	624	* @return custom iterator or null
616	*/	625	*/
617	public static Iterator getIterator (DataObject obj) {	626	public static Iterator getIterator (DataObject obj) {
618	Iterator it = (Iterator)obj.getPrimaryFile ().getAttribute(EA_ITERATOR);	627	Object unknownIterator = obj.getPrimaryFile ().getAttribute(CUSTOM_ITERATOR);
		628	if (unknownIterator == null) {
		629	unknownIterator = obj.getPrimaryFile ().getAttribute(EA_ITERATOR);
		630	}
		631	Iterator it = null;
		632	if (unknownIterator instanceof Iterator) {
		633	// old style iterator
		634	it = (Iterator)unknownIterator;
		635	} if (unknownIterator instanceof WizardDescriptor.InstantiatingIterator) {
		636	it = new TemplateWizard.Brigde2Iterator ((WizardDescriptor.InstantiatingIterator) unknownIterator);
		637	}
619	if (it != null) {	638	if (it != null) {
620	return it;	639	return it;
621	}	640	}
Lines 874-880 Link Here
874	public void removeChangeListener(javax.swing.event.ChangeListener l) {	893	public void removeChangeListener(javax.swing.event.ChangeListener l) {
875	}	894	}
876	}	895	}
877		896
		897	static class Brigde2Iterator implements TemplateWizard.Iterator {
		898	private WizardDescriptor.InstantiatingIterator instantiatingIterator;
		899	public Brigde2Iterator (WizardDescriptor.InstantiatingIterator it) {
		900	instantiatingIterator = it;
		901	}
		902
		903	public void addChangeListener (javax.swing.event.ChangeListener l) {
		904	instantiatingIterator.addChangeListener (l);
		905	}
		906
		907	public org.openide.WizardDescriptor.Panel current () {
		908	return instantiatingIterator.current ();
		909	}
		910
		911	public boolean hasNext () {
		912	return instantiatingIterator.hasNext ();
		913	}
		914
		915	public boolean hasPrevious () {
		916	return instantiatingIterator.hasPrevious ();
		917	}
		918
		919	public String name () {
		920	return instantiatingIterator.name ();
		921	}
		922
		923	public void nextPanel () {
		924	instantiatingIterator.nextPanel ();
		925	}
		926
		927	public void previousPanel () {
		928	instantiatingIterator.previousPanel ();
		929	}
		930
		931	public void removeChangeListener (javax.swing.event.ChangeListener l) {
		932	instantiatingIterator.removeChangeListener (l);
		933	}
		934
		935	public void initialize (TemplateWizard wiz) {
		936	instantiatingIterator.initialize (wiz);
		937	}
		938
		939	public java.util.Set instantiate (TemplateWizard wiz) throws IOException {
		940	return instantiatingIterator.instantiate ();
		941	}
		942
		943	public void uninitialize (TemplateWizard wiz) {
		944	instantiatingIterator.uninitialize (wiz);
		945	}
		946
		947	}
878	/*	948	/*
879	public static void main (String[] args) throws java.lang.Exception {	949	public static void main (String[] args) throws java.lang.Exception {
880	TemplateWizard wiz = new TemplateWizard ();	950	TemplateWizard wiz = new TemplateWizard ();

Lines 35-40 Link Here

(-)openide/src/org/openide/WizardDescriptor.java (-1 / +44 lines)
35	import java.awt.Window;	35	import java.awt.Window;
36	import java.beans.PropertyChangeListener;	36	import java.beans.PropertyChangeListener;
37	import java.beans.PropertyChangeEvent;	37	import java.beans.PropertyChangeEvent;
		38	import java.io.IOException;
38	import java.net.URL;	39	import java.net.URL;
39	import java.lang.ref.WeakReference;	40	import java.lang.ref.WeakReference;
40		41
Lines 259-264 Link Here
259	*/	260	*/
260	public WizardDescriptor (Iterator panels, Object settings) {	261	public WizardDescriptor (Iterator panels, Object settings) {
261	super ("", "", true, DEFAULT_OPTION, null, CLOSE_PREVENTER); // NOI18N	262	super ("", "", true, DEFAULT_OPTION, null, CLOSE_PREVENTER); // NOI18N
		263
262	this.settings = settings == CLOSE_PREVENTER ? this : settings;	264	this.settings = settings == CLOSE_PREVENTER ? this : settings;
263		265
264	listener = new Listener ();	266	listener = new Listener ();
Lines 273-281 Link Here
273	super.setOptions (new Object[] { previousButton, nextButton, finishButton, cancelButton });	275	super.setOptions (new Object[] { previousButton, nextButton, finishButton, cancelButton });
274	super.setClosingOptions (new Object[] { finishOption, cancelButton });	276	super.setClosingOptions (new Object[] { finishOption, cancelButton });
275		277
		278	// must be there?
		279	if (panels instanceof InstantiatingIterator) {
		280	((InstantiatingIterator)panels).initialize (this);
		281	}
		282
276	this.panels = panels;	283	this.panels = panels;
277	panels.addChangeListener (listener);	284	panels.addChangeListener (listener);
278
279	}	285	}
280		286
281	/** Create wizard for a sequence of panels, with settings	287	/** Create wizard for a sequence of panels, with settings
Lines 292-297 Link Here
292	*/	298	*/
293	protected void initialize () {	299	protected void initialize () {
294	super.initialize ();	300	super.initialize ();
		301
		302
295		303
296	updateState ();	304	updateState ();
297	}	305	}
Lines 853-858 Link Here
853	}	861	}
854	}	862	}
855	panels.removeChangeListener(listener);	863	panels.removeChangeListener(listener);
		864	if (panels instanceof InstantiatingIterator) {
		865	((InstantiatingIterator)panels).uninitialize (this);
		866	}
856	}	867	}
857		868
858	ResourceBundle bundle = NbBundle.getBundle(WizardDescriptor.class);	869	ResourceBundle bundle = NbBundle.getBundle(WizardDescriptor.class);
Lines 1162-1167 Link Here
1162		1173
1163	}	1174	}
1164		1175
		1176	/** Instantiating iterator. PENDING
		1177	*/
		1178	public interface InstantiatingIterator extends Iterator {
		1179
		1180	/** PENDING
		1181	*
		1182	* @param settings
		1183	* @throws IOException
		1184	* @return
		1185	*/
		1186	public java.util.Set instantiate () throws IOException;
		1187
		1188	/** PENDING
		1189	*
		1190	* @param wizard
		1191	*/
		1192	public void initialize (WizardDescriptor wizard);
		1193
		1194	/** PENDING
		1195	*
		1196	* @param wizard
		1197	*/
		1198	public void uninitialize (WizardDescriptor wizard);
		1199	}
		1200
1165	private boolean lazyValidate (WizardDescriptor.Panel panel, WizardDescriptor.WizardPanel wizard) {	1201	private boolean lazyValidate (WizardDescriptor.Panel panel, WizardDescriptor.WizardPanel wizard) {
1166	if (panel instanceof ValidatingPanel) {	1202	if (panel instanceof ValidatingPanel) {
1167	ValidatingPanel v = (ValidatingPanel)panel;	1203	ValidatingPanel v = (ValidatingPanel)panel;
Lines 1252-1257 Link Here
1252	resetWizard();	1288	resetWizard();
1253	}	1289	}
1254	firePropertyChange (PROP_VALUE, oldValue, OK_OPTION);	1290	firePropertyChange (PROP_VALUE, oldValue, OK_OPTION);
		1291	if (panels instanceof InstantiatingIterator) {
		1292	try {
		1293	((InstantiatingIterator)panels).instantiate ();
		1294	} catch (IOException ioe) {
		1295	ErrorManager.getDefault ().notify (ioe);
		1296	}
		1297	}
1255	}	1298	}
1256		1299
1257	if (ev.getSource () == cancelButton) {	1300	if (ev.getSource () == cancelButton) {

Lines 36-41 Link Here

(-)beans/nbproject/project.xml (+8 lines)
36	</run-dependency>	36	</run-dependency>
37	</dependency>	37	</dependency>
38	<dependency>	38	<dependency>
		39	<code-name-base>org.netbeans.modules.java.project</code-name-base>
		40	<build-prerequisite/>
		41	<compile-dependency/>
		42	<run-dependency>
		43	<release-version>0</release-version>
		44	</run-dependency>
		45	</dependency>
		46	<dependency>
39	<code-name-base>org.openide</code-name-base>	47	<code-name-base>org.openide</code-name-base>
40	<build-prerequisite/>	48	<build-prerequisite/>
41	<compile-dependency/>	49	<compile-dependency/>




    <attr name="Classes/Beans" boolvalue="true"/>
    <attr name="GUIForms/Beans" boolvalue="true"/>
    <folder name="Beans">
      <attr name="instantiatingWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/Beans.html" />
      <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.beans.Bundle"/>

      <file name="Bean.java" url="templates/Bean.template">
         <attr name="template" boolvalue="true" />
         <attr name="instantiatingWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/Bean.html" />
         <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
         <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.beans.Bundle"/>
      </file>
      <file name="BeanInfo.java" url="templates/BeanInfo.template">
         <attr name="template" boolvalue="true" />
         <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.beans.Bundle"/>
         <attr name="instantiatingWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/BeanInfo.html" />
         <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
      </file>
      <file name="BeanInfoNoIcon.java" url="templates/BeanInfoNoIcon.template">
         <attr name="template" boolvalue="true" />
         <attr name="instantiatingWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/BeanInfo.html" />
         <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
         <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.beans.Bundle"/>
      </file>
      <file name="Customizer.java" url="templates/Customizer.template">
         <attr name="template" boolvalue="true" />
         <attr name="instantiatingWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/Customizer.html" />
         <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
         <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.beans.Bundle"/>
      </file>
      <file name="Customizer.form" url="templates/Customizer.form.template">
         <attr name="template" boolvalue="true" />
         <attr name="instantiatingWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/Customizer.html" />
         <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
      </file>
      <file name="PropertyEditor.java" url="templates/PropertyEditor.template">
         <attr name="template" boolvalue="true" />
         <attr name="instantiatingWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/PropertyEditor.html" />
         <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
         <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.beans.Bundle"/>
      </file>
    </folder>

Lines 35-40 Link Here

(-)form/nbproject/project.xml (+8 lines)
35	</run-dependency>	35	</run-dependency>
36	</dependency>	36	</dependency>
37	<dependency>	37	<dependency>
		38	<code-name-base>org.netbeans.modules.java.project</code-name-base>
		39	<build-prerequisite/>
		40	<compile-dependency/>
		41	<run-dependency>
		42	<release-version>0</release-version>
		43	</run-dependency>
		44	</dependency>
		45	<dependency>
38	<code-name-base>org.netbeans.modules.java.platform</code-name-base>	46	<code-name-base>org.netbeans.modules.java.platform</code-name-base>
39	<build-prerequisite/>	47	<build-prerequisite/>
40	<compile-dependency/>	48	<compile-dependency/>




        <attr name="Classes/GUIForms" boolvalue="true"/>
        <folder name="GUIForms">
            <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.form.resources.Bundle"/>
            <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/form/resources/Forms.html"/>

            <file name="JApplet.java" url="templates/SwingForms/JApplet_java">
                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.form.resources.Bundle"/>
                <attr name="template" boolvalue="true" />
                <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/form/resources/JApplet.html"/>
                <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/javax/swing/beaninfo/images/JAppletColor16.gif"/>
                <attr name="SystemFileSystem.icon32" urlvalue="nbresloc:/javax/swing/beaninfo/images/JAppletColor32.gif"/>
                <attr name="NetBeansAttrDebuggerType" serialvalue="aced00057372001e6f72672e6f70656e6964652e53657276696365547970652448616e646c6564612acc871b81080300024c0009636c6173734e616d657400124c6a6176612f6c616e672f537472696e673b4c00046e616d6571007e000178707400104170706c657420446562756767696e6774002e6f72672e6e65746265616e732e6d6f64756c65732e6170706c65742e4170706c657444656275676765725479706578"/>
                <attr name="NetBeansAttrExecutor" serialvalue="aced00057372001e6f72672e6f70656e6964652e53657276696365547970652448616e646c6564612acc871b81080300024c0009636c6173734e616d657400124c6a6176612f6c616e672f537472696e673b4c00046e616d6571007e000178707400104170706c657420457865637574696f6e74002a6f72672e6e65746265616e732e6d6f64756c65732e6170706c65742e4170706c65744578656375746f7278"/>
                <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
            </file>
            <file name="JApplet.form" url="templates/SwingForms/JApplet_form">
                <attr name="template" boolvalue="true" />

            <file name="JDialog.java" url="templates/SwingForms/JDialog_java">
                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.form.resources.Bundle"/>
                <attr name="template" boolvalue="true" />
                <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/form/resources/JDialog.html"/>
                <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/javax/swing/beaninfo/images/JDialogColor16.gif"/>
                <attr name="SystemFileSystem.icon32" urlvalue="nbresloc:/javax/swing/beaninfo/images/JDialogColor32.gif"/>
                <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
            </file>
            <file name="JDialog.form" url="templates/SwingForms/JDialog_form">
                <attr name="template" boolvalue="true" />

            <file name="JFrame.java" url="templates/SwingForms/JFrame_java">
                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.form.resources.Bundle"/>
                <attr name="template" boolvalue="true" />
                <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/form/resources/JFrame.html"/>
                <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/javax/swing/beaninfo/images/JFrameColor16.gif"/>
                <attr name="SystemFileSystem.icon32" urlvalue="nbresloc:/javax/swing/beaninfo/images/JFrameColor32.gif"/>
                <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
            </file>
            <file name="JFrame.form" url="templates/SwingForms/JFrame_form">
                <attr name="template" boolvalue="true" />

            <file name="JInternalFrame.java" url="templates/SwingForms/JInternalFrame_java">
                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.form.resources.Bundle"/>
                <attr name="template" boolvalue="true" />
                <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/form/resources/JInternalFrame.html"/>
                <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/javax/swing/beaninfo/images/JInternalFrameColor16.gif"/>
                <attr name="SystemFileSystem.icon32" urlvalue="nbresloc:/javax/swing/beaninfo/images/JInternalFrameColor32.gif"/>
                <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
            </file>
            <file name="JInternalFrame.form" url="templates/SwingForms/JInternalFrame_form">
                <attr name="template" boolvalue="true" />

            <file name="JPanel.java" url="templates/SwingForms/JPanel_java">
                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.form.resources.Bundle"/>
                <attr name="template" boolvalue="true" />
                <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/form/resources/JPanel.html"/>
                <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/javax/swing/beaninfo/images/JPanelColor16.gif"/>
                <attr name="SystemFileSystem.icon32" urlvalue="nbresloc:/javax/swing/beaninfo/images/JPanelColor32.gif"/>
                <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
            </file>
            <file name="JPanel.form" url="templates/SwingForms/JPanel_form">
                <attr name="template" boolvalue="true" />

            <file name="BeanForm.java" url="templates/SwingForms/BeanForm_java">
                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.form.resources.Bundle"/>
                <attr name="template" boolvalue="true" />
                <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/form/resources/BeanForm.html"/>
                <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
            </file>
            <file name="BeanForm.form" url="templates/SwingForms/BeanForm_form">
                <attr name="template" boolvalue="true" />


            <folder name="AWTForms">
                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.form.resources.Bundle"/>
                <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/form/resources/AWTForms.html"/>

                <file name="Applet.java" url="templates/AWTForms/Applet_java">
                    <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.form.resources.Bundle"/>
                    <attr name="template" boolvalue="true" />
                    <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/form/resources/Applet.html"/>
                    <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/form/resources/applet.gif"/>
                    <attr name="NetBeansAttrDebuggerType" serialvalue="aced00057372001e6f72672e6f70656e6964652e53657276696365547970652448616e646c6564612acc871b81080300024c0009636c6173734e616d657400124c6a6176612f6c616e672f537472696e673b4c00046e616d6571007e000178707400104170706c657420446562756767696e6774002e6f72672e6e65746265616e732e6d6f64756c65732e6170706c65742e4170706c657444656275676765725479706578"/>
                    <attr name="NetBeansAttrExecutor" serialvalue="aced00057372001e6f72672e6f70656e6964652e53657276696365547970652448616e646c6564612acc871b81080300024c0009636c6173734e616d657400124c6a6176612f6c616e672f537472696e673b4c00046e616d6571007e000178707400104170706c657420457865637574696f6e74002a6f72672e6e65746265616e732e6d6f64756c65732e6170706c65742e4170706c65744578656375746f7278"/>
                    <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
                </file>
                <file name="Applet.form" url="templates/AWTForms/Applet_form">
                    <attr name="template" boolvalue="true" />

                <file name="Dialog.java" url="templates/AWTForms/Dialog_java">
                    <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.form.resources.Bundle"/>
                    <attr name="template" boolvalue="true" />
                    <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/form/resources/Dialog.html"/>
                    <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/form/resources/dialog.gif"/>
                    <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
                </file>
                <file name="Dialog.form" url="templates/AWTForms/Dialog_form">
                    <attr name="template" boolvalue="true" />

                <file name="Frame.java" url="templates/AWTForms/Frame_java">
                    <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.form.resources.Bundle"/>
                    <attr name="template" boolvalue="true" />
                    <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/form/resources/Frame.html"/>
                    <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/form/resources/frame.gif"/>
                    <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
                </file>
                <file name="Frame.form" url="templates/AWTForms/Frame_form">
                    <attr name="template" boolvalue="true" />

                <file name="Panel.java" url="templates/AWTForms/Panel_java">
                    <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.form.resources.Bundle"/>
                    <attr name="template" boolvalue="true" />
                    <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/form/resources/Panel.html"/>
                    <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/form/beaninfo/awt/panel.gif"/>
                    <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
                </file>
                <file name="Panel.form" url="templates/AWTForms/Panel_form">
                    <attr name="template" boolvalue="true" />


            <folder name="Dialogs">
                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.form.resources.Bundle"/>
                <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/form/resources/Dialogs.html"/>

                <file name="Application.java" url="templates/Dialogs/Application_java">
                    <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.form.resources.Bundle"/>
                    <attr name="template" boolvalue="true" />
                    <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/form/resources/Application.html"/>
                    <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/javax/swing/beaninfo/images/JFrameColor16.gif"/>
                    <attr name="SystemFileSystem.icon32" urlvalue="nbresloc:/javax/swing/beaninfo/images/JFrameColor32.gif"/>
                    <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
                </file>
                <file name="Application.form" url="templates/Dialogs/Application_form">
                    <attr name="template" boolvalue="true" />

                <file name="MDIApplication.java" url="templates/Dialogs/MDIApplication_java">
                    <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.form.resources.Bundle"/>
                    <attr name="template" boolvalue="true" />
                    <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/form/resources/MDIApplication.html"/>
                    <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/javax/swing/beaninfo/images/JFrameColor16.gif"/>
                    <attr name="SystemFileSystem.icon32" urlvalue="nbresloc:/javax/swing/beaninfo/images/JFrameColor32.gif"/>
                    <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
                </file>
                <file name="MDIApplication.form" url="templates/Dialogs/MDIApplication_form">
                    <attr name="template" boolvalue="true" />

                <file name="OkCancelDialog.java" url="templates/Dialogs/OkCancelDialog_java">
                    <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.form.resources.Bundle"/>
                    <attr name="template" boolvalue="true" />
                    <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/form/resources/OKCancelDialog.html"/>
                    <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/javax/swing/beaninfo/images/JDialogColor16.gif"/>
                    <attr name="SystemFileSystem.icon32" urlvalue="nbresloc:/javax/swing/beaninfo/images/JDialogColor32.gif"/>
                    <attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
                </file>
                <file name="OkCancelDialog.form" url="templates/Dialogs/OkCancelDialog_form">
                    <attr name="template" boolvalue="true" />

Return to bug 42192

Lines 21-38 Link Here

(-)java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml (-4 / +4 lines)
21	<!-- Add template for the J2SE project -->	21	<!-- Add template for the J2SE project -->
22	<file name="emptyJ2SE.xml">	22	<file name="emptyJ2SE.xml">
23	<attr name="template" boolvalue="true"/>	23	<attr name="template" boolvalue="true"/>
24	<attr name="templateWizardIterator" newvalue="org.netbeans.modules.java.j2seproject.ui.wizards.NewJ2SEProjectWizardIterator"/>	24	<attr name="instantiatingIterator" newvalue="org.netbeans.modules.java.j2seproject.ui.wizards.NewJ2SEProjectWizardIterator"/>
25	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.java.j2seproject.ui.wizards.Bundle"/>	25	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.java.j2seproject.ui.wizards.Bundle"/>
26	<attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/java/j2seproject/ui/resources/j2seProject.gif"/>	26	<attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/java/j2seproject/ui/resources/j2seProject.gif"/>
27	<attr name="templateWizardURL" urlvalue="nbresloc:/org/netbeans/modules/java/j2seproject/ui/resources/emptyProject.html"/>	27	<attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/java/j2seproject/ui/resources/emptyProject.html"/>
28	</file>	28	</file>
29		29
30	<file name="emptyJ2SElibrary.xml">	30	<file name="emptyJ2SElibrary.xml">
31	<attr name="template" boolvalue="true"/>	31	<attr name="template" boolvalue="true"/>
32	<attr name="templateWizardIterator" methodvalue="org.netbeans.modules.java.j2seproject.ui.wizards.NewJ2SEProjectWizardIterator.library"/>	32	<attr name="instantiatingIterator" methodvalue="org.netbeans.modules.java.j2seproject.ui.wizards.NewJ2SEProjectWizardIterator.library"/>
33	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.java.j2seproject.ui.wizards.Bundle"/>	33	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.java.j2seproject.ui.wizards.Bundle"/>
34	<attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/java/j2seproject/ui/resources/j2seProject.gif"/>	34	<attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/java/j2seproject/ui/resources/j2seProject.gif"/>
35	<attr name="templateWizardURL" urlvalue="nbresloc:/org/netbeans/modules/java/j2seproject/ui/resources/emptyLibrary.html"/>	35	<attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/java/j2seproject/ui/resources/emptyLibrary.html"/>
36	</file>	36	</file>
37		37
38	</folder>	38	</folder>

Lines 28-34 Link Here

(-)java/project/src/org/netbeans/modules/java/project/JavaTargetChooserPanel.java (-5 / +4 lines)
28	import org.openide.WizardDescriptor;	28	import org.openide.WizardDescriptor;
29	import org.openide.filesystems.FileObject;	29	import org.openide.filesystems.FileObject;
30	import org.openide.filesystems.FileUtil;	30	import org.openide.filesystems.FileUtil;
31	import org.openide.loaders.TemplateWizard;
32	import org.openide.util.HelpCtx;	31	import org.openide.util.HelpCtx;
33		32
34	/**	33	/**
Lines 83-105 Link Here
83		82
84	public void readSettings( Object settings ) {	83	public void readSettings( Object settings ) {
85		84
86	TemplateWizard templateWizard = (TemplateWizard)settings;	85	WizardDescriptor wizard = (WizardDescriptor) settings;
87		86
88	if ( gui != null ) {	87	if ( gui != null ) {
89		88
90	Project project = Templates.getProject( templateWizard );	89	Project project = Templates.getProject( wizard );
91		90
92	// Try to preselect a folder	91	// Try to preselect a folder
93	// XXX The test should be rewritten if external project dirs are supported	92	// XXX The test should be rewritten if external project dirs are supported
94		93
95	FileObject preselectedTarget = Templates.getTargetFolder( templateWizard );	94	FileObject preselectedTarget = Templates.getTargetFolder( wizard );
96	String targetFolder = null;	95	String targetFolder = null;
97	if ( preselectedTarget != null && FileUtil.isParentOf( project.getProjectDirectory(), preselectedTarget ) ) {	96	if ( preselectedTarget != null && FileUtil.isParentOf( project.getProjectDirectory(), preselectedTarget ) ) {
98	targetFolder = FileUtil.getRelativePath( project.getProjectDirectory(), preselectedTarget );	97	targetFolder = FileUtil.getRelativePath( project.getProjectDirectory(), preselectedTarget );
99	}	98	}
100		99
101	// Init values	100	// Init values
102	gui.initValues( project, folders, Templates.getTemplate( templateWizard ), targetFolder );	101	gui.initValues( project, folders, Templates.getTemplate( wizard ), targetFolder );
103	}	102	}
104	}	103	}
105		104

Lines 40-53 Link Here

(-)java/project/src/org/netbeans/modules/java/project/NewJavaFileWizardIterator.java (-6 / +5 lines)
40	import org.openide.filesystems.Repository;	40	import org.openide.filesystems.Repository;
41	import org.openide.loaders.DataFolder;	41	import org.openide.loaders.DataFolder;
42	import org.openide.loaders.DataObject;	42	import org.openide.loaders.DataObject;
43	import org.openide.loaders.TemplateWizard;
44	import org.openide.nodes.Node;	43	import org.openide.nodes.Node;
45		44
46	/**	45	/**
47	* Wizard to create a new J2SE project.	46	* Wizard to create a new J2SE project.
48	* @author Jesse Glick	47	* @author Jesse Glick
49	*/	48	*/
50	public class NewJavaFileWizardIterator implements TemplateWizard.Iterator {	49	public class NewJavaFileWizardIterator implements WizardDescriptor.InstantiatingIterator {
51		50
52	private static final long serialVersionUID = 1L;	51	private static final long serialVersionUID = 1L;
53		52
Lines 87-93 Link Here
87	};	86	};
88	}	87	}
89		88
90	public Set/<DataObject>/ instantiate(TemplateWizard wiz) throws IOException {	89	public Set/<DataObject>/ instantiate (/WizardDescriptor wizardDescriptor/) throws IOException {
91	FileObject dir = Templates.getTargetFolder( wiz );	90	FileObject dir = Templates.getTargetFolder( wiz );
92		91
93	DataFolder df = DataFolder.findFolder( dir );	92	DataFolder df = DataFolder.findFolder( dir );
Lines 116-124 Link Here
116		115
117	private transient int index;	116	private transient int index;
118	private transient WizardDescriptor.Panel[] panels;	117	private transient WizardDescriptor.Panel[] panels;
119	private transient TemplateWizard wiz;	118	private transient WizardDescriptor wiz;
120		119
121	public void initialize(TemplateWizard wiz) {	120	public void initialize(WizardDescriptor wiz) {
122	this.wiz = wiz;	121	this.wiz = wiz;
123	index = 0;	122	index = 0;
124	panels = createPanels( wiz );	123	panels = createPanels( wiz );
Lines 141-147 Link Here
141	}	140	}
142	}	141	}
143	}	142	}
144	public void uninitialize(TemplateWizard wiz) {	143	public void uninitialize (WizardDescriptor wiz) {
145	this.wiz = null;	144	this.wiz = null;
146	panels = null;	145	panels = null;
147	}	146	}

Lines 36-42 Link Here

(-)java/project/src/org/netbeans/modules/java/project/layer.xml (-8 / +8 lines)
36	</folder -->	36	</folder -->
37		37
38	<file name="Package" url="nbres:/org/netbeans/modules/java/resources/templates/Package.template">	38	<file name="Package" url="nbres:/org/netbeans/modules/java/resources/templates/Package.template">
39	<!-- attr name="templateWizardIterator" methodvalue="org.netbeans.modules.java.project.NewJavaFileWizardIterator.createPackageIterator"/ -->	39	<!-- attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" /> -->
40	<attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/spi/java/project/support/ui/package.gif"/>	40	<attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/spi/java/project/support/ui/package.gif"/>
41	</file>	41	</file>
42		42
Lines 45-69 Link Here
45	<!-- XXX Remove the URLs after issue #41716 is fixed -->	45	<!-- XXX Remove the URLs after issue #41716 is fixed -->
46		46
47	<file name="Applet.java" url="nbres:/org/netbeans/modules/java/resources/templates/Applet.template">	47	<file name="Applet.java" url="nbres:/org/netbeans/modules/java/resources/templates/Applet.template">
48	<attr name="templateWizardIterator" methodvalue="org.netbeans.modules.java.project.NewJavaFileWizardIterator.singleton" />	48	<attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
49	</file>	49	</file>
50	<file name="JApplet.java" url="nbres:/org/netbeans/modules/java/resources/templates/JApplet.template">	50	<file name="JApplet.java" url="nbres:/org/netbeans/modules/java/resources/templates/JApplet.template">
51	<attr name="templateWizardIterator" methodvalue="org.netbeans.modules.java.project.NewJavaFileWizardIterator.singleton" />	51	<attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
52	</file>	52	</file>
53	<file name="Class.java" url="nbres:/org/netbeans/modules/java/resources/templates/Class.template">	53	<file name="Class.java" url="nbres:/org/netbeans/modules/java/resources/templates/Class.template">
54	<attr name="templateWizardIterator" methodvalue="org.netbeans.modules.java.project.NewJavaFileWizardIterator.singleton" />	54	<attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
55	</file>	55	</file>
56	<file name="Main.java" url="nbres:/org/netbeans/modules/java/resources/templates/Main.template">	56	<file name="Main.java" url="nbres:/org/netbeans/modules/java/resources/templates/Main.template">
57	<attr name="templateWizardIterator" methodvalue="org.netbeans.modules.java.project.NewJavaFileWizardIterator.singleton" />	57	<attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
58	</file>	58	</file>
59	<file name="Empty.java" url="nbres:/org/netbeans/modules/java/resources/templates/Empty.template">	59	<file name="Empty.java" url="nbres:/org/netbeans/modules/java/resources/templates/Empty.template">
60	<attr name="templateWizardIterator" methodvalue="org.netbeans.modules.java.project.NewJavaFileWizardIterator.singleton" />	60	<attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
61	</file>	61	</file>
62	<file name="Interface.java" url="nbres:/org/netbeans/modules/java/resources/templates/Interface.template">	62	<file name="Interface.java" url="nbres:/org/netbeans/modules/java/resources/templates/Interface.template">
63	<attr name="templateWizardIterator" methodvalue="org.netbeans.modules.java.project.NewJavaFileWizardIterator.singleton" />	63	<attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
64	</file>	64	</file>
65	<file name="Exception.java" url="nbres:/org/netbeans/modules/java/resources/templates/Exception.template">	65	<file name="Exception.java" url="nbres:/org/netbeans/modules/java/resources/templates/Exception.template">
66	<attr name="templateWizardIterator" methodvalue="org.netbeans.modules.java.project.NewJavaFileWizardIterator.singleton" />	66	<attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
67	</file>	67	</file>
68	</folder>	68	</folder>
69		69

Lines 15-25 Link Here

(-)java/project/src/org/netbeans/spi/java/project/support/ui/templates/JavaTemplates.java (-1 / +5 lines)
15		15
16	import org.netbeans.api.project.Project;	16	import org.netbeans.api.project.Project;
17	import org.netbeans.modules.java.project.JavaTargetChooserPanel;	17	import org.netbeans.modules.java.project.JavaTargetChooserPanel;
		18	import org.netbeans.modules.java.project.NewJavaFileWizardIterator;
18	import org.netbeans.spi.project.SourceGroup;	19	import org.netbeans.spi.project.SourceGroup;
19	import org.netbeans.spi.project.ui.templates.support.Templates;	20	import org.netbeans.spi.project.ui.templates.support.Templates;
20	import org.openide.WizardDescriptor;	21	import org.openide.WizardDescriptor;
21	import org.openide.filesystems.FileObject;	22	import org.openide.filesystems.FileObject;
22	import org.openide.loaders.TemplateWizard;
23		23
24	/**	24	/**
25	* Default implementations of Java-specific template UI.	25	* Default implementations of Java-specific template UI.
Lines 39-44 Link Here
39	*/	39	*/
40	public static WizardDescriptor.Panel createPackageChooser(Project project, SourceGroup[] folders) {	40	public static WizardDescriptor.Panel createPackageChooser(Project project, SourceGroup[] folders) {
41	return new JavaTargetChooserPanel(project, folders);	41	return new JavaTargetChooserPanel(project, folders);
		42	}
		43
		44	public static WizardDescriptor.InstantiatingIterator createJavaTemplatesIterator () {
		45	return new NewJavaFileWizardIterator ();
42	}	46	}
43		47
44	}	48	}

Lines 19-54 Link Here

(-)beans/src/org/netbeans/modules/beans/resources/mf-layer.xml (-7 / +13 lines)
19	<attr name="Classes/Beans" boolvalue="true"/>	19	<attr name="Classes/Beans" boolvalue="true"/>
20	<attr name="GUIForms/Beans" boolvalue="true"/>	20	<attr name="GUIForms/Beans" boolvalue="true"/>
21	<folder name="Beans">	21	<folder name="Beans">
22	<attr name="templateWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/Beans.html" />	22	<attr name="instantiatingWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/Beans.html" />
23	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.beans.Bundle"/>	23	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.beans.Bundle"/>
24		24
25	<file name="Bean.java" url="templates/Bean.template">	25	<file name="Bean.java" url="templates/Bean.template">
26	<attr name="template" boolvalue="true" />	26	<attr name="template" boolvalue="true" />
27	<attr name="templateWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/Bean.html" />	27	<attr name="instantiatingWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/Bean.html" />
		28	<attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
28	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.beans.Bundle"/>	29	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.beans.Bundle"/>
29	</file>	30	</file>
30	<file name="BeanInfo.java" url="templates/BeanInfo.template">	31	<file name="BeanInfo.java" url="templates/BeanInfo.template">
31	<attr name="template" boolvalue="true" />	32	<attr name="template" boolvalue="true" />
32	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.beans.Bundle"/>	33	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.beans.Bundle"/>
33	<attr name="templateWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/BeanInfo.html" />	34	<attr name="instantiatingWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/BeanInfo.html" />
		35	<attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
34	</file>	36	</file>
35	<file name="BeanInfoNoIcon.java" url="templates/BeanInfoNoIcon.template">	37	<file name="BeanInfoNoIcon.java" url="templates/BeanInfoNoIcon.template">
36	<attr name="template" boolvalue="true" />	38	<attr name="template" boolvalue="true" />
37	<attr name="templateWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/BeanInfo.html" />	39	<attr name="instantiatingWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/BeanInfo.html" />
		40	<attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
38	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.beans.Bundle"/>	41	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.beans.Bundle"/>
39	</file>	42	</file>
40	<file name="Customizer.java" url="templates/Customizer.template">	43	<file name="Customizer.java" url="templates/Customizer.template">
41	<attr name="template" boolvalue="true" />	44	<attr name="template" boolvalue="true" />
42	<attr name="templateWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/Customizer.html" />	45	<attr name="instantiatingWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/Customizer.html" />
		46	<attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
43	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.beans.Bundle"/>	47	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.beans.Bundle"/>
44	</file>	48	</file>
45	<file name="Customizer.form" url="templates/Customizer.form.template">	49	<file name="Customizer.form" url="templates/Customizer.form.template">
46	<attr name="template" boolvalue="true" />	50	<attr name="template" boolvalue="true" />
47	<attr name="templateWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/Customizer.html" />	51	<attr name="instantiatingWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/Customizer.html" />
		52	<attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
48	</file>	53	</file>
49	<file name="PropertyEditor.java" url="templates/PropertyEditor.template">	54	<file name="PropertyEditor.java" url="templates/PropertyEditor.template">
50	<attr name="template" boolvalue="true" />	55	<attr name="template" boolvalue="true" />
51	<attr name="templateWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/PropertyEditor.html" />	56	<attr name="instantiatingWizardURL" urlvalue="nbrescurrloc:/org/netbeans/modules/beans/resources/PropertyEditor.html" />
		57	<attr name="instantiatingIterator" methodvalue="org.netbeans.spi.java.project.support.ui.templates.JavaTemplates.createJavaTemplatesIterator" />
52	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.beans.Bundle"/>	58	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.beans.Bundle"/>
53	</file>	59	</file>
54	</folder>	60	</folder>